aboutsummaryrefslogtreecommitdiff
path: root/x11/xscreensaver
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2012-06-24 10:26:27 +0000
committerDoug Barton <dougb@FreeBSD.org>2012-06-24 10:26:27 +0000
commit5abe85c32cc1aa9404837a1720cb91b0f5dc5006 (patch)
tree651c6d7ea2e5d9cc2673c5e8b6aa55efc250988a /x11/xscreensaver
parent47f2a71855ae57cbe68b6c815a510a1811625257 (diff)
Notes
Diffstat (limited to 'x11/xscreensaver')
-rw-r--r--x11/xscreensaver/Makefile15
-rw-r--r--x11/xscreensaver/distinfo4
2 files changed, 11 insertions, 8 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 2845a88f07ab..8e85d70010b1 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xscreensaver
-PORTVERSION= 5.15
-PORTREVISION= 1
+PORTVERSION= 5.17
CATEGORIES?= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/ \
http://dougbarton.us/Downloads/
@@ -26,6 +25,8 @@ RUN_DEPENDS= p5-libwww>0:${PORTSDIR}/www/p5-libwww \
MAKE_JOBS_SAFE= yes
+CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
+
USE_XORG= xpm
USE_GL= yes
USE_GMAKE= yes
@@ -68,7 +69,7 @@ CONFIGURE_ARGS+= --with-setuid-hacks
.endif
.if defined(WITH_FIREF)
-RUN_DEPENDS+= ${X11BASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
+RUN_DEPENDS+= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
.endif
.if defined(WITH_XAOS1)
RUN_DEPENDS+= xaos:${PORTSDIR}/graphics/xaos
@@ -143,9 +144,11 @@ post-patch:
-e 's#malloc.h#stdlib.h#g' \
-e 's#/usr/X11R6#${LOCALBASE}#g' \
${WRKSRC}/configure.Patched > ${WRKSRC}/configure
- @ ${CP} ${WRKSRC}/hacks/vidwhacker ${WRKSRC}/hacks/vidwhacker.presed
- @ ${SED} -e '329s#.*# $$fn = "$$imagedir/$$fn";#' \
- ${WRKSRC}/hacks/vidwhacker.presed > ${WRKSRC}/hacks/vidwhacker
+ @ ${CP} ${WRKSRC}/hacks/glx/Makefile.in \
+ ${WRKSRC}/hacks/glx/Makefile.in.presed
+ @ ${SED} -e 's#lament.xpm#lament512.xpm#g' \
+ ${WRKSRC}/hacks/glx/Makefile.in.presed > \
+ ${WRKSRC}/hacks/glx/Makefile.in
.if defined(WITH_PAM)
.for f in driver/passwd-pam.c driver/xscreensaver.man
@ ${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index b453dbe8ae27..cf436553d322 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xscreensaver-5.15.tar.gz) = 4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d
-SIZE (xscreensaver-5.15.tar.gz) = 5977594
+SHA256 (xscreensaver-5.17.tar.gz) = c34b92f71b8c597ee55b087a3d2528baa0e56123fa3d784cf97b99eb3b7f6d7b
+SIZE (xscreensaver-5.17.tar.gz) = 7238015