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.

1 files changed, 4 insertions, 18 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index f18c2a7804f..7c022ec2730 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -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+=	--without-gtk
 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"
-
-.if !empty(PKG_OPTIONS:Mpam)
-.  include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pam
-.endif
+.include "options.mk"
 
+.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