- Upgrade to 5.2;

- don't build the shared library and thus remove CONFLICTS.

Changelog at <http://dist.schmorp.de/rxvt-unicode/Changes>.

4 files changed, 5 insertions, 51 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 516120fb7dac..6bd153164558 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rxvt-unicode
-PORTVERSION=	5.1
+PORTVERSION=	5.2
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Attic
@@ -20,13 +20,11 @@ BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 USE_PERL5_BUILD=	yes
 USE_X_PREFIX=		yes
 USE_XPM=		yes
-USE_LIBTOOL_VER=	15
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--enable-shared --enable-everything --with-term=rxvt
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB=		yes
 USE_BZIP2=		yes
-
-CONFLICTS=	rxvt-devel-2*
+USE_GMAKE=		yes
 
 MAN1=		urxvt.1 urxvtc.1 urxvtd.1
 MAN7=		urxvt.7
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 509e6e426609..f5da21c0b036 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,2 +1,2 @@
-MD5 (rxvt-unicode-5.1.tar.bz2) = 02bf81c841cb05444ca2dd5271e7b167
-SIZE (rxvt-unicode-5.1.tar.bz2) = 845173
+MD5 (rxvt-unicode-5.2.tar.bz2) = 52664198e7c6a500dd9728b1a2c97e8a
+SIZE (rxvt-unicode-5.2.tar.bz2) = 838862
diff --git a/x11/rxvt-unicode/files/patch-src::Makefile.in b/x11/rxvt-unicode/files/patch-src::Makefile.in
index a0973a231a18..e69de29bb2d1 100644
--- a/x11/rxvt-unicode/files/patch-src::Makefile.in
+++ b/x11/rxvt-unicode/files/patch-src::Makefile.in
@@ -1,40 +0,0 @@
---- src/Makefile.in.orig	Mon Aug 16 01:11:45 2004
-+++ src/Makefile.in	Tue Aug 17 21:25:56 2004
-@@ -72,13 +72,13 @@
- 	$(COMPILE) -c $<
- 
- .C.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+	$(LIBTOOL) --tag=CXX --mode=compile $(COMPILE) -c $<
- 
- .s.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+	$(LIBTOOL) --tag=CXX --mode=compile $(COMPILE) -c $<
- 
- .S.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+	$(LIBTOOL) --tag=CXX --mode=compile $(COMPILE) -c $<
- 
- .C.intpro:
- 	@$(RMF) $@.tmp
-@@ -91,16 +91,16 @@
- all: allbin
- 
- rxvt: version.h rxvt.o librxvt.la
--	$(LIBTOOL) --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
-+	$(LIBTOOL) --tag=CXX --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
- 
- rxvtd: version.h rxvtd.o librxvt.la rxvtdaemon.o
--	$(LIBTOOL) --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
-+	$(LIBTOOL) --tag=CXX --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
- 
- rxvtc: version.h rxvtc.o rxvtdaemon.o
--	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) $(DLIB) -o $@
-+	$(LIBTOOL) --tag=CXX --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) $(DLIB) -o $@
- 
- librxvt.la: $(LIBOBJS)
--	$(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
-+	$(LIBTOOL) --tag=CXX --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
- 
- #-------------------------------------------------------------------------
- 
diff --git a/x11/rxvt-unicode/pkg-plist b/x11/rxvt-unicode/pkg-plist
index a68b5f8a5144..a7236238f0d3 100644
--- a/x11/rxvt-unicode/pkg-plist
+++ b/x11/rxvt-unicode/pkg-plist
@@ -1,10 +1,6 @@
 bin/urxvt
 bin/urxvtc
 bin/urxvtd
-include/rxvtlib.h
-lib/librxvt.a
-lib/librxvt.so
-lib/librxvt.so.1
 %%PORTDOCS%%%%EXAMPLESDIR%%/example.menu
 %%PORTDOCS%%%%EXAMPLESDIR%%/jedmenu.sl
 %%PORTDOCS%%%%EXAMPLESDIR%%/menu