aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11/xscreensaver/Makefile8
-rw-r--r--x11/xscreensaver/distinfo4
-rw-r--r--x11/xscreensaver/files/patch-hacks__config__sonar.xml21
3 files changed, 25 insertions, 8 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index bb1aa9edd4da..ab10f541ac17 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xscreensaver
-PORTVERSION= 5.17
+PORTVERSION= 5.18
CATEGORIES?= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/ \
http://dougbarton.us/Downloads/
@@ -140,11 +140,7 @@ post-patch:
-e 's#malloc.h#stdlib.h#g' \
-e 's#/usr/X11R6#${LOCALBASE}#g' \
${WRKSRC}/configure.Patched > ${WRKSRC}/configure
- @ ${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 cf436553d322..5f20f7e680a9 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xscreensaver-5.17.tar.gz) = c34b92f71b8c597ee55b087a3d2528baa0e56123fa3d784cf97b99eb3b7f6d7b
-SIZE (xscreensaver-5.17.tar.gz) = 7238015
+SHA256 (xscreensaver-5.18.tar.gz) = 3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9
+SIZE (xscreensaver-5.18.tar.gz) = 7363800
diff --git a/x11/xscreensaver/files/patch-hacks__config__sonar.xml b/x11/xscreensaver/files/patch-hacks__config__sonar.xml
new file mode 100644
index 000000000000..4cb3478565f1
--- /dev/null
+++ b/x11/xscreensaver/files/patch-hacks__config__sonar.xml
@@ -0,0 +1,21 @@
+--- hacks/config/sonar.xml.orig 2012-07-02 12:25:48.000000000 -0700
++++ hacks/config/sonar.xml 2012-07-04 15:29:38.000000000 -0700
+@@ -29,7 +29,7 @@
+
+ <option id="ssh" _label="Ping known SSH hosts" arg-set="-ping /etc/hosts,$HOME/.ssh/known_hosts,$HOME/.ssh/known_hosts2"/>
+
+- <option id="popular" _label="Ping Google, Facebook, etc." arg-set="-ping google.com,facebook.com,twitter.com,yahoo.com,flickr.com,www.apple.com,wikipedia.org,linux.org,youtube.com,disqus.com,blogger.com,wordpress.com,tumblr.com,whitehouse.gov"/>
++ <option id="popular" _label="Ping Google, Facebook, etc." arg-set="-ping google.com,facebook.com,twitter.com,yahoo.com,flickr.com,www.apple.com,wikipedia.org,freebsd.org,youtube.com,disqus.com,blogger.com,wordpress.com,tumblr.com,whitehouse.gov"/>
+
+ <option id="sim" _label="Simulation (don't ping)" arg-set="-ping simulation"/>
+ </select>
+@@ -74,8 +74,7 @@
+
+ Alternately, it can run a simulation that doesn't involve hosts.
+
+-(If pinging doesn't work on Linux, you may need to make the executable
+-be setuid.)
++To ping, use the port build option to install this suid.
+
+ http://en.wikipedia.org/wiki/Ping#History
+