Fix building on FreeBSD 5.x (link with libutil) after maintainer

timeout (43 days).

While I'm at it, update 2.7.8 -> 2.7.10.  This fixes XIM OverTheSpot for me.

5 files changed, 24 insertions, 32 deletions

diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 8c0afeaba68c..108b66fe5d2b 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -9,8 +9,7 @@
 # the same distfile.
 
 PORTNAME=	rxvt
-PORTVERSION=	2.7.8
-PORTREVISION=	1
+PORTVERSION=	2.7.10
 CATEGORIES+=	x11
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/%SUBDIR%/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/rxvt/%SUBDIR%/ \
@@ -95,11 +94,7 @@ CONFIGURE_ARGS+=	--enable-xim
 CONFIGURE_ARGS+=	--enable-xterm-scroll
 .endif # WITH_XTERM_SCROLLBAR
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
+CONFIGURE_ENV+=		LIBS="-lutil"
 
 pre-everything::
 	@${ECHO_MSG}
@@ -134,4 +129,4 @@ post-patch:
 post-install:
 	@${CHMOD} 4711 ${PREFIX}/bin/rxvt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/rxvt-devel/distinfo b/x11/rxvt-devel/distinfo
index 05bce13c373c..6ecfc117d2f4 100644
--- a/x11/rxvt-devel/distinfo
+++ b/x11/rxvt-devel/distinfo
@@ -1 +1 @@
-MD5 (rxvt-2.7.8.tar.bz2) = bacf6ab83464d4ede04c2407c0a76535
+MD5 (rxvt-2.7.10.tar.bz2) = 00dd774ee6e4e06d5a060266d7bb92f5
diff --git a/x11/rxvt-devel/files/patch-aa b/x11/rxvt-devel/files/patch-aa
index 6474271cd903..f07f98d8a4d8 100644
--- a/x11/rxvt-devel/files/patch-aa
+++ b/x11/rxvt-devel/files/patch-aa
@@ -1,11 +1,19 @@
---- Makefile.in.orig	Fri Dec 24 20:05:41 1999
-+++ Makefile.in	Fri Dec 24 20:05:48 1999
-@@ -9,7 +9,7 @@
- first_rule: all
- dummy:
- 
--subdirs = src doc rclock src/graphics src/test
-+subdirs = src doc # rclock src/graphics src/test
- 
- DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
- 
+*** Makefile.in.orig	Sat Aug  9 15:44:33 2003
+--- Makefile.in	Sat Aug  9 15:44:39 2003
+***************
+*** 9,15 ****
+  first_rule: all
+  dummy:
+  
+! subdirs = src doc rclock src/graphics src/test
+  allsubdirs = W11 $(subdirs)
+  
+  DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
+--- 9,15 ----
+  first_rule: all
+  dummy:
+  
+! subdirs = src doc #rclock src/graphics src/test
+  allsubdirs = W11 $(subdirs)
+  
+  DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
diff --git a/x11/rxvt-devel/files/patch-src::xdefaults.c b/x11/rxvt-devel/files/patch-src::xdefaults.c
deleted file mode 100644
index 1f31e6f8c23a..000000000000
--- a/x11/rxvt-devel/files/patch-src::xdefaults.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/xdefaults.c.orig	Wed Dec  5 15:13:01 2001
-+++ src/xdefaults.c	Wed Dec  5 15:15:37 2001
-@@ -278,7 +278,9 @@
- #endif
-     RSTRG(Rs_selectstyle, "selectstyle", "mode"),
-     RSTRG(Rs_scrollstyle, "scrollstyle", "mode"),
-+#ifdef HAVE_SCROLLBARS
-     RSTRG(Rs_scrollBar_align, "scrollBar_align", "mode"),
-+#endif
- #ifdef PRINTPIPE
-     RSTRG(Rs_print_pipe, "print-pipe", "string"),
- #endif
diff --git a/x11/rxvt-devel/pkg-plist b/x11/rxvt-devel/pkg-plist
index f4800a383070..301393cde056 100644
--- a/x11/rxvt-devel/pkg-plist
+++ b/x11/rxvt-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/rxvt
+bin/rxvt-2.7.10
 include/rxvtlib.h
 lib/librxvt.a
 lib/librxvt.so