aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorzeising <zeising@FreeBSD.org>2014-06-14 02:25:07 +0800
committerzeising <zeising@FreeBSD.org>2014-06-14 02:25:07 +0800
commit9650d00847e81d415b2f20cf56843f83437c886f (patch)
tree3b49636e5f9c13d6d31a5de00de540ee5df8019f /x11
parentd2ed632e09dc32cec6c678d9a87f9485c1802ee2 (diff)
downloadfreebsd-ports-gnome-9650d00847e81d415b2f20cf56843f83437c886f.tar.gz
freebsd-ports-gnome-9650d00847e81d415b2f20cf56843f83437c886f.tar.zst
freebsd-ports-gnome-9650d00847e81d415b2f20cf56843f83437c886f.zip
Update to 5.29
Diffstat (limited to 'x11')
-rw-r--r--x11/xscreensaver/Makefile11
-rw-r--r--x11/xscreensaver/distinfo4
-rw-r--r--x11/xscreensaver/files/patch-hacks_memscroller.c12
3 files changed, 22 insertions, 5 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index a0e849dc6370..ba0724ea9aba 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xscreensaver
-PORTVERSION= 5.26
+PORTVERSION= 5.29
PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
@@ -28,6 +28,7 @@ USE_XORG= xpm xext xxf86misc
USE_GL= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf
+USE_GNOME= intltool
CONFIGURE_ENV+= "CPPFLAGS= -I ${LOCALBASE}/include" "LDFLAGS= -L ${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
--with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \
@@ -36,8 +37,9 @@ CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
--with-xf86gamma-ext --with-randr-ext --enable-locking
-OPTIONS_DEFINE= KERBEROS PAM SETUID_HACKS FIREF XAOS1 XDALI XURTH XMOUN XPLAN \
- XSNOW
+OPTIONS_DEFINE= KERBEROS PAM PTHREADS SETUID_HACKS FIREF XAOS1 XDALI XURTH \
+ XMOUN XPLAN XSNOW
+PTHREADS_DESC= Use pthreads for SMP support
SETUID_HACKS_DESC= Install sonar hack suid so it can ping
FIREF_DESC= Add extra port x11/fireflies
XAOS1_DESC= Add extra port graphics/xaos
@@ -64,6 +66,9 @@ PLIST_SUB+= PAM="@comment not installed: "
.if ${PORT_OPTIONS:MSETUID_HACKS}
CONFIGURE_ARGS+= --with-setuid-hacks
.endif
+.if ${PORT_OPTIONS:MPTHREADS}
+CONFIGURE_ARGS+= --with-pthreads
+.endif
.if ${PORT_OPTIONS:MFIREF}
RUN_DEPENDS+= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 3342e5703737..c530db549b26 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xscreensaver-5.26.tar.gz) = 2ca4dc66e11947396124d1f87dd2787e0d8dd8dd1ada8871b3d8df40fb4f1b55
-SIZE (xscreensaver-5.26.tar.gz) = 8760550
+SHA256 (xscreensaver-5.29.tar.gz) = c418f5750696b578df6d4fd62c8260c018667653ece97f2bb90612046bf0f294
+SIZE (xscreensaver-5.29.tar.gz) = 8774562
diff --git a/x11/xscreensaver/files/patch-hacks_memscroller.c b/x11/xscreensaver/files/patch-hacks_memscroller.c
new file mode 100644
index 000000000000..5832b26a9104
--- /dev/null
+++ b/x11/xscreensaver/files/patch-hacks_memscroller.c
@@ -0,0 +1,12 @@
+--- hacks/memscroller.c.orig 2014-06-12 20:55:52.000000000 +0200
++++ hacks/memscroller.c 2014-06-12 20:56:03.000000000 +0200
+@@ -349,9 +349,6 @@
+ from earlier days before the advent of virtual memory management."
+ -- sbrk(2) man page on MacOS
+ */
+-# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
+-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+-# endif
+ himem = ((unsigned char *) sbrk(0)) - (2 * sizeof(void *));
+ # endif
+