Upgrade to xscreensaver 3.24

5 files changed, 50 insertions, 16 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 208402c2ae9b..ea63e517f2d5 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION= 	3.21
+PORTVERSION= 	3.24
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -28,8 +28,8 @@ MAN1= 		attraction.1 blitspin.1 bouboule.1 braid.1 \
 		pedal.1 penrose.1 phosphor.1 pyro.1 qix.1 rd-bomb.1 rocks.1 \
 		rorschach.1 sierpinski.1 slidescreen.1 slip.1 sonar.1 sphere.1\
 		spiral.1 spotlight.1 squiral.1 starfish.1 strange.1 swirl.1 \
-		t3d.1 vidwhacker.1 vines.1 webcollage.1 xjack.1 xlyap.1 \
-		xmatrix.1 xroger.1 xscreensaver-command.1 xscreensaver-demo.1 \
-		xscreensaver.1 xsublim.1
+		t3d.1 vidwhacker.1 vines.1 webcollage.1 xflame.1 xjack.1 \
+		xlyap.1 xmatrix.1 xroger.1 xscreensaver-command.1 \
+		xscreensaver.1 xsublim.1 xteevee.1
 
 .include <bsd.port.mk>
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 2c5e337dd397..9b282415bda5 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-3.21.tar.gz) = 9509c698f0926e35495aea3529ca163a
+MD5 (xscreensaver-3.24.tar.gz) = 9de6fb18edec39043af5caabebfb5b4a
diff --git a/x11/xscreensaver/files/patch-ab b/x11/xscreensaver/files/patch-ab
index 8603b3c8ba0f..589d1064ebbc 100644
--- a/x11/xscreensaver/files/patch-ab
+++ b/x11/xscreensaver/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Thu Nov 18 21:49:08 1999
-+++ configure	Wed Dec  1 10:03:02 1999
-@@ -3153,7 +3153,7 @@
+--- configure.orig	Mon Apr  3 05:03:52 2000
++++ configure	Mon May  8 17:46:15 2000
+@@ -3174,7 +3174,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -9,16 +9,16 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -5194,7 +5194,7 @@
- 
- 
+@@ -5267,7 +5267,7 @@
+     PASSWD_LIBS="$PASSWD_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcrypt -lcom_err"
+   elif test "$have_kerberos" = yes ; then
      # from Tim Showalter <tjs+@andrew.cmu.edu>
 -    PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes"
 +    PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err"
-     echo $ac_n "checking for res_search""... $ac_c" 1>&6
- echo "configure:5211: checking for res_search" >&5
- if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
-@@ -6241,7 +6241,7 @@
+   fi
+ 
+   if test "$have_kerberos" = yes ; then
+@@ -6485,7 +6485,7 @@
  if eval "test \"`echo '$''{'ac_cv_gtk_version_string'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
diff --git a/x11/xscreensaver/files/patch-ae b/x11/xscreensaver/files/patch-ae
new file mode 100644
index 000000000000..8b7d396753c9
--- /dev/null
+++ b/x11/xscreensaver/files/patch-ae
@@ -0,0 +1,33 @@
+--- driver/Makefile.in.orig	Mon Apr  3 05:04:08 2000
++++ driver/Makefile.in	Mon May  8 19:09:10 2000
+@@ -147,17 +147,17 @@
+ CMD_LIBS	= $(LIBS) $(X_LIBS) \
+ 		  $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
+ 
+-EXES		= xscreensaver xscreensaver-command xscreensaver-demo
++EXES		= xscreensaver xscreensaver-command
+ EXES2		= @ALL_DEMO_PROGRAMS@
+ 
+ HDRS		= XScreenSaver_ad.h xscreensaver.h prefs.h remote.h \
+ 		  demo-Gtk-widgets.h demo-Gtk-stubs.h
+-MEN		= xscreensaver.man xscreensaver-demo.man \
++MEN		= xscreensaver.man \
+ 		  xscreensaver-command.man
+ ALL_MEN		= xscreensaver.man \
+-		  xscreensaver-demo.man xscreensaver-command.man
++		  xscreensaver-command.man
+ EXTRAS		= README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
+-		  xscreensaver.kss xscreensaver-demo.glade \
++		  xscreensaver.kss \
+ 		  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 \
+@@ -211,8 +211,6 @@
+ 	$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
+ 	$(INSTALL_PROGRAM) xscreensaver-command \
+ 	  $(install_prefix)$(bindir)/xscreensaver-command
+-	$(INSTALL_PROGRAM) xscreensaver-demo \
+-	  $(install_prefix)$(bindir)/xscreensaver-demo
+ 
+ install-ad: XScreenSaver.ad
+ 	@if [ ! -d $(install_prefix)$(AD_DIR) ]; then			      \
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 6ece0ad724bd..e53f11cde609 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -107,6 +107,7 @@ bin/xmatrix
 bin/xroger
 bin/xscreensaver
 bin/xscreensaver-command
-bin/xscreensaver-demo
+bin/xspirograph
 bin/xsublim
+bin/xteevee
 lib/X11/app-defaults/XScreenSaver