Update to 8.1 and add support for options.

From Christian Gall (with minor modifications, all errors are mine).

4 files changed, 64 insertions, 30 deletions

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 363ddb4b7a8..71018539790 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/08/07 23:21:16 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 15:01:30 martin Exp $
 #
 
-DISTNAME=		rxvt-unicode-7.9
+DISTNAME=		rxvt-unicode-8.1
 CATEGORIES=		x11
 MASTER_SITES=		http://dist.schmorp.de/rxvt-unicode/ \
 			http://dist.schmorp.de/rxvt-unicode/Attic/
@@ -26,8 +26,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rxvt-unicode
 	${INSTALL_DATA} ${WRKSRC}/README.FAQ ${PREFIX}/share/doc/rxvt-unicode
 
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "options.mk"
+
 .include "../../graphics/xpm/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/rxvt-unicode/PLIST b/x11/rxvt-unicode/PLIST
index b173e3588ee..d40b315b3a0 100644
--- a/x11/rxvt-unicode/PLIST
+++ b/x11/rxvt-unicode/PLIST
@@ -1,31 +1,32 @@
-@comment $NetBSD: PLIST,v 1.4 2006/08/07 23:21:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/12/15 15:01:30 martin Exp $
 bin/urxvt
 bin/urxvtc
 bin/urxvtd
-lib/urxvt/perl/automove-background
-lib/urxvt/perl/block-graphics-to-ascii
-lib/urxvt/perl/digital-clock
-lib/urxvt/perl/example-refresh-hooks
-lib/urxvt/perl/kuake
-lib/urxvt/perl/mark-urls
-lib/urxvt/perl/option-popup
-lib/urxvt/perl/readline
-lib/urxvt/perl/remote-clipboard
-lib/urxvt/perl/searchable-scrollback
-lib/urxvt/perl/selection
-lib/urxvt/perl/selection-autotransform
-lib/urxvt/perl/selection-pastebin
-lib/urxvt/perl/selection-popup
-lib/urxvt/perl/tabbed
-lib/urxvt/perl/urxvt-popup
-lib/urxvt/perl/xim-onthespot
-lib/urxvt/urxvt.pm
+${PERL}lib/urxvt/perl/automove-background
+${PERL}lib/urxvt/perl/block-graphics-to-ascii
+${PERL}lib/urxvt/perl/digital-clock
+${PERL}lib/urxvt/perl/example-refresh-hooks
+${PERL}lib/urxvt/perl/kuake
+${PERL}lib/urxvt/perl/macosx-clipboard
+${PERL}lib/urxvt/perl/matcher
+${PERL}lib/urxvt/perl/option-popup
+${PERL}lib/urxvt/perl/readline
+${PERL}lib/urxvt/perl/remote-clipboard
+${PERL}lib/urxvt/perl/searchable-scrollback
+${PERL}lib/urxvt/perl/selection
+${PERL}lib/urxvt/perl/selection-autotransform
+${PERL}lib/urxvt/perl/selection-pastebin
+${PERL}lib/urxvt/perl/selection-popup
+${PERL}lib/urxvt/perl/tabbed
+${PERL}lib/urxvt/perl/urxvt-popup
+${PERL}lib/urxvt/perl/xim-onthespot
+${PERL}lib/urxvt/urxvt.pm
 man/man1/urxvt.1
 man/man1/urxvtc.1
 man/man1/urxvtd.1
-man/man3/urxvtperl.3
+${PERL}man/man3/urxvtperl.3
 man/man7/urxvt.7
 share/doc/rxvt-unicode/README.FAQ
 @dirrm share/doc/rxvt-unicode
-@dirrm lib/urxvt/perl
-@dirrm lib/urxvt
+${PERL}@dirrm lib/urxvt/perl
+${PERL}@dirrm lib/urxvt
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index f7a58340794..4da85a7fc9c 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/08/07 23:21:16 wiz Exp $
+$NetBSD: distinfo,v 1.8 2006/12/15 15:01:30 martin Exp $
 
-SHA1 (rxvt-unicode-7.9.tar.bz2) = 083f1ef731d422419b5dcd4a0875b3905cdcf17d
-RMD160 (rxvt-unicode-7.9.tar.bz2) = 4629b0a15547998632518820dae183b3e3ddca27
-Size (rxvt-unicode-7.9.tar.bz2) = 874374 bytes
+SHA1 (rxvt-unicode-8.1.tar.bz2) = b7d1d5188a655bcade8fd0708903bc3fc73484a4
+RMD160 (rxvt-unicode-8.1.tar.bz2) = 2e0535449267a43222976fd6a3dfeb7fd3201c87
+Size (rxvt-unicode-8.1.tar.bz2) = 874511 bytes
 SHA1 (patch-aa) = cbab8557288f82bd7f04741596bdce6d18a161a6
diff --git a/x11/rxvt-unicode/options.mk b/x11/rxvt-unicode/options.mk
new file mode 100644
index 00000000000..98d65453261
--- /dev/null
+++ b/x11/rxvt-unicode/options.mk
@@ -0,0 +1,33 @@
+#
+# $Id: options.mk,v 1.1 2006/12/15 15:01:30 martin Exp $
+#
+
+PKG_OPTIONS_VAR=        PKG_OPTIONS.rxvt-unicode
+PKG_SUPPORTED_OPTIONS=  perl unicode3 xft2
+PKG_SUGGESTED_OPTIONS=  perl unicode3 xft2
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mperl)
+CONFIGURE_ARGS+=        --enable-perl
+PLIST_SUBST+=           PERL=
+.include "../../lang/perl5/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=        --disable-perl
+PLIST_SUBST+=           PERL='@comment '
+.endif
+
+# use 21 instead of 16 bits to represent unicode characters
+.if !empty(PKG_OPTIONS:Municode3)
+CONFIGURE_ARGS+=        --enable-unicode3
+.else
+CONFIGURE_ARGS+=        --disable-unicode3
+.endif
+
+.if !empty(PKG_OPTIONS:Mxft2)
+CONFIGURE_ARGS+=        --enable-xft
+.include "../../fonts/Xft2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=        --disable-xft
+.endif
+