diff options
author | wiz <wiz> | 2006-05-14 18:55:50 +0000 |
---|---|---|
committer | wiz <wiz> | 2006-05-14 18:55:50 +0000 |
commit | 7ddf1c549a94490da2756685ab18d59723aa7922 (patch) | |
tree | a153eeb680e66da3ef27756a19ef338c64ff829f /x11 | |
parent | 2c5768905b955b08a87e3aeb0f40a3d7e301408f (diff) | |
download | pkgsrc-7ddf1c549a94490da2756685ab18d59723aa7922.tar.gz |
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 (limited to 'x11')
-rw-r--r-- | x11/xscreensaver/Makefile | 22 | ||||
-rw-r--r-- | x11/xscreensaver/Makefile.common | 3 | ||||
-rw-r--r-- | x11/xscreensaver/PLIST | 9 | ||||
-rw-r--r-- | x11/xscreensaver/PLIST.webcollage | 4 | ||||
-rw-r--r-- | x11/xscreensaver/options.mk | 20 |
5 files changed, 32 insertions, 26 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 diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index bbb9a9e1b0f..ffbfefca0a2 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -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_ENV+= X_CFLAGS="-DPKGREVISION=${PKGREVISION}" 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 --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST index 48df8426a3c..1e4add611b8 100644 --- a/x11/xscreensaver/PLIST +++ b/x11/xscreensaver/PLIST @@ -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/vermiculate.xml 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/vermiculate 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/vermiculate.1 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/xspirograph.1 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/nl/LC_MESSAGES/xscreensaver.mo 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 --git a/x11/xscreensaver/PLIST.webcollage b/x11/xscreensaver/PLIST.webcollage new file mode 100644 index 00000000000..5dc22c33140 --- /dev/null +++ b/x11/xscreensaver/PLIST.webcollage @@ -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 --git a/x11/xscreensaver/options.mk b/x11/xscreensaver/options.mk new file mode 100644 index 00000000000..e644d85a9c7 --- /dev/null +++ b/x11/xscreensaver/options.mk @@ -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 |