>Number:         34727
>Category:       pkg
>Synopsis:       Patches for rxvt-unicode (more customization)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Oct 06 05:00:00 +0000 2006
>Originator:     Christian Biere
>Release:        NetBSD 4.99.3
>Environment:
System: NetBSD cyclonus 4.99.3 NetBSD 4.99.3 (STARSCREAM) #0: Mon Oct 2 23:04:22 CEST 2006 src@cyclonus:/o/NetBSD/obj/sys/arch/i386/compile/STARSCREAM i386
Architecture: i386
Machine: i386
>Description:
The following patches achieve the following:

 o Remove outdated configure options which are NOOPs.

 o Add the configure option --enable-unicode3 because
   UCS-2 is not state-of-the-art and this option is
   not labeled experimental, buggy or whatever.

 o Make Perl support optional. Due to this the PLIST is
   not static anymore i.e., the PLIST must be removed.

 o Make XPM support (used for background images) optional.

 o Make Xft support optional. According to the manual
   page, Xft is actually not recommended by the author
   and at least for me it works fine without too.

All options are enabled by default so that nothing
changes for people not interested in any of these
customizations - unless they disable any of them by
PKG_DEFAULT_OPTIONS of course.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt-unicode/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	7 Aug 2006 23:21:16 -0000	1.13
+++ Makefile	6 Oct 2006 04:35:18 -0000
@@ -16,18 +16,18 @@
 USE_TOOLS+=		pkg-config
 
 CONFIGURE_ARGS+=	--enable-transparency	\
-			--enable-menubar	\
-			--enable-xpm-background	\
-			--enable-xgetdefault	\
-			--with-term=rxvt	\
-			--enable-24bit
+			--enable-unicode3 \
+			--with-term=rxvt
+
+PLIST_SRC=		${PKGDIR}/PLIST.common
+
+.include "options.mk"
+
+PLIST_SRC+=		${PKGDIR}/PLIST.common_end
 
 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 "../../graphics/xpm/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/rxvt-unicode/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST	7 Aug 2006 23:21:16 -0000	1.4
+++ PLIST	6 Oct 2006 04:35:18 -0000
@@ -1,31 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2006/08/07 23:21:16 wiz 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
-man/man1/urxvt.1
-man/man1/urxvtc.1
-man/man1/urxvtd.1
-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
--- /dev/null	2006-10-06 06:35:28.000000000 +0200
+++ PLIST.common	2006-10-06 05:53:41.000000000 +0200
@@ -0,0 +1,9 @@
+@comment $NetBSD$
+bin/urxvt
+bin/urxvtc
+bin/urxvtd
+man/man1/urxvt.1
+man/man1/urxvtc.1
+man/man1/urxvtd.1
+man/man7/urxvt.7
+share/doc/rxvt-unicode/README.FAQ
--- /dev/null	2006-10-06 06:35:28.000000000 +0200
+++ PLIST.common_end	2006-10-06 06:03:31.000000000 +0200
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+@dirrm share/doc/rxvt-unicode
--- /dev/null	2006-10-06 06:35:28.000000000 +0200
+++ PLIST.perl	2006-10-06 06:03:20.000000000 +0200
@@ -0,0 +1,22 @@
+@comment $NetBSD$
+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
+man/man3/urxvtperl.3
+@dirrm lib/urxvt/perl
+@dirrm lib/urxvt
--- /dev/null	2006-10-06 06:35:28.000000000 +0200
+++ options.mk	2006-10-06 05:58:44.000000000 +0200
@@ -0,0 +1,34 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.rxvt-unicode
+PKG_SUPPORTED_OPTIONS=	perl xft xft2 xpm
+PKG_SUGGESTED_OPTIONS=	perl xft2 xpm
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mperl)
+PLIST_SRC+=	${PKGDIR}/PLIST.perl
+CONFIGURE_ARGS+=--enable-perl
+.include "../../lang/perl5/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=--disable-perl
+.endif
+
+.if !empty(PKG_OPTIONS:Mxft) || !empty(PKG_OPTIONS:Mxft2)
+CONFIGURE_ARGS+=--enable-xft
+.include "../../fonts/Xft2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=--disable-xft
+.endif
+
+.if !empty(PKG_OPTIONS:Mxpm)
+CONFIGURE_ARGS+=--enable-xpm-background \
+		--with-xpm \
+		--with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include \
+		--with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib
+
+.include "../../graphics/xpm/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=--disable-xpm-background \
+		--without-xpm
+.endif
Index: options.description
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/options.description,v
retrieving revision 1.117
diff -u -r1.117 options.description
--- options.description	24 Sep 2006 16:22:42 -0000	1.117
+++ options.description	6 Oct 2006 04:41:44 -0000
@@ -215,7 +218,7 @@
 pcb-motif		Use Motif for the gui instead of GTK for cad/pcb.
 pcre	
 perf-tuning	
-perl	
+perl			Enable Perl support.
 pf	
 pgsql			Enable PostgreSQL support.
 pinfo-native-curses	Use NetBSD native curses rather than ncurses.
@@ -359,6 +362,7 @@
 xorg-server-vga	
 xorg-server-via	
 xorg-server-vmware	
+xpm			Enable XPM support.
 xrender			Enable Xrender support.
 xscreensaver-webcollage	Install webcollage screensaver.
 xterm-256color		Enable 256 color support.