* Update to 5.06

* Fix PAM support [1]

PR:		125607 [1]
Submitted by:	Marcin Wisnicki <mwisnicki+freebsd@gmail.com> [1]

4 files changed, 13 insertions, 46 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 2b779a8a0973..43e05e3598df 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	xscreensaver-gnome
-PORTVERSION=	5.05
+PORTVERSION=	5.06
 PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
@@ -37,7 +37,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 OPTIONS?=	PAM "Pluggable Authentication Module support" off \
-		KERBEROS "Add support for kerberos" off \
 		ALL_FORTUNES "Enable support for all fortunes" off \
 		SETUID_HACKS "Install sonar hack suid so it can ping" off
 
@@ -79,6 +78,7 @@ MAN6?=	anemone.6 anemotaxis.6 antinspect.6 antmaze.6 antspotlight.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 cubicgrid.6 hypnowheel.6 \
+	lcdscrub.6 skytentacles.6 \
 	xscreensaver-gl-helper.6
 
 .include <bsd.port.pre.mk>
@@ -88,19 +88,13 @@ CONFIGURE_ARGS+=	--with-fortune="/usr/games/fortune -sa"
 .endif
 
 .if defined(WITH_PAM)
+CONFIGURE_ARGS+=	--with-pam
 PLIST_SUB+=		PAM=""
-CONFIGURE_ARGS+=	--without-pam
 .else
 CONFIGURE_ARGS+=	--without-pam
 PLIST_SUB+=		PAM="@comment "
 .endif
 
-.if defined(WITH_KERBEROS)
-CONFIGURE_ARGS+=	--with-kerberos
-.else
-CONFIGURE_ARGS+=	--without-kerberos
-.endif
-
 .if defined(WITH_SETUID_HACKS)
 CONFIGURE_ARGS+=	--with-setuid-hacks
 .endif
@@ -136,6 +130,5 @@ post-install: post-install-slave
 	    	${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \
 			${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \
 			${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi)
-	${RM} ${PREFIX}/man/man6/lcdscrub
 
 .include <bsd.port.post.mk>
diff --git a/x11/xscreensaver-gnome/distinfo b/x11/xscreensaver-gnome/distinfo
index d38b0f7f2816..5bde7f3aa4b1 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/distinfo
@@ -1,3 +1,3 @@
-MD5 (xscreensaver-5.05.tar.gz) = d759262b10d76f87f1a7fc50ae8664d4
-SHA256 (xscreensaver-5.05.tar.gz) = 3c64366f1990ebe173db422660dce5d9d80b1c758f3a9ad6e55fb72657dc821a
-SIZE (xscreensaver-5.05.tar.gz) = 5468293
+MD5 (xscreensaver-5.06.tar.gz) = c6b2cab02aaea32684d37a9a76488e0f
+SHA256 (xscreensaver-5.06.tar.gz) = e7fb2f228caca0fed3181b0c88970f7bf501c385f8cdb4e152b34a0f43df38f6
+SIZE (xscreensaver-5.06.tar.gz) = 5486779
diff --git a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
index 1ab88ba9ffeb..44ae2bbd660c 100644
--- a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- driver/Makefile.in.orig	2008-07-18 23:39:27.000000000 -0400
++++ driver/Makefile.in	2008-07-18 23:41:40.000000000 -0400
+@@ -81,8 +81,8 @@ XPM_LIBS	= @XPM_LIBS@
  
  
  AD_DIR		= @APPDEFAULTS@
@@ -11,33 +11,3 @@
  
  UTILS_SRC	= $(srcdir)/../utils
  UTILS_BIN	= ../utils
-@@ -239,7 +239,6 @@
- EXTRAS		= README Makefile.in \
- 		  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 \
-@@ -490,21 +489,6 @@
- 	  fi ;								\
- 	fi
- 
--# screensaver-properties.desktop
--# into /usr/share/applications/
--install-gnome:: screensaver-properties.desktop
--	@if [ "$(GTK_DATADIR)" != "" ]; then				      \
--	   if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then		      \
--	     echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
--		  $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)"	     ;\
--	   fi								     ;\
--	   name2=gnome-screensaver-properties.desktop			     ;\
--	   echo $(INSTALL_DATA) screensaver-properties.desktop		      \
--		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
--		$(INSTALL_DATA) screensaver-properties.desktop		      \
--		  $(install_prefix)$(GTK_APPDIR)/$$name2		     ;\
--	 fi
--
- 
- # xscreensaver.xpm
- # into /usr/share/pixmaps/
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 65ead7da00da..419e7fbd65d5 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -175,6 +175,7 @@ bin/xscreensaver-hacks/sballs
 bin/xscreensaver-hacks/shadebobs
 bin/xscreensaver-hacks/sierpinski
 bin/xscreensaver-hacks/sierpinski3d
+bin/xscreensaver-hacks/skytentacles
 bin/xscreensaver-hacks/slidescreen
 bin/xscreensaver-hacks/slip
 bin/xscreensaver-hacks/sonar
@@ -222,6 +223,7 @@ bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
 %%PAM%%etc/pam.d/xscreensaver
+share/applications/xscreensaver-properties.desktop
 share/pixmaps/xscreensaver.xpm
 share/xscreensaver/glade/screensaver-cmndln.png
 share/xscreensaver/glade/screensaver-colorselector.png
@@ -428,6 +430,7 @@ share/xscreensaver/config/sballs.xml
 share/xscreensaver/config/shadebobs.xml
 share/xscreensaver/config/sierpinski.xml
 share/xscreensaver/config/sierpinski3d.xml
+share/xscreensaver/config/skytentacles.xml
 share/xscreensaver/config/slidescreen.xml
 share/xscreensaver/config/slip.xml
 share/xscreensaver/config/sonar.xml
@@ -482,5 +485,6 @@ share/xscreensaver/config/zoom.xml
 @dirrm share/xscreensaver/glade
 @dirrm share/xscreensaver
 @dirrm bin/xscreensaver-hacks
+@dirrmtry share/applications
 @cwd %%LOCALBASE%%
 lib/X11/app-defaults/XScreenSaver