Upgrade to 2.4.11

PR:		ports/9015
Submitted by:	maintainer

4 files changed, 62 insertions, 58 deletions

diff --git a/chinese/rxvt/Makefile b/chinese/rxvt/Makefile
index ae55f86a8d60..bf8b0bada6a3 100644
--- a/chinese/rxvt/Makefile
+++ b/chinese/rxvt/Makefile
@@ -1,13 +1,13 @@
 # New ports collection Makefile for: rxvt
-# Version required:     2.4.8
+# Version required:     2.4.11
 # Date created:         Nov 16 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
-# $Id: Makefile,v 1.6 1998/08/05 09:30:46 asami Exp $
+# $Id: Makefile,v 1.7 1998/10/10 01:04:31 vanilla Exp $
 #
 
-DISTNAME=	rxvt-2.4.8
-PKGNAME=	zh-rxvt-2.4.8
+DISTNAME=	rxvt-2.4.11
+PKGNAME=	zh-rxvt-2.4.11
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://mason.primenet.com.au/pub/rxvt/ \
 		ftp://ftp.math.fu-berlin.de/pub/rxvt/
@@ -21,4 +21,5 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-big5=yes --enable-xcin=yes
 MAN1=		crxvt2.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include <bsd.port.post.mk>
diff --git a/chinese/rxvt/distinfo b/chinese/rxvt/distinfo
index 7ff3f0f627c4..5e2805a3b2c6 100644
--- a/chinese/rxvt/distinfo
+++ b/chinese/rxvt/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.4.8.tar.gz) = 79f887255f1aa6683af765d9b165e1a2
+MD5 (rxvt-2.4.11.tar.gz) = 806d163e3113d22b31535785088f37c2
diff --git a/chinese/rxvt/files/patch-aa b/chinese/rxvt/files/patch-aa
index a43e605f0a2d..ffdcf569e318 100644
--- a/chinese/rxvt/files/patch-aa
+++ b/chinese/rxvt/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Oct  9 16:38:10 1998
-+++ Makefile.in	Fri Oct  9 16:38:45 1998
+--- Makefile.in.orig	Tue Dec  8 21:23:23 1998
++++ Makefile.in	Tue Dec  8 21:23:37 1998
 @@ -8,7 +8,7 @@
  first_rule: all
  dummy:
@@ -9,51 +9,24 @@
  
  DIST =	INSTALL README.configure configure Makefile Makefile.in
  
---- configure.orig	Fri Oct  9 16:03:53 1998
-+++ configure	Fri Oct  9 16:06:55 1998
-@@ -32,6 +32,8 @@
- ac_help="$ac_help
-   --enable-big5           enable big5 support"
- ac_help="$ac_help
-+  --enable-xcin           enable XCIN Chinese input support"
-+ac_help="$ac_help
-   --enable-greek          enable greek keyboard support"
- ac_help="$ac_help
-   --enable-ttygid         enable tty setting to group \"tty\" - use only if
-@@ -723,6 +725,17 @@
-   if test x$enableval = xyes; then
-     cat >> confdefs.h <<\EOF
- #define ZH 1
-+EOF
-+
-+  fi
-+fi
-+
-+# Check whether --enable-xcin or --disable-xcin was given.
-+if test "${enable_xcin+set}" = set; then
-+  enableval="$enable_xcin"
-+  if test x$enableval = xyes; then
-+    cat >> confdefs.h <<\EOF
-+#define XCIN 1
- EOF
- 
-   fi
---- doc/Makefile.in.orig	Fri Oct  9 16:47:58 1998
-+++ doc/Makefile.in	Fri Oct  9 16:48:35 1998
+--- doc/Makefile.in.orig	Wed Nov 18 15:20:14 1998
++++ doc/Makefile.in	Tue Dec  8 23:42:24 1998
 @@ -55,7 +55,7 @@
  
  tags allbin:
  
 -alldoc:	$(basedir)/$(VERNAME).lsm rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
-+alldoc:	rxvt.1
++alldoc:	
+ 
+ $(basedir)/$(VERNAME).lsm: LSM.in $(srcdir)/../autoconf/Make.common.in $(srcdir)/../src/version.h
+ 	$(SED) $(SEDREPLACE) < $(srcdir)/LSM.in > $@
+@@ -83,8 +83,8 @@
  
