Module Name:	pkgsrc
Committed By:	wiz
Date:		Sun May 14 18:55:50 UTC 2006

Modified Files:
	pkgsrc/x11/xscreensaver: Makefile Makefile.common PLIST
Added Files:
	pkgsrc/x11/xscreensaver: PLIST.webcollage options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.77 -r1.78 pkgsrc/x11/xscreensaver/Makefile
cvs rdiff -r1.87 -r1.88 pkgsrc/x11/xscreensaver/Makefile.common
cvs rdiff -r1.27 -r1.28 pkgsrc/x11/xscreensaver/PLIST
cvs rdiff -r0 -r1.1 pkgsrc/x11/xscreensaver/PLIST.webcollage \
    pkgsrc/x11/xscreensaver/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.