From 965915819d6ec66a99d2480d85513fa68e46f046 Mon Sep 17 00:00:00 2001 From: jasoni Date: Thu, 1 Nov 2001 21:34:13 +0000 Subject: [PATCH] revert port to latest stable release. --- x11/rxvt/Makefile | 12 +++++------- x11/rxvt/files/md5 | 6 +++--- x11/rxvt/patches/patch-Makefile.in | 8 ++++---- x11/rxvt/patches/patch-doc_Makefile.in | 12 ++++++------ x11/rxvt/patches/patch-rxvt_h | 16 ---------------- x11/rxvt/pkg/PLIST | 4 +--- 6 files changed, 19 insertions(+), 39 deletions(-) delete mode 100644 x11/rxvt/patches/patch-rxvt_h diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 320b6eacf30..27d6fe381c5 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.22 2001/10/31 20:43:59 jasoni Exp $ +# $OpenBSD: Makefile,v 1.23 2001/11/01 21:34:13 jasoni Exp $ COMMENT= "color, low memory usage, xterm replacement" -DISTNAME= rxvt-2.7.6 -PKGNAME= ${DISTNAME}p1 +DISTNAME= rxvt-2.6.3 CATEGORIES= x11 NEED_VERSION= 1.363 MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ \ - ftp://mason.primenet.com.au/pub/rxvt/ + ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/rxvt/ \ + ftp://ftp.fu-berlin.de/unix/X11/terms/rxvt HOMEPAGE= http://www.rxvt.org/ @@ -28,11 +28,9 @@ CONFIGURE_ARGS= --enable-utmp \ --enable-xpm-background \ --enable-transparency \ --enable-xgetdefault \ - --enable-languages \ --enable-xim \ - --enable-rxvt-scroll \ --enable-mousewheel -REGRESS_TARGET= tests +NO_REGRESS= Yes .include diff --git a/x11/rxvt/files/md5 b/x11/rxvt/files/md5 index 09ae9d18891..3e06aa523c6 100644 --- a/x11/rxvt/files/md5 +++ b/x11/rxvt/files/md5 @@ -1,3 +1,3 @@ -MD5 (rxvt-2.7.6.tar.gz) = 38ebb05ad29dd4e979743ec1d47be4dc -RMD160 (rxvt-2.7.6.tar.gz) = 76a1f18d0042af51cae10caae3414c4e6b77d7a0 -SHA1 (rxvt-2.7.6.tar.gz) = c89c12d8024f3de9126d140282110b1486d42b2a +MD5 (rxvt-2.6.3.tar.gz) = 12c75ec0f500d57f79f8a0fb2058f4d6 +RMD160 (rxvt-2.6.3.tar.gz) = b2a1bb70b1a8ba246ce99d362a3eecea98f6bb8f +SHA1 (rxvt-2.6.3.tar.gz) = 8b3f97f60346ca2808e0788c2d84a374051c9158 diff --git a/x11/rxvt/patches/patch-Makefile.in b/x11/rxvt/patches/patch-Makefile.in index 4f5838c7c67..ff9be527fd7 100644 --- a/x11/rxvt/patches/patch-Makefile.in +++ b/x11/rxvt/patches/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Thu Apr 12 07:45:06 2001 -+++ Makefile.in Fri Jun 22 13:33:38 2001 +--- Makefile.in.orig Wed Oct 31 12:44:29 2001 ++++ Makefile.in Wed Oct 31 12:44:48 2001 @@ -9,7 +9,7 @@ VPATH = @srcdir@ first_rule: all dummy: --subdirs = src doc rclock src/graphics src/test -+subdirs = src doc # rclock src/graphics src/test +-subdirs = src doc rclock src/graphics ++subdirs = src doc # rclock src/graphics DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog diff --git a/x11/rxvt/patches/patch-doc_Makefile.in b/x11/rxvt/patches/patch-doc_Makefile.in index 70071d2e95f..310c572b723 100644 --- a/x11/rxvt/patches/patch-doc_Makefile.in +++ b/x11/rxvt/patches/patch-doc_Makefile.in @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Tue May 2 23:40:54 2000 -+++ doc/Makefile.in Fri Jun 22 13:33:38 2001 -@@ -38,7 +38,7 @@ DIST = Makefile.in README.greek README +--- doc/Makefile.in.orig Wed Oct 31 12:45:34 2001 ++++ doc/Makefile.in Wed Oct 31 12:45:57 2001 +@@ -39,7 +39,7 @@ DIST = Makefile.in README.greek README #------------------------------------------------------------------------- --all: rxvt.1 -+all: # rxvt.1 +-all: rxvt.1 ++all: # rxvt.1 - rxvt.1: rxvt.tbl Makefile + rxvt.1: Makefile @if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi diff --git a/x11/rxvt/patches/patch-rxvt_h b/x11/rxvt/patches/patch-rxvt_h deleted file mode 100644 index 85c9b166552..00000000000 --- a/x11/rxvt/patches/patch-rxvt_h +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-rxvt_h,v 1.1 2001/08/29 17:12:09 jasoni Exp $ ---- src/rxvt.h.orig Wed Aug 29 15:32:39 2001 -+++ src/rxvt.h Wed Aug 29 15:32:55 2001 -@@ -712,10 +712,10 @@ enum { - - #ifdef ALLOW_132_MODE - # define PrivMode_Default \ --(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) -+(PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) - #else - # define PrivMode_Default \ --(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) -+(PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) - #endif - - #ifdef PREFER_24BIT diff --git a/x11/rxvt/pkg/PLIST b/x11/rxvt/pkg/PLIST index a1f629bd261..ed215faac20 100644 --- a/x11/rxvt/pkg/PLIST +++ b/x11/rxvt/pkg/PLIST @@ -1,7 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.7 2001/08/05 21:56:58 brad Exp $ +@comment $OpenBSD: PLIST,v 1.8 2001/11/01 21:34:13 jasoni Exp $ @mode 4755 bin/rxvt @mode -lib/librxvt.a -lib/librxvt.la man/man1/rxvt.1