Module Name:	pkgsrc
Committed By:	atatat
Date:		Thu Dec 18 13:49:17 UTC 2003

Modified Files:
	pkgsrc/x11/xscreensaver: Makefile Makefile.common distinfo
	pkgsrc/x11/xscreensaver-demo: Makefile
	pkgsrc/x11/xscreensaver-gnome: Makefile
Added Files:
	pkgsrc/x11/xscreensaver/patches: patch-af

Log Message:
Make the password dialogue banner display the netbsd PKGREVISION
number, if there was one (which, of course, makes me bump PKGREVISION
to 1 for all three xscreensaver pkgs (are we really supposed to bump
PKGREVISION for each pkg individually?)).  This eliminates the
confusion where pkg_info says version "4.14nb1" is installed, yet the
dialogue says it's onlu version "4.14".

Also, fix the conflicts for the screensaver pkg so that it properly
conflicts with xscreensaver-gnome<4.14 (not <1.14).


To generate a diff of this commit:
cvs rdiff -r1.62 -r1.63 pkgsrc/x11/xscreensaver/Makefile
cvs rdiff -r1.60 -r1.61 pkgsrc/x11/xscreensaver/Makefile.common
cvs rdiff -r1.32 -r1.33 pkgsrc/x11/xscreensaver/distinfo
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/x11/xscreensaver-demo/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/x11/xscreensaver-gnome/Makefile
cvs rdiff -r0 -r1.13 pkgsrc/x11/xscreensaver/patches/patch-af

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