aboutsummaryrefslogtreecommitdiffstats
path: root/x11/xscreensaver
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2006-02-10 15:40:36 +0800
committerdougb <dougb@FreeBSD.org>2006-02-10 15:40:36 +0800
commit1c279eb2b71d8459119e2ca4b1d68876f484d2d8 (patch)
treeb9322608ae59e9668d2c8472f2b91cdf57a263dc /x11/xscreensaver
parent5e13b9b64e95eaaafb35d61be19e4131bba50b72 (diff)
downloadfreebsd-ports-gnome-1c279eb2b71d8459119e2ca4b1d68876f484d2d8.tar.gz
freebsd-ports-gnome-1c279eb2b71d8459119e2ca4b1d68876f484d2d8.tar.zst
freebsd-ports-gnome-1c279eb2b71d8459119e2ca4b1d68876f484d2d8.zip
Upgrade to the latest, 4.24. New versions of a few hacks, and
several bug fixes, including the code that necessitated the sed command in the Makefile from the last version. Convert to OPTIONS, and warn users who have the old variables set.
Diffstat (limited to 'x11/xscreensaver')
-rw-r--r--x11/xscreensaver/Makefile22
-rw-r--r--x11/xscreensaver/distinfo6
2 files changed, 18 insertions, 10 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index e7c9fb37241a..529b2164e341 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xscreensaver
-PORTVERSION= 4.23
-PORTREVISION= 2
+PORTVERSION= 4.24
CATEGORIES?= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/ \
http://dougbarton.us/Downloads/
@@ -31,12 +30,15 @@ CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \
--with-jpeg=${LOCALBASE} --without-gnome --without-kerberos \
--without-motif --mandir=${PREFIX}/man
+OPTIONS= ALL_FORTUNES "Run fortune with -sa argument" off \
+ SETUID_HACKS "Install sonar hack suid so it can ping" off
+
.include <bsd.port.pre.mk>
-.if defined(XS_WITH_ALL_FORTUNES)
+.if defined(WITH_ALL_FORTUNES)
CONFIGURE_ARGS+= --with-fortune="/usr/games/fortune -sa"
.endif
-.if defined(XS_WITH_SETUID_HACKS)
+.if defined(WITH_SETUID_HACKS)
CONFIGURE_ARGS+= --with-setuid-hacks
.endif
@@ -92,6 +94,15 @@ pre-fetch:
@${ECHO} ' and cd ../xscreensaver-gnome.'
@${ECHO} ''
@sleep 2
+.if defined(XS_WITH_ALL_FORTUNES) || defined(XS_WITH_SETUID_HACKS)
+ @${ECHO} ""
+ @${ECHO} "************************************************"
+ @${ECHO} " Support for the old XS_WITH_* options has been"
+ @${ECHO} " removed in favor of the OPTIONS method."
+ @${ECHO} "************************************************"
+ @${ECHO} ""
+ @sleep 5
+.endif
.endif
post-patch:
@@ -100,9 +111,6 @@ post-patch:
-e 's#malloc.h#stdlib.h#g' \
-e 's#/usr/X11R6#${X11BASE}#g' \
${WRKSRC}/configure.Patched > ${WRKSRC}/configure
- @ ${CP} ${WRKSRC}/driver/timers.c ${WRKSRC}/driver/timers.c.presed
- @ ${SED} 334,343d ${WRKSRC}/driver/timers.c.presed > \
- ${WRKSRC}/driver/timers.c
post-install:
@(if test -x ${X11BASE}/bin/xscreensaver-hacks/webcollage-helper; then \
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index e36a6b30df86..8b6b616cd6fd 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xscreensaver-4.23.tar.gz) = 27491d117a8f7ae57d1fdf5f15d61ac6
-SHA256 (xscreensaver-4.23.tar.gz) = 9ac90aba624d2c39b62ac72815b16d404eec43d232feadea940c4c705ebb3dd7
-SIZE (xscreensaver-4.23.tar.gz) = 4939070
+MD5 (xscreensaver-4.24.tar.gz) = 174b6a7cebd892c1a6c2d56bf5ac5af6
+SHA256 (xscreensaver-4.24.tar.gz) = 73140a9f209921543a6562442b5d68801883b3fff3b6be751bec934f4b456474
+SIZE (xscreensaver-4.24.tar.gz) = 4936993