Upgrading to 9.19.

Changelog at http://cvs.schmorp.de/rxvt-unicode/Changes.

4 files changed, 66 insertions, 32 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index b5f5912abe97..ec9c05c9cb7b 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rxvt-unicode
-PORTVERSION=	9.18
+PORTVERSION=	9.19
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Attic
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	tic:${PORTSDIR}/devel/ncurses	\
 RUN_DEPENDS=	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig	\
 		${LOCALBASE}/share/misc/terminfo.db:${PORTSDIR}/devel/ncurses
 
-USES=			pkgconfig
+USES=			pkgconfig shebangfix
 USE_XORG=		xpm xft xrender
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
@@ -31,6 +31,10 @@ OPTIONS_DEFINE=	PERL XIM UNICODE3 ISO14755 COMBINING RXVT_SCROLLBAR	\
 		MOUSEWHEEL SMART_RESIZE IMLOCALE_FIX GDK_PIXBUF		\
 		NOTIFY 256_COLOR
 
+SHEBANG_FILES=	${WRKSRC}/src/perl/*
+perl_OLD_CMD=	perl
+perl_CMD=	${SETENV} perl
+
 PERL_DESC=		Embedded Perl interpreter
 XIM_DESC=		Support for XIM (X Input Method) protocol
 UNICODE3_DESC=		Support Unicode codepoints above 65535
@@ -52,13 +56,9 @@ OPTIONS_DEFAULT=PERL XIM UNICODE3 ISO14755 COMBINING RXVT_SCROLLBAR	\
 		NEXT_SCROLLBAR XTERM_SCROLLBAR BACKSPACE_KEY DELETE_KEY	\
 		MOUSEWHEEL SMART_RESIZE IMLOCALE_FIX GDK_PIXBUF
 
-MAN1=		urxvt.1 urxvtc.1 urxvtcd.1 urxvtd.1
-MAN7=		urxvt.7
-
 PORTDOCS1=	Changes README.FAQ README.configure
 PORTDOCS=	README.xvt ${PORTDOCS1}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMLOCALE_FIX}
@@ -74,16 +74,6 @@ USE_PERL5=		build
 PLIST_SUB=		PERL="@comment "
 .else
 USES+=			perl5
-MAN1+=			urxvt-background.1 urxvt-bell-command.1 urxvt-block-graphics-to-ascii.1 \
-			urxvt-clipboard-osc.1 urxvt-confirm-paste.1 urxvt-digital-clock.1	\
-			urxvt-example-refresh-hooks.1 urxvt-extensions.1 urxvt-keysym-list.1	\
-			urxvt-kuake.1 urxvt-macosx-clipboard-native.1 urxvt-macosx-clipboard.1	\
-			urxvt-matcher.1 urxvt-option-popup.1 urxvt-overlay-osc.1		\
-			urxvt-readline.1 urxvt-remote-clipboard.1 urxvt-searchable-scrollback.1	\
-			urxvt-selection-autotransform.1 urxvt-selection-pastebin.1		\
-			urxvt-selection-popup.1 urxvt-selection.1 urxvt-tabbed.1		\
-			urxvt-xim-onthespot.1
-MAN3=			urxvtperl.3
 PLIST_SUB=		PERL=""
 .endif
 
@@ -209,14 +199,19 @@ post-patch:
 pre-configure:
 	${RM} ${WRKSRC}/src/perl/kuake.orig
 
+post-build:
+.if ${PORT_OPTIONS:MDOCS}
+	${CP} ${PORTDOCS1:S|^|${WRKSRC}/|} ${WRKSRC}/doc
+.endif
+
 post-install:
-	${CHMOD} 4711 ${PREFIX}/bin/urxvt ${PREFIX}/bin/urxvtd
+	${CHMOD} 4711 ${STAGEDIR}${PREFIX}/bin/urxvt	\
+		${STAGEDIR}${PREFIX}/bin/urxvtd
 	${INSTALL_DATA} ${WRKSRC}/doc/etc/rxvt-unicode.terminfo	\
-		${LOCALBASE}/share/misc/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	@${CP} ${PORTDOCS1:S|^|${WRKSRC}/|} ${WRKSRC}/doc
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
+		${STAGEDIR}${PREFIX}/share/misc/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 654e2e49ded6..860bce940fb9 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rxvt-unicode-9.18.tar.bz2) = 87b72a43cac7c9362a984094c661a632ce1a829ad90f149142ab1953854b433f
-SIZE (rxvt-unicode-9.18.tar.bz2) = 897170
+SHA256 (rxvt-unicode-9.19.tar.bz2) = d9237cf1973af461ecbeeb708e4d00893294771558e8338b4f33418ed52d3241
+SIZE (rxvt-unicode-9.19.tar.bz2) = 914096
diff --git a/x11/rxvt-unicode/files/patch-src-Makefile.in b/x11/rxvt-unicode/files/patch-src-Makefile.in
index b38eb2ea9670..3af6f9f83775 100644
--- a/x11/rxvt-unicode/files/patch-src-Makefile.in
+++ b/x11/rxvt-unicode/files/patch-src-Makefile.in
@@ -1,6 +1,16 @@
---- src/Makefile.in.orig	2010-12-13 17:49:10.000000000 +0100
-+++ src/Makefile.in	2010-12-28 10:10:42.000000000 +0100
-@@ -44,6 +44,7 @@
+--- src/Makefile.in.orig	2013-10-28 15:08:32.000000000 +0100
++++ src/Makefile.in	2013-10-30 22:19:17.000000000 +0100
+@@ -14,7 +14,8 @@
+ CXX = @CXX@
+ PERL = @PERL@
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL@ -m 755
++INSTALL_PROGRAM = @INSTALL@ -s -m 755
++INSTALL_SCRIPT = @INSTALL@ -m 755
+ INSTALL_DATA = @INSTALL@ -m 644
+ CXXFLAGS = @CXXFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+@@ -46,6 +47,7 @@
  
  RXVT_BINNAME=$(DESTDIR)$(bindir)/$(RXVTNAME)$(EXEEXT)
  RXVTC_BINNAME=$(DESTDIR)$(bindir)/$(RXVTNAME)c$(EXEEXT)
@@ -8,11 +18,11 @@
  RXVTD_BINNAME=$(DESTDIR)$(bindir)/$(RXVTNAME)d$(EXEEXT)
  
  #
-@@ -107,6 +108,7 @@
+@@ -128,6 +130,7 @@
  	$(INSTALL) -d $(DESTDIR)$(bindir)
  	$(INSTALL_PROGRAM) rxvt  $(RXVT_BINNAME)
  	$(INSTALL_PROGRAM) rxvtc $(RXVTC_BINNAME)
-+	$(INSTALL_PROGRAM) urxvtcd $(RXVTCD_BINNAME)
++	$(INSTALL_SCRIPT) urxvtcd $(RXVTCD_BINNAME)
  	$(INSTALL_PROGRAM) rxvtd $(RXVTD_BINNAME)
  
  install: install-bin install-perl
diff --git a/x11/rxvt-unicode/pkg-plist b/x11/rxvt-unicode/pkg-plist
index d5af5059b1b4..c1743c448046 100644
--- a/x11/rxvt-unicode/pkg-plist
+++ b/x11/rxvt-unicode/pkg-plist
@@ -27,9 +27,38 @@ bin/urxvtd
 %%PERL%%lib/urxvt/perl/urxvt-popup
 %%PERL%%lib/urxvt/perl/xim-onthespot
 %%PERL%%lib/urxvt/urxvt.pm
+%%PERL%%man/man1/urxvt-background.1.gz
+%%PERL%%man/man1/urxvt-bell-command.1.gz
+%%PERL%%man/man1/urxvt-block-graphics-to-ascii.1.gz
+%%PERL%%man/man1/urxvt-clipboard-osc.1.gz
+%%PERL%%man/man1/urxvt-confirm-paste.1.gz
+%%PERL%%man/man1/urxvt-digital-clock.1.gz
+%%PERL%%man/man1/urxvt-example-refresh-hooks.1.gz
+%%PERL%%man/man1/urxvt-extensions.1.gz
+%%PERL%%man/man1/urxvt-keysym-list.1.gz
+%%PERL%%man/man1/urxvt-kuake.1.gz
+%%PERL%%man/man1/urxvt-macosx-clipboard-native.1.gz
+%%PERL%%man/man1/urxvt-macosx-clipboard.1.gz
+%%PERL%%man/man1/urxvt-matcher.1.gz
+%%PERL%%man/man1/urxvt-option-popup.1.gz
+%%PERL%%man/man1/urxvt-overlay-osc.1.gz
+%%PERL%%man/man1/urxvt-readline.1.gz
+%%PERL%%man/man1/urxvt-remote-clipboard.1.gz
+%%PERL%%man/man1/urxvt-searchable-scrollback.1.gz
+%%PERL%%man/man1/urxvt-selection-autotransform.1.gz
+%%PERL%%man/man1/urxvt-selection-pastebin.1.gz
+%%PERL%%man/man1/urxvt-selection-popup.1.gz
+%%PERL%%man/man1/urxvt-selection.1.gz
+%%PERL%%man/man1/urxvt-tabbed.1.gz
+%%PERL%%man/man1/urxvt-xim-onthespot.1.gz
+man/man1/urxvt.1.gz
+man/man1/urxvtc.1.gz
+man/man1/urxvtcd.1.gz
+man/man1/urxvtd.1.gz
+%%PERL%%man/man3/urxvtperl.3.gz
+man/man7/urxvt.7.gz
+share/misc/rxvt-unicode.terminfo
 %%PERL%%@dirrm lib/urxvt/perl
 %%PERL%%@dirrm lib/urxvt
-@cwd %%LOCALBASE%%
-share/misc/rxvt-unicode.terminfo
-@exec tic %%LOCALBASE%%/share/misc/rxvt-unicode.terminfo
 @comment No unexec tic available
+@exec tic %D/share/misc/rxvt-unicode.terminfo