Update to version 5.04, which contains the usual combination of

a few new screesavers and miscellaneous bug fixes.

For the port:
1. Update the CONFIGURE_ARGS for the new xorg and other options
2. Add an OPTION to add --with-kerberos
3. Add an OPTION for PAM support, and delete stuff that was designed
to disable PAM.
4. Related to above, add a policy file for PAM that is relevant to
FreeBSD, and simply copy that over the distribution's and allow the
normal install method to work.

5 files changed, 56 insertions, 33 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 368b2eab367a..a0f535688909 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	5.03
+PORTVERSION=	5.04
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
@@ -23,13 +23,16 @@ USE_XPM=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-pam --with-gl --with-gle --with-xpm --with-xml \
+CONFIGURE_ARGS=	--with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
+		--with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \
 		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
 		--with-configdir=${PREFIX}/share/xscreensaver/config/ \
-		--with-jpeg=${LOCALBASE} --without-gnome --without-kerberos \
-		--without-motif
+		--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
+		--with-xf86gamma-ext --with-randr-ext --enable-locking
 
 OPTIONS=	ALL_FORTUNES "Run fortune with -sa argument" off \
+		KERBEROS "Add support for kerberos" off \
+		PAM "Add support for pam authentication" off \
 		SETUID_HACKS "Install sonar hack suid so it can ping" off
 
 .include <bsd.port.pre.mk>
@@ -37,6 +40,18 @@ OPTIONS=	ALL_FORTUNES "Run fortune with -sa argument" off \
 .if defined(WITH_ALL_FORTUNES)
 CONFIGURE_ARGS+=	--with-fortune="/usr/games/fortune -sa"
 .endif
+.if defined(WITH_KERBEROS)
+CONFIGURE_ARGS+=	--with-kerberos
+.else
+CONFIGURE_ARGS+=	--without-kerberos
+.endif
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+=	--with-pam
+PLIST_SUB+=		PAM=""
+.else
+CONFIGURE_ARGS+=	--without-pam
+PLIST_SUB+=		PAM="@comment not installed: "
+.endif
 .if defined(WITH_SETUID_HACKS)
 CONFIGURE_ARGS+=	--with-setuid-hacks
 .endif
@@ -82,6 +97,7 @@ MAN6=	anemone.6 anemotaxis.6 antinspect.6 antmaze.6 antspotlight.6 \
 	wander.6 webcollage.6 whirlwindwarp.6 whirlygig.6 worm.6 wormhole.6 \
 	xanalogtv.6 xflame.6 xjack.6 xlyap.6 xmatrix.6 xrayswarm.6 \
 	xspirograph.6 xsublim.6 zoom.6 cwaves.6 glcells.6 voronoi.6 \
+	abstractile.6 moebiusgears.6 lockward.6 \
 	xscreensaver-gl-helper.6
 
 .if ${ARCH} == "amd64"
@@ -105,6 +121,14 @@ post-patch:
 		-e 's#malloc.h#stdlib.h#g' \
 		-e 's#/usr/X11R6#${LOCALBASE}#g' \
 		${WRKSRC}/configure.Patched > ${WRKSRC}/configure
