svn commit: r357713 - in head/x11/xscreensaver: . files

[Niclas Zeising]

Author: zeising
Date: Fri Jun 13 18:25:07 2014
New Revision: 357713
URL: http://svnweb.freebsd.org/changeset/ports/357713
QAT: https://qat.redports.org/buildarchive/r357713/

Log:
  Update to 5.29

Added:
  head/x11/xscreensaver/files/patch-hacks_memscroller.c   (contents, props changed)
Modified:
  head/x11/xscreensaver/Makefile
  head/x11/xscreensaver/distinfo

Modified: head/x11/xscreensaver/Makefile
==============================================================================
--- head/x11/xscreensaver/Makefile	Fri Jun 13 18:19:09 2014	(r357712)
+++ head/x11/xscreensaver/Makefile	Fri Jun 13 18:25:07 2014	(r357713)
@@ -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 --w
 		--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

Modified: head/x11/xscreensaver/distinfo
==============================================================================
--- head/x11/xscreensaver/distinfo	Fri Jun 13 18:19:09 2014	(r357712)
+++ head/x11/xscreensaver/distinfo	Fri Jun 13 18:25:07 2014	(r357713)
@@ -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

Added: head/x11/xscreensaver/files/patch-hacks_memscroller.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/xscreensaver/files/patch-hacks_memscroller.c	Fri Jun 13 18:25:07 2014	(r357713)
@@ -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
+