From 4422dc3bccd2c0291e0047cca645de2bde033e5d Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 23 Dec 2001 08:02:14 +0000
Subject: * Upgrade to 3.34, which is mostly bug fixes, and two new hacks. *
 Correct something I didn't catch when I took over the port... if we want  
 the -demo program to handle settings, GTK isn't optional. * Add a patch that
 handles an overly enthusiastic attempt to avoid bzero   (which one of the
 hacks actually uses).

---
 x11/xscreensaver/Makefile                       | 11 +++--------
 x11/xscreensaver/distinfo                       |  2 +-
 x11/xscreensaver/files/patch-hacks_screenhack.h | 14 ++++++++++++++
 x11/xscreensaver/pkg-plist                      |  2 ++
 4 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 x11/xscreensaver/files/patch-hacks_screenhack.h

(limited to 'x11/xscreensaver')

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index c626acc37776..74c1b90977f7 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	3.33
+PORTVERSION=	3.34
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -17,7 +17,7 @@ LIB_DEPENDS=	gle.3:${PORTSDIR}/graphics/gle
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_MESA=	yes
-WANT_GTK=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-pam --with-gl --with-xpm --without-gnome \
 		--with-zippy=/usr/games/fortune --with-gle
@@ -38,7 +38,7 @@ MAN1=		attraction.1 blitspin.1 bouboule.1 braid.1 \
 		xscreensaver-gl-helper.1 xscreensaver.1 xsublim.1 xteevee.1 \
 		zoom.1 molecule.1 rotzoomer.1 bumps.1 xscreensaver-getimage.1 \
 		xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
-		speedmine.1 whirlygig.1
+		speedmine.1 whirlygig.1 penetrate.1
 
 post-patch:
 	@ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
@@ -50,9 +50,4 @@ post-patch:
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GTK)
-USE_GTK=	yes
-CONFIGURE_ARGS+=	--with-gtk
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 5085a35e42fa..f2dcda62f4e2 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-3.33.tar.gz) = 2704ba03ed34adfc551a02a70f45837d
+MD5 (xscreensaver-3.34.tar.gz) = 8243473e811c7e445e5e3cb60334ef0d
diff --git a/x11/xscreensaver/files/patch-hacks_screenhack.h b/x11/xscreensaver/files/patch-hacks_screenhack.h
new file mode 100644
index 000000000000..d90935446b73
--- /dev/null
+++ b/x11/xscreensaver/files/patch-hacks_screenhack.h
@@ -0,0 +1,14 @@
+--- hacks/screenhack.h.Dist	Fri Jan 19 20:28:31 2001
++++ hacks/screenhack.h	Sat Dec 22 22:41:45 2001
+@@ -98,8 +98,11 @@
+ extern void screenhack_handle_events (Display*);
+ 
+ /* Be Posixly correct */
++/* This would work better if the sonar code didn't 
++   use bzero.
+ #undef  bzero
+ #define bzero  __ERROR_use_memset_not_bzero_in_xscreensaver__
++*/
+ #undef  bcopy
+ #define bcopy  __ERROR_use_memcpy_not_bcopy_in_xscreensaver__
+ 
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 13c30ee5ccef..7064a034030d 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -11,6 +11,7 @@ bin/bubbles
 bin/bumps
 bin/cage
 bin/ccurve
+bin/circuit
 bin/compass
 bin/coral
 bin/critical
@@ -106,6 +107,7 @@ bin/swirl
 bin/t3d
 bin/triangle
 bin/truchet
+bin/vermiculate
 bin/vidwhacker
 bin/vines
 bin/wander
-- 
cgit v1.2.3