[pkgsrc/trunk]: pkgsrc/x11/xscreensaver Do not install webcollage screensaver...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c2b976868599
branches:  trunk
changeset: 512715:c2b976868599
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun May 14 18:55:50 2006 +0000

description:
Do not install webcollage screensaver by default, since it downloads
random images from the web for display, which might include
pornographic or otherwise unwanted pictures. I couldn't find a way
to disable this globally by default while still installing it, so
we just don't compile and install it now. Bump PKGREVISION for this
change. Addresses PR 33310 by Hiroyuki Bessho.

Split out options stuff to options.mk file.
Add option to install the webcollage screensaver.
Clean up a pkglint warning.
Remove some gettext workaround; this should be fixed by adding the
appropriate tool to USE_TOOLS instead.

diffstat:

 x11/xscreensaver/Makefile         |  22 ++++------------------
 x11/xscreensaver/Makefile.common  |   3 +--
 x11/xscreensaver/PLIST            |   9 +++------
 x11/xscreensaver/PLIST.webcollage |   4 ++++
 x11/xscreensaver/options.mk       |  20 ++++++++++++++++++++
 5 files changed, 32 insertions(+), 26 deletions(-)

diffs (137 lines):

diff -r 86bf6d68d353 -r c2b976868599 x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Sun May 14 18:45:25 2006 +0000
+++ b/x11/xscreensaver/Makefile Sun May 14 18:55:50 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2006/02/05 23:11:49 joerg Exp $
+# $NetBSD: Makefile,v 1.78 2006/05/14 18:55:50 wiz Exp $
 
 COMMENT=       Screen saver and locker for the X window system
-PKGREVISION=   3
+PKGREVISION=   4
 
 CONFLICTS+=    xscreensaver-gnome<4.14
 # man/man1/barcode.1
@@ -13,21 +13,7 @@
 CONFIGURE_ARGS+=       --with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=       --with-configdir=${PREFIX}/libexec/xscreensaver/config
 
-.include "../../textproc/libxml2/buildlink3.mk"
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.xscreensaver
-PKG_SUPPORTED_OPTIONS= pam
-.include "../../mk/bsd.options.mk"
+.include "options.mk"
 
-.if !empty(PKG_OPTIONS:Mpam)
-.  include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+=       --with-pam
-.endif
-
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if exists(${WRKSRC}/po/ca.gmo)
-PLIST_SUBST+=           OLD_GETTEXT=
-.else
-PLIST_SUBST+=           OLD_GETTEXT="@comment "
-.endif
diff -r 86bf6d68d353 -r c2b976868599 x11/xscreensaver/Makefile.common
--- a/x11/xscreensaver/Makefile.common  Sun May 14 18:45:25 2006 +0000
+++ b/x11/xscreensaver/Makefile.common  Sun May 14 18:55:50 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.87 2006/04/13 18:23:44 jlam Exp $
+# $NetBSD: Makefile.common,v 1.88 2006/05/14 18:55:50 wiz Exp $
 #
 
 DISTNAME=              xscreensaver-4.22
@@ -36,7 +36,6 @@
 CONFIGURE_ARGS+=       ac_cv_path_INTLTOOL_PERL=${PERL5:Q}
 
 DISTINFO_FILE=         ${.CURDIR}/../../x11/xscreensaver/distinfo
-FILESDIR=              ${.CURDIR}/../../x11/xscreensaver/files
 PATCHDIR=              ${.CURDIR}/../../x11/xscreensaver/patches
 
 .include "../../mk/bsd.prefs.mk"
diff -r 86bf6d68d353 -r c2b976868599 x11/xscreensaver/PLIST
--- a/x11/xscreensaver/PLIST    Sun May 14 18:45:25 2006 +0000
+++ b/x11/xscreensaver/PLIST    Sun May 14 18:55:50 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2006/04/17 07:07:54 jlam Exp $
+@comment $NetBSD: PLIST,v 1.28 2006/05/14 18:55:50 wiz Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -224,7 +224,6 @@
 libexec/xscreensaver/config/vidwhacker.xml
 libexec/xscreensaver/config/vines.xml
 libexec/xscreensaver/config/wander.xml
-libexec/xscreensaver/config/webcollage.xml
 libexec/xscreensaver/config/whirlwindwarp.xml
 libexec/xscreensaver/config/whirlygig.xml
 libexec/xscreensaver/config/worm.xml
@@ -391,7 +390,6 @@
 libexec/xscreensaver/vidwhacker
 libexec/xscreensaver/vines
 libexec/xscreensaver/wander
-libexec/xscreensaver/webcollage
 libexec/xscreensaver/whirlwindwarp
 libexec/xscreensaver/whirlygig
 libexec/xscreensaver/worm
@@ -590,7 +588,6 @@
 man/man1/vidwhacker.1
 man/man1/vines.1
 man/man1/wander.1
-man/man1/webcollage.1
 man/man1/whirlwindwarp.1
 man/man1/whirlygig.1
 man/man1/worm.1
@@ -612,7 +609,7 @@
 man/man1/xsublim.1
 man/man1/xteevee.1
 man/man1/zoom.1
-${OLD_GETTEXT}share/locale/ca/LC_MESSAGES/xscreensaver.mo
+share/locale/ca/LC_MESSAGES/xscreensaver.mo
 share/locale/da/LC_MESSAGES/xscreensaver.mo
 share/locale/de/LC_MESSAGES/xscreensaver.mo
 share/locale/es/LC_MESSAGES/xscreensaver.mo
@@ -628,7 +625,7 @@
 share/locale/no/LC_MESSAGES/xscreensaver.mo
 share/locale/pl/LC_MESSAGES/xscreensaver.mo
 share/locale/pt/LC_MESSAGES/xscreensaver.mo
-${OLD_GETTEXT}share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
+share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
 share/locale/ru/LC_MESSAGES/xscreensaver.mo
 share/locale/sk/LC_MESSAGES/xscreensaver.mo
 share/locale/sv/LC_MESSAGES/xscreensaver.mo
diff -r 86bf6d68d353 -r c2b976868599 x11/xscreensaver/PLIST.webcollage
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xscreensaver/PLIST.webcollage Sun May 14 18:55:50 2006 +0000
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.webcollage,v 1.1 2006/05/14 18:55:50 wiz Exp $
+libexec/xscreensaver/config/webcollage.xml
+libexec/xscreensaver/webcollage
+man/man1/webcollage.1
diff -r 86bf6d68d353 -r c2b976868599 x11/xscreensaver/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xscreensaver/options.mk       Sun May 14 18:55:50 2006 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2006/05/14 18:55:50 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.xscreensaver
+PKG_SUPPORTED_OPTIONS= pam xscreensaver-webcollage
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-pam
+.endif
+
+.if !empty(PKG_OPTIONS:Mxscreensaver-webcollage)
+PLIST_SRC=     PLIST.webcollage PLIST
+.else
+post-install:
+       ${RM} ${PREFIX}/libexec/xscreensaver/config/webcollage.xml
+       ${RM} ${PREFIX}/libexec/xscreensaver/webcollage
+       ${RM} ${PREFIX}/man/man1/webcollage.1
+.endif