Update to 4.05, which has a much better configure script, one new

hack, and some new icons. There is still a conflict with the
definitions produced by pkg-config however, so add a warning
message to that effect.

4 files changed, 25 insertions, 4 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 324d7bf958fc..dba86f4e1c52 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -12,7 +12,7 @@
 #************************************************************************
 
 PORTNAME=	xscreensaver
-PORTVERSION=	4.04.2
+PORTVERSION=	4.05
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -21,8 +21,6 @@ MAINTAINER?=	DougB@FreeBSD.org
 LIB_DEPENDS=	gle.3:${PORTSDIR}/graphics/gle \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-WRKSRC=		${WRKDIR}/xscreensaver-4.04
-
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_MESA=	yes
@@ -68,10 +66,16 @@ MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	vermiculate.1 vidwhacker.1 vines.1 wander.1 webcollage.1 \
 	whirlwindwarp.1 whirlygig.1 worm.1 xflame.1 xjack.1 xlyap.1 \
 	xmatrix.1 xrayswarm.1 xspirograph.1 xsublim.1 xteevee.1 zoom.1 \
+	endgame.1 \
 	xscreensaver-command.1 xscreensaver-demo.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
 	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
 
+pre-fetch:
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
+	${SH} pkg-libwarning
+.endif
+
 post-patch:
 	@ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched
 	@ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index bbb6c458d0ae..161e91f5098e 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-4.04.2.tar.gz) = 79f99780be37eec5d7ffb8671afe7406
+MD5 (xscreensaver-4.05.tar.gz) = 39b05d4da14158638e501e3bc31c0943
diff --git a/x11/xscreensaver/pkg-libwarning b/x11/xscreensaver/pkg-libwarning
new file mode 100644
index 000000000000..2df31d554007
--- /dev/null
+++ b/x11/xscreensaver/pkg-libwarning
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ "$2" = "POST-INSTALL" -o -n "${PACKAGE_BUILDING}" ]; then
+  exit 0
+fi
+
+/usr/bin/dialog --msgbox "There is currently a conflict between configure for this port, and pkgconfig. If your build fails, do the following: 'make clean ; pkg_delete -f pkgconfig*'. The conflict is being worked on, but until it's fixed this is your best chance of success." 12 70 || /usr/bin/false
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index ef7e4d2aa87e..7bc95872be1c 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -37,6 +37,7 @@ bin/xscreensaver-hacks/demon
 bin/xscreensaver-hacks/discrete
 bin/xscreensaver-hacks/distort
 bin/xscreensaver-hacks/drift
+bin/xscreensaver-hacks/endgame
 bin/xscreensaver-hacks/engine
 bin/xscreensaver-hacks/epicycle
 bin/xscreensaver-hacks/euler2d
@@ -162,6 +163,14 @@ lib/X11/app-defaults/XScreenSaver
 %%GNOME:%%share/gnome/pixmaps/screensaver-power.xpm
 %%GNOME:%%share/gnome/pixmaps/screensaver-snap.xpm
 %%GNOME:%%share/gnome/pixmaps/xscreensaver.xpm
+share/xscreensaver/xscreensaver.xpm
+share/xscreensaver/screensaver-cmndln.xpm
+share/xscreensaver/screensaver-colorselector.xpm
+share/xscreensaver/screensaver-diagnostic.xpm
+share/xscreensaver/screensaver-locking.xpm
+share/xscreensaver/screensaver-power.xpm
+share/xscreensaver/screensaver-snap.xpm
+share/xscreensaver/xscreensaver-demo.glade2
 share/xscreensaver/config/README
 share/xscreensaver/config/anemone.xml
 share/xscreensaver/config/ant.xml
@@ -196,6 +205,7 @@ share/xscreensaver/config/discrete.xml
 share/xscreensaver/config/distort.xml
 share/xscreensaver/config/drift.xml
 share/xscreensaver/config/electricsheep.xml
+share/xscreensaver/config/endgame.xml
 share/xscreensaver/config/engine.xml
 share/xscreensaver/config/epicycle.xml
 share/xscreensaver/config/euler2d.xml