- $(basedir)/$(VERNAME).lsm: LSM.in ../autoconf/Make.common.in
- 	$(SED) $(SEDREPLACE) < LSM.in > $@
-@@ -84,7 +84,7 @@
  distclean:
  
- install: rxvt.1
+-install: rxvt.1
 -	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext)
++install: 
 +	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)crxvt2.$(manext)
  
  uninstall:
diff --git a/chinese/rxvt/files/patch-ab b/chinese/rxvt/files/patch-ab
index e24a55127d88..5967729b4373 100644
--- a/chinese/rxvt/files/patch-ab
+++ b/chinese/rxvt/files/patch-ab
@@ -1,38 +1,68 @@
---- autoconf/acconfig.h.orig	Fri Oct  9 16:09:57 1998
-+++ autoconf/acconfig.h	Fri Oct  9 16:10:32 1998
-@@ -35,6 +35,9 @@
+--- configure.orig	Tue Dec  8 23:17:30 1998
++++ configure	Tue Dec  8 23:18:24 1998
+@@ -32,6 +32,8 @@
+ ac_help="$ac_help
+   --enable-big5           enable big5 support"
+ ac_help="$ac_help
++  --enable-xcin           enable Chinese input support"
++ac_help="$ac_help
+   --enable-greek          enable greek keyboard support"
+ ac_help="$ac_help
+   --enable-ttygid         enable tty setting to group \"tty\" - use only if
+@@ -722,6 +724,18 @@
+   if test x$enableval = xyes; then
+     cat >> confdefs.h <<\EOF
+ #define ZH 1
++EOF
++
++  fi
++fi
++
++
++# Check whether --enable-xcin or --disable-xcin was given.
++if test "${enable_xcin+set}" = set; then
++  enableval="$enable_xcin"
++  if test x$enableval = xyes; then
++    cat >> confdefs.h <<\EOF
++#define XCIN 1
+ EOF
+ 
+   fi
+--- autoconf/acconfig.h.orig	Tue Dec  8 21:26:28 1998
++++ autoconf/acconfig.h	Tue Dec  8 21:27:20 1998
+@@ -34,6 +34,9 @@
  /* after compilation, rename executable as `crxvt' */
  #undef ZH
  
-+/* Define if you want XCIN Chinese Input support */
++/* Define if you want chinese input support */
 +#undef XCIN
 +
  /* Define if Xlocale support doesn't work */
  #undef NO_XLOCALE
  
---- autoconf/config.h.in.orig	Fri Oct  9 16:10:46 1998
-+++ autoconf/config.h.in	Fri Oct  9 16:11:23 1998
-@@ -80,6 +80,9 @@
+--- autoconf/config.h.in.orig	Tue Dec  8 21:27:34 1998
++++ autoconf/config.h.in	Tue Dec  8 21:28:02 1998
+@@ -76,6 +76,9 @@
  /* after compilation, rename executable as `crxvt' */
  #undef ZH
  
-+/* Define if you want XCIN Chinese Input support */
++/* Define if you want chinese input support */
 +#undef XCIN
 +
  /* Define if Xlocale support doesn't work */
  #undef NO_XLOCALE
  
---- autoconf/configure.in.orig	Fri Oct  9 16:11:33 1998
-+++ autoconf/configure.in	Fri Oct  9 16:12:13 1998
+--- autoconf/configure.in.orig	Tue Dec  8 21:28:18 1998
++++ autoconf/configure.in	Tue Dec  8 21:29:12 1998
 @@ -82,6 +82,12 @@
      AC_DEFINE(ZH)
    fi])
  
 +AC_ARG_ENABLE(xcin,
-+[  --enable-xcin           enable XCIN support],
-+[if test x$enableval = xyes; then
-+  AC_DEFINE(XCIN)
-+fi])
++  [  --enable-xcin           enable Chinese input support],
++  [if test x$enableval = xyes; then
++    AC_DEFINE(XCIN)
++  fi])
 +
  AC_ARG_ENABLE(greek,
    [  --enable-greek          enable greek keyboard support],