diff options
author | Doug Barton <dougb@FreeBSD.org> | 2006-02-10 07:40:36 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2006-02-10 07:40:36 +0000 |
commit | 323109bb918ed5cc1b26c18bd9e655e23b38aff3 (patch) | |
tree | c03ead67f1e48311edfddfb4cdacbbf60cdad1c9 /x11/xscreensaver | |
parent | The pubcookie Drupal module is an external authentication module that (diff) |
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.
Notes
Notes:
svn path=/head/; revision=155626
Diffstat (limited to 'x11/xscreensaver')
-rw-r--r-- | x11/xscreensaver/Makefile | 22 | ||||
-rw-r--r-- | x11/xscreensaver/distinfo | 6 |
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 |