Index: branches/2015Q4/x11/xscreensaver/Makefile
===================================================================
--- branches/2015Q4/x11/xscreensaver/Makefile	(revision 400348)
+++ branches/2015Q4/x11/xscreensaver/Makefile	(revision 400349)
@@ -1,91 +1,91 @@
 # Created by: dom@myrddin.demon.co.uk
 # $FreeBSD$
 
 PORTNAME=	xscreensaver
-PORTVERSION=	5.33
+PORTVERSION=	5.34
 CATEGORIES=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Save your screen while you entertain your cat
 
 RUN_DEPENDS=	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
 		giftopnm:${PORTSDIR}/graphics/netpbm
 LIB_DEPENDS=	libgle.so:${PORTSDIR}/graphics/gle
 
 CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
 
 USES=		autoreconf gettext gmake jpeg perl5 pkgconfig
 USE_GL=		yes
 USE_GNOME=	gdkpixbuf2 gtk20 intltool libglade2 libxml2
 USE_PERL5=	run
 USE_XORG=	xpm xext xxf86misc
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	PERL="${PERL}"
 CONFIGURE_ARGS=	--with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \
 		--with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \
 		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
 		--with-configdir=${PREFIX}/share/xscreensaver/config/ \
 		--with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/ \
 		--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
 		--with-xf86gamma-ext --with-randr-ext --without-kerberos \
 		--without-setuid-hacks --enable-locking
 MAKE_ARGS+=	install_prefix=${STAGEDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	PAM SETUID_HACKS FIREF NLS XAOS1 XDALI XEARTH \
 		XFT XMOUN XPLANET XSNOW
 OPTIONS_SUB=	yes
 
 PAM_CONFIGURE_WITH=		pam
 
 SETUID_HACKS_DESC=		Install sonar hack suid so it can ping
 
 FIREF_DESC=			Add extra port x11/fireflies
 FIREF_RUN_DEPENDS=		${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
 
 NLS_USES=			gettext-runtime
 NLS_CONFIGURE_ENABLE=		nls
 
 XAOS1_DESC=			Add extra port graphics/xaos
 XAOS1_RUN_DEPENDS=		xaos:${PORTSDIR}/graphics/xaos
 
 XDALI_DESC=			Add extra port x11-clocks/xdaliclock
 XDALI_RUN_DEPENDS=		xdaliclock:${PORTSDIR}/x11-clocks/xdaliclock
 
 XFT_CONFIGURE_WITH=		xft
 XFT_USE=			XORG=xft
 
 XEARTH_DESC=			Add extra port astro/xearth
 XEARTH_RUN_DEPENDS=		xearth:${PORTSDIR}/astro/xearth
 
 XMOUN_DESC=			Add extra port graphics/xmountains
 XMOUN_RUN_DEPENDS=		xmountains:${PORTSDIR}/graphics/xmountains
 
 XPLANET_DESC=			Add extra port astro/xplanet
 XPLANET_RUN_DEPENDS=		xplanet:${PORTSDIR}/astro/xplanet
 
 XSNOW_DESC=			Add extra port x11/xsnow
 XSNOW_RUN_DEPENDS=		xsnow:${PORTSDIR}/x11/xsnow
 
 SUB_FILES=	xscreensaver-blank.desktop xscreensaver-lock.desktop \
 		xscreensaver-start.desktop xscreensaver-stop.desktop
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 			-e 's|pkg_config --list-all|pkg_config --help|' \
 			${WRKSRC}/configure.in
 	${REINPLACE_CMD} -e "s|/etc/pam.d|${PREFIX}/etc/pam.d|g" \
 		${WRKSRC}/driver/passwd-pam.c \
 		${WRKSRC}/driver/xscreensaver.man
 	${CP} ${FILESDIR}/xscreensaver.pam \
 		${WRKSRC}/driver/xscreensaver.pam.in
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/
 	${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam
 
 .include <bsd.port.mk>
Index: branches/2015Q4/x11/xscreensaver/distinfo
===================================================================
--- branches/2015Q4/x11/xscreensaver/distinfo	(revision 400348)
+++ branches/2015Q4/x11/xscreensaver/distinfo	(revision 400349)
@@ -1,2 +1,2 @@
-SHA256 (xscreensaver-5.33.tar.gz) = d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d
-SIZE (xscreensaver-5.33.tar.gz) = 10725482
+SHA256 (xscreensaver-5.34.tar.gz) = 6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27
+SIZE (xscreensaver-5.34.tar.gz) = 10788657
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 400348)
+++ branches/2015Q4	(revision 400349)

Property changes on: branches/2015Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r400347-400348