+.if defined(WITH_PAM)
+.for f in driver/passwd-pam.c driver/xscreensaver.man
+	@ ${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
+	@ ${SED} -e "s#/etc/pam.d#${PREFIX}/etc/pam.d#g" \
+	    ${WRKSRC}/${f}.presed > ${WRKSRC}/${f}
+.endfor
+	@ ${CP} ${FILESDIR}/xscreensaver.pam ${WRKSRC}/driver/xscreensaver.pam
+.endif
 
 post-install:
 	@(if test -x ${LOCALBASE}/bin/xscreensaver-hacks/webcollage-helper; then \
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 2eae3f431b13..00db550e892c 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xscreensaver-5.03.tar.gz) = 367b0397132102faf43e71e27bbdc181
-SHA256 (xscreensaver-5.03.tar.gz) = 82ad32523f5e6b8c8b6431aac4474f2bfde9d4cf70caec9446ed900f48887d26
-SIZE (xscreensaver-5.03.tar.gz) = 5412089
+MD5 (xscreensaver-5.04.tar.gz) = 1d27b5ddecdb49c806d1e91ca82fc43e
+SHA256 (xscreensaver-5.04.tar.gz) = d1200b497795e6e32853e434a81be0cba718a3a46457b378cad7ac9d0dfba6d7
+SIZE (xscreensaver-5.04.tar.gz) = 5438905
diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in
index ce663e9be6c5..1ab88ba9ffeb 100644
--- a/x11/xscreensaver/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver/files/patch-driver_Makefile.in
@@ -1,39 +1,28 @@
---- driver/Makefile.in.orig	Tue May 23 16:01:35 2006
-+++ driver/Makefile.in	Sun Jun  4 00:01:46 2006
-@@ -121,7 +121,7 @@
- 		  test-randr    xdpyinfo
+--- driver/Makefile.in.orig	2007-11-13 00:39:35.000000000 -0800
++++ driver/Makefile.in	2007-12-08 23:23:01.000000000 -0800
+@@ -81,8 +81,8 @@
  
- MOTIF_LIBS	= @MOTIF_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
--GTK_LIBS	= @GTK_LIBS@ $(XMU_LIBS)
-+GTK_LIBS	= @GTK_LIBS@ @XPM_LIBS@ $(XMU_LIBS)
- XML_LIBS	= @XML_LIBS@
  
- XDPMS_LIBS	= @XDPMS_LIBS@
-@@ -236,9 +236,8 @@
- MEN		= $(MEN_1) @MEN_OSX@
+ AD_DIR		= @APPDEFAULTS@
+-PAM_DIR		= /etc/pam.d
+-PAM_CONF	= /etc/pam.conf
++PAM_DIR		= ${prefix}/etc/pam.d
++PAM_CONF	= ${prefix}/etc/pam.conf
  
+ UTILS_SRC	= $(srcdir)/../utils
+ UTILS_BIN	= ../utils
+@@ -239,7 +239,6 @@
  EXTRAS		= README Makefile.in \
--		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
-+		  XScreenSaver.ad.in XScreenSaver-Xm.ad \
+ 		  XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
  		  xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
 -		  screensaver-properties.desktop.in \
  		  .gdbinit
  VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
  		  vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \
-@@ -257,7 +256,7 @@
- tests: $(TEST_EXES)
- 
- install:   install-program   install-ad    install-scripts \
--	   install-gnome     install-man   install-xml install-pam
-+	   install-gnome     install-man   install-xml
- uninstall: uninstall-program uninstall-ad  \
- 	   uninstall-gnome   uninstall-man uninstall-xml  
- 
-@@ -486,21 +485,6 @@
-  $$e ""									     ;\
+@@ -490,21 +489,6 @@
  	  fi ;								\
  	fi
--
+ 
 -# screensaver-properties.desktop
 -# into /usr/share/applications/
 -install-gnome:: screensaver-properties.desktop
@@ -48,6 +37,7 @@
 -		$(INSTALL_DATA) screensaver-properties.desktop		      \
 -		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
 -	 fi
- 
+-
  
  # xscreensaver.xpm
+ # into /usr/share/pixmaps/
diff --git a/x11/xscreensaver/files/xscreensaver.pam b/x11/xscreensaver/files/xscreensaver.pam
new file mode 100644
index 000000000000..1cd383e68d50
--- /dev/null
+++ b/x11/xscreensaver/files/xscreensaver.pam
@@ -0,0 +1,2 @@
+auth		include		system
+account		include		system
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index fb9f35cf6eb7..a11ca7ebfbd4 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -5,6 +5,7 @@ bin/xscreensaver-getimage
 bin/xscreensaver-getimage-file
 bin/xscreensaver-getimage-video
 bin/xscreensaver-gl-helper
+bin/xscreensaver-hacks/abstractile
 bin/xscreensaver-hacks/anemone
 bin/xscreensaver-hacks/anemotaxis
 bin/xscreensaver-hacks/antinspect
@@ -121,6 +122,7 @@ bin/xscreensaver-hacks/lisa
 bin/xscreensaver-hacks/lissie
 bin/xscreensaver-hacks/ljlatest
 bin/xscreensaver-hacks/lmorph
+bin/xscreensaver-hacks/lockward
 bin/xscreensaver-hacks/loop
 bin/xscreensaver-hacks/m6502
 bin/xscreensaver-hacks/maze
@@ -130,6 +132,7 @@ bin/xscreensaver-hacks/metaballs
 bin/xscreensaver-hacks/mirrorblob
 bin/xscreensaver-hacks/mismunch
 bin/xscreensaver-hacks/moebius
+bin/xscreensaver-hacks/moebiusgears
 bin/xscreensaver-hacks/moire
 bin/xscreensaver-hacks/moire2
 bin/xscreensaver-hacks/molecule
@@ -215,8 +218,10 @@ bin/xscreensaver-hacks/xspirograph
 bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
+%%PAM%%etc/pam.d/xscreensaver
 share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/README
+%%DATADIR%%/config/abstractile.xml
 %%DATADIR%%/config/anemone.xml
 %%DATADIR%%/config/anemotaxis.xml
 %%DATADIR%%/config/antinspect.xml
@@ -336,6 +341,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/lisa.xml
 %%DATADIR%%/config/lissie.xml
 %%DATADIR%%/config/lmorph.xml
+%%DATADIR%%/config/lockward.xml
 %%DATADIR%%/config/loop.xml
 %%DATADIR%%/config/m6502.xml
 %%DATADIR%%/config/maze.xml
@@ -345,6 +351,7 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/mirrorblob.xml
 %%DATADIR%%/config/mismunch.xml
 %%DATADIR%%/config/moebius.xml
+%%DATADIR%%/config/moebiusgears.xml
 %%DATADIR%%/config/moire.xml
 %%DATADIR%%/config/moire2.xml
 %%DATADIR%%/config/molecule.xml