Attachment #158334 for bug #201254




# $FreeBSD$

PORTNAME=	xscreensaver
PORTVERSION=	5.33
PORTREVISION=	4
CATEGORIES=	x11
MASTER_SITES=	http://www.jwz.org/xscreensaver/


		giftopnm:${PORTSDIR}/graphics/netpbm
LIB_DEPENDS=	libgle.so:${PORTSDIR}/graphics/gle

DESTDIRNAME=	install_prefix

CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*

USES=		autoreconf gettext gmake jpeg perl5 pkgconfig
USE_AUTOTOOLS=	autoconf
USE_GL=		yes
USE_GNOME=	gdkpixbuf2 gtk20 intltool libglade2 libxml2
USE_PERL5=	run

		--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

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


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>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (xscreensaver-5.29.tar.gz) = c418f5750696b578df6d4fd62c8260c018667653ece97f2bb90612046bf0f294	1	SHA256 (xscreensaver-5.33.tar.gz) = 329085e08ed9e1807cb17cae7fb48321311151ac2b196b9092d0a3a93457c46b
2	SIZE (xscreensaver-5.29.tar.gz) = 8774562	2	SIZE (xscreensaver-5.33.tar.gz) = 20668552

Lines 1-6 Link Here

(-)files/patch-config.h.in (-3 / +3 lines)
1	--- config.h.in.orig 2013-09-02 12:44:35.341733572 +0200	1	--- config.h.in.orig 2014-10-08 18:09:49 UTC
2	+++ config.h.in 2013-09-02 12:45:05.396737361 +0200	2	+++ config.h.in
3	@@ -340,6 +340,9 @@	3	@@ -304,6 +304,9 @@
4	/* Define to 1 if you have the <util.h> header file. */	4	/* Define to 1 if you have the <util.h> header file. */
5	#undef HAVE_UTIL_H	5	#undef HAVE_UTIL_H
6		6

Lines 1-6 Link Here

(-)files/patch-configure.in (-3 / +3 lines)
1	--- configure.in.orig 2013-09-02 12:45:33.940731237 +0200	1	--- configure.in.orig 2014-10-08 18:09:41 UTC
2	+++ configure.in 2013-09-02 12:46:13.253728009 +0200	2	+++ configure.in
3	@@ -3359,7 +3359,7 @@	3	@@ -3510,7 +3510,7 @@ fi
4	###############################################################################	4	###############################################################################
5		5
6	PTY_LIBS=	6	PTY_LIBS=




--- driver/Makefile.in.orig	2015-06-25 18:58:54 UTC
+++ driver/Makefile.in
@@ -51,7 +51,7 @@ DEPEND_DEFINES	= @DEPEND_DEFINES@
 
 SHELL		= /bin/sh
 INSTALL		= @INSTALL@
-SUID_FLAGS      = -o root -m 4755
+SUID_FLAGS      = -m 755
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_SETUID  = @INSTALL_SETUID@
@@ -81,8 +81,8 @@ XPM_LIBS	= @XPM_LIBS@
 
 
 AD_DIR		= @APPDEFAULTS@
-PAM_DIR		= /etc/pam.d
-PAM_CONF	= /etc/pam.conf

 
 UTILS_SRC	= $(srcdir)/../utils
 UTILS_BIN	= ../utils
@@ -205,7 +205,7 @@ PDF2JPEG_LIBS	= -framework Cocoa
 SAVER_LIBS	= $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
 		  $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
 		  -lXt -lX11 -lXext $(X_EXTRA_LIBS) \




--- driver/XScreenSaver.ad.in.orig	2014-11-18 22:54:02 UTC
+++ driver/XScreenSaver.ad.in
@@ -56,7 +56,7 @@
 *splashDuration:	0:00:05
 *visualID:		default

 *captureStderr: 	True
-*ignoreUninstalledPrograms: False
+*ignoreUninstalledPrograms: True
 *authWarningSlack:	20
 
 *textMode:		file
@@ -123,7 +123,7 @@ GetViewPortIsFullOfLies: False
@@ -122,7 +122,7 @@
 
 ! The format used for printing the date and time in the password dialog box
 ! (see the strftime(3) manual page for details.)

 ! To show the time only:
 ! *dateFormat:		%I:%M %p
 ! For 24 hour time:
@@ -157,6 +157,18 @@ GetViewPortIsFullOfLies: False
 ! screen savers interactively.
 !
 *programs:								      \

 				maze -root				    \n\
 @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
 				attraction -root			    \n\
@@ -251,7 +263,6 @@
 				xspirograph -root			    \n\
 @GL_KLUDGE@ GL: 				circuit -root				    \n\
 @GL_KLUDGE@ GL: 				dangerball -root			    \n\




--- hacks/config/sonar.xml.orig	2015-06-13 23:08:53 UTC
+++ hacks/config/sonar.xml
@@ -31,7 +31,7 @@
 
      <option id="ssh" _label="Ping known SSH hosts"      arg-set="-ping /etc/hosts,$HOME/.ssh/known_hosts,$HOME/.ssh/known_hosts2"/>
 

 
      <option id="sim" _label="Simulation (don't ping)"   arg-set="-ping simulation"/>
     </select>
@@ -78,6 +78,8 @@ respectively.
 
 Alternately, it can run a simulation that doesn't involve hosts.
 
+To ping, use the port build option to install this suid.
+
 https://en.wikipedia.org/wiki/Ping#History
 
 Written by Jamie Zawinski and Stephen Martin; 1998.

Lines 1-12 Link Here

(-)files/patch-hacks_memscroller.c (-11 / +15 lines)
1	--- hacks/memscroller.c.orig 2014-06-12 20:55:52.000000000 +0200	1	--- hacks/memscroller.c.orig 2014-09-13 20:34:45 UTC
2	+++ hacks/memscroller.c 2014-06-12 20:56:03.000000000 +0200	2	+++ hacks/memscroller.c
3	@@ -349,9 +349,6 @@	3	@@ -306,13 +306,6 @@ open_file (state *st)
4	from earlier days before the advent of virtual memory management."	4	from earlier days before the advent of virtual memory management."
5	-- sbrk(2) man page on MacOS	5	-- sbrk(2) man page on BSD systems, as of 1995 or so.
6	*/	6	*/
7	-# if (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */	7	-#ifdef HAVE_SBRK
8	-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"	8	-# if (__GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) /* gcc >= 4.2 */
9	-# endif	9	- /* Don't print "warning: 'sbrk' is deprecated". */
10	himem = ((unsigned char ) sbrk(0)) - (2 sizeof(void *));	10	-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
11	# endif	11	-# endif
		12	-#endif
		13	-
12		14
		15	static unsigned int
		16	more_bits (state st, scroller sc)

Lines 1-5 Link Here

(-)files/patch-utils_textclient.c (-3 / +3 lines)
1	--- utils/textclient.c.orig 2013-09-02 12:43:01.271738814 +0200	1	--- utils/textclient.c.orig 2014-11-05 00:08:06 UTC
2	+++ utils/textclient.c 2013-09-02 12:43:25.014748042 +0200	2	+++ utils/textclient.c
3	@@ -50,6 +50,9 @@	3	@@ -50,6 +50,9 @@
4	# ifdef HAVE_UTIL_H	4	# ifdef HAVE_UTIL_H
5	# include <util.h>	5	# include <util.h>
Lines 9-12 Link Here
9	+# endif	9	+# endif
10	#endif /* HAVE_FORKPTY */	10	#endif /* HAVE_FORKPTY */
11		11
12	/#define DEBUG/	12	#undef DEBUG




@(,,4755) bin/xscreensaver
bin/xscreensaver-command
bin/xscreensaver-demo
bin/xscreensaver-getimage

bin/xscreensaver-hacks/attraction
bin/xscreensaver-hacks/atunnel
bin/xscreensaver-hacks/barcode
bin/xscreensaver-hacks/binaryring
bin/xscreensaver-hacks/blaster
bin/xscreensaver-hacks/blinkbox
bin/xscreensaver-hacks/blitspin

bin/xscreensaver-hacks/ccurve
bin/xscreensaver-hacks/celtic
bin/xscreensaver-hacks/circuit
bin/xscreensaver-hacks/cityflow
bin/xscreensaver-hacks/cloudlife
bin/xscreensaver-hacks/companioncube
bin/xscreensaver-hacks/compass

bin/xscreensaver-hacks/galaxy
bin/xscreensaver-hacks/gears
bin/xscreensaver-hacks/geodesic
bin/xscreensaver-hacks/geodesicgears
bin/xscreensaver-hacks/gflux
bin/xscreensaver-hacks/glblur
bin/xscreensaver-hacks/glcells

bin/xscreensaver-hacks/rd-bomb
bin/xscreensaver-hacks/ripples
bin/xscreensaver-hacks/rocks
bin/xscreensaver-hacks/romanboy
bin/xscreensaver-hacks/rorschach
bin/xscreensaver-hacks/rotzoomer
bin/xscreensaver-hacks/rubik

%%SETUID_HACKS%%@mode
bin/xscreensaver-hacks/speedmine
bin/xscreensaver-hacks/spheremonics
bin/xscreensaver-hacks/splitflap
bin/xscreensaver-hacks/spotlight
bin/xscreensaver-hacks/sproingies
bin/xscreensaver-hacks/squiral

bin/xscreensaver-hacks/webcollage
bin/xscreensaver-hacks/webcollage-helper
bin/xscreensaver-hacks/whirlwindwarp
bin/xscreensaver-hacks/winduprobot
bin/xscreensaver-hacks/wormhole
bin/xscreensaver-hacks/xanalogtv
bin/xscreensaver-hacks/xflame

man/man6/attraction.6.gz
man/man6/atunnel.6.gz
man/man6/barcode.6.gz
man/man6/binaryring.6.gz
man/man6/blaster.6.gz
man/man6/blinkbox.6.gz
man/man6/blitspin.6.gz

man/man6/ccurve.6.gz
man/man6/celtic.6.gz
man/man6/circuit.6.gz
man/man6/cityflow.6.gz
man/man6/cloudlife.6.gz
man/man6/companioncube.6.gz
man/man6/compass.6.gz

man/man6/galaxy.6.gz
man/man6/gears.6.gz
man/man6/geodesic.6.gz
man/man6/geodesicgears.6.gz
man/man6/gflux.6.gz
man/man6/glblur.6.gz
man/man6/glcells.6.gz

man/man6/qix.6.gz
man/man6/quasicrystal.6.gz
man/man6/queens.6.gz
man/man6/romanboy.6.gz
man/man6/rd-bomb.6.gz
man/man6/ripples.6.gz
man/man6/rocks.6.gz

man/man6/sonar.6.gz
man/man6/speedmine.6.gz
man/man6/spheremonics.6.gz
man/man6/splitflap.6.gz
man/man6/spotlight.6.gz
man/man6/sproingies.6.gz
man/man6/squiral.6.gz

man/man6/wander.6.gz
man/man6/webcollage.6.gz
man/man6/whirlwindwarp.6.gz
man/man6/winduprobot.6.gz
man/man6/wormhole.6.gz
man/man6/xanalogtv.6.gz
man/man6/xflame.6.gz

share/applications/xscreensaver-properties.desktop
share/applications/xscreensaver-start.desktop
share/applications/xscreensaver-stop.desktop
%%NLS%%share/locale/ca/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/da/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/de/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/es/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/et/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/fi/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/it/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/ko/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/nb/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/nl/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/pl/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/pt/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/sk/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/sv/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/vi/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/wa/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
share/pixmaps/xscreensaver.xpm
%%DATADIR%%/config/README
%%DATADIR%%/config/abstractile.xml

%%DATADIR%%/config/attraction.xml
%%DATADIR%%/config/atunnel.xml
%%DATADIR%%/config/barcode.xml
%%DATADIR%%/config/binaryring.xml
%%DATADIR%%/config/blaster.xml
%%DATADIR%%/config/blinkbox.xml
%%DATADIR%%/config/blitspin.xml

%%DATADIR%%/config/ccurve.xml
%%DATADIR%%/config/celtic.xml
%%DATADIR%%/config/circuit.xml
%%DATADIR%%/config/cityflow.xml
%%DATADIR%%/config/cloudlife.xml
%%DATADIR%%/config/companioncube.xml
%%DATADIR%%/config/compass.xml

%%DATADIR%%/config/galaxy.xml
%%DATADIR%%/config/gears.xml
%%DATADIR%%/config/geodesic.xml
%%DATADIR%%/config/geodesicgears.xml
%%DATADIR%%/config/gflux.xml
%%DATADIR%%/config/glblur.xml
%%DATADIR%%/config/glcells.xml

%%DATADIR%%/config/rd-bomb.xml
%%DATADIR%%/config/ripples.xml
%%DATADIR%%/config/rocks.xml
%%DATADIR%%/config/romanboy.xml
%%DATADIR%%/config/rorschach.xml
%%DATADIR%%/config/rotzoomer.xml
%%DATADIR%%/config/rubik.xml

%%DATADIR%%/config/sonar.xml
%%DATADIR%%/config/speedmine.xml
%%DATADIR%%/config/spheremonics.xml
%%DATADIR%%/config/splitflap.xml
%%DATADIR%%/config/spotlight.xml
%%DATADIR%%/config/sproingies.xml
%%DATADIR%%/config/squiral.xml

%%DATADIR%%/config/wander.xml
%%DATADIR%%/config/webcollage.xml
%%DATADIR%%/config/whirlwindwarp.xml
%%DATADIR%%/config/winduprobot.xml
%%DATADIR%%/config/wormhole.xml
%%DATADIR%%/config/xanalogtv.xml
%%DATADIR%%/config/xaos.xml

%%DATADIR%%/glade/screensaver-power.png
%%DATADIR%%/glade/screensaver-snap.png
%%DATADIR%%/glade/xscreensaver-demo.glade2
@dirrmtry bin/xscreensaver-hacks
@dirrmtry %%DATADIR%%/config
@dirrmtry %%DATADIR%%/glade
@dirrmtry %%DATADIR%%

Return to bug 201254

Lines 2-9 Link Here

(-)Makefile (-8 / +12 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xscreensaver	4	PORTNAME= xscreensaver
5	PORTVERSION= 5.29	5	PORTVERSION= 5.33
6	PORTREVISION= 4
7	CATEGORIES= x11	6	CATEGORIES= x11
8	MASTER_SITES= http://www.jwz.org/xscreensaver/	7	MASTER_SITES= http://www.jwz.org/xscreensaver/
9		8
Lines 14-25 Link Here
14	giftopnm:${PORTSDIR}/graphics/netpbm	13	giftopnm:${PORTSDIR}/graphics/netpbm
15	LIB_DEPENDS= libgle.so:${PORTSDIR}/graphics/gle	14	LIB_DEPENDS= libgle.so:${PORTSDIR}/graphics/gle
16		15
17	DESTDIRNAME= install_prefix
18
19	CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*	16	CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
20		17
21	USES= gettext gmake jpeg perl5 pkgconfig	18	USES= autoreconf gettext gmake jpeg perl5 pkgconfig
22	USE_AUTOTOOLS= autoconf
23	USE_GL= yes	19	USE_GL= yes
24	USE_GNOME= gdkpixbuf2 gtk20 intltool libglade2 libxml2	20	USE_GNOME= gdkpixbuf2 gtk20 intltool libglade2 libxml2
25	USE_PERL5= run	21	USE_PERL5= run
Lines 35-45 Link Here
35	--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \	31	--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
36	--with-xf86gamma-ext --with-randr-ext --without-kerberos \	32	--with-xf86gamma-ext --with-randr-ext --without-kerberos \
37	--without-setuid-hacks --enable-locking	33	--without-setuid-hacks --enable-locking
		34	MAKE_ARGS+= install_prefix=${STAGEDIR}
38	CPPFLAGS+= -I${LOCALBASE}/include	35	CPPFLAGS+= -I${LOCALBASE}/include
39	LDFLAGS+= -L${LOCALBASE}/lib	36	LDFLAGS+= -L${LOCALBASE}/lib
40		37
41	OPTIONS_DEFINE= PAM SETUID_HACKS FIREF XAOS1 XDALI XEARTH \	38	OPTIONS_DEFINE= PAM SETUID_HACKS FIREF NLS XAOS1 XDALI XEARTH \
42	XMOUN XPLANET XSNOW	39	XFT XMOUN XPLANET XSNOW
43	OPTIONS_SUB= yes	40	OPTIONS_SUB= yes
44		41
45	PAM_CONFIGURE_WITH= pam	42	PAM_CONFIGURE_WITH= pam
Lines 49-54 Link Here
49	FIREF_DESC= Add extra port x11/fireflies	46	FIREF_DESC= Add extra port x11/fireflies
50	FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies	47	FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
51		48
		49	NLS_USES= gettext-runtime
		50	NLS_CONFIGURE_ENABLE= nls
		51
52	XAOS1_DESC= Add extra port graphics/xaos	52	XAOS1_DESC= Add extra port graphics/xaos
53	XAOS1_RUN_DEPENDS= xaos:${PORTSDIR}/graphics/xaos	53	XAOS1_RUN_DEPENDS= xaos:${PORTSDIR}/graphics/xaos
54		54
Lines 55-60 Link Here
55	XDALI_DESC= Add extra port x11-clocks/xdaliclock	55	XDALI_DESC= Add extra port x11-clocks/xdaliclock
56	XDALI_RUN_DEPENDS= xdaliclock:${PORTSDIR}/x11-clocks/xdaliclock	56	XDALI_RUN_DEPENDS= xdaliclock:${PORTSDIR}/x11-clocks/xdaliclock
57		57
		58	XFT_CONFIGURE_WITH= xft
		59	XFT_USE= XORG=xft
		60
58	XEARTH_DESC= Add extra port astro/xearth	61	XEARTH_DESC= Add extra port astro/xearth
59	XEARTH_RUN_DEPENDS= xearth:${PORTSDIR}/astro/xearth	62	XEARTH_RUN_DEPENDS= xearth:${PORTSDIR}/astro/xearth
60		63
Lines 83-87 Link Here
83	post-install:	86	post-install:
84	${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/	87	${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/
85	${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/	88	${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/
		89	${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam
86		90
87	.include <bsd.port.mk>	91	.include <bsd.port.mk>

Lines 1-8 Link Here

(-)files/patch-driver_Makefile.in (-4 / +13 lines)
1	--- driver/Makefile.in.orig 2013-07-16 11:23:32.000000000 +0200	1	--- driver/Makefile.in.orig 2015-06-25 18:58:54 UTC
2	+++ driver/Makefile.in 2013-09-02 11:56:16.862939343 +0200	2	+++ driver/Makefile.in
3	@@ -81,8 +81,8 @@	3	@@ -51,7 +51,7 @@ DEPEND_DEFINES = @DEPEND_DEFINES@
4		4
		5	SHELL = /bin/sh
		6	INSTALL = @INSTALL@
		7	-SUID_FLAGS = -o root -m 4755
		8	+SUID_FLAGS = -m 755
		9	INSTALL_PROGRAM = @INSTALL_PROGRAM@
		10	INSTALL_SCRIPT = @INSTALL_SCRIPT@
		11	INSTALL_SETUID = @INSTALL_SETUID@
		12	@@ -81,8 +81,8 @@ XPM_LIBS = @XPM_LIBS@
5		13
		14
6	AD_DIR = @APPDEFAULTS@	15	AD_DIR = @APPDEFAULTS@
7	-PAM_DIR = /etc/pam.d	16	-PAM_DIR = /etc/pam.d
8	-PAM_CONF = /etc/pam.conf	17	-PAM_CONF = /etc/pam.conf
Lines 11-17 Link Here
11		20
12	UTILS_SRC = $(srcdir)/../utils	21	UTILS_SRC = $(srcdir)/../utils
13	UTILS_BIN = ../utils	22	UTILS_BIN = ../utils
14	@@ -207,7 +207,7 @@	23	@@ -205,7 +205,7 @@ PDF2JPEG_LIBS = -framework Cocoa
15	SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \	24	SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
16	$(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \	25	$(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
17	-lXt -lX11 -lXext $(X_EXTRA_LIBS) \	26	-lXt -lX11 -lXext $(X_EXTRA_LIBS) \

Lines 1-5 Link Here

(-)files/patch-driver_XScreenSaver.ad.in (-9 / +5 lines)
1	--- driver/XScreenSaver.ad.in.orig 2013-12-09 12:01:40.000000000 +0100	1	--- driver/XScreenSaver.ad.in.orig 2014-11-18 22:54:02 UTC
2	+++ driver/XScreenSaver.ad.in 2013-12-17 19:34:28.222008084 +0100	2	+++ driver/XScreenSaver.ad.in
3	@@ -56,7 +56,7 @@	3	@@ -56,7 +56,7 @@
4	*splashDuration: 0:00:05	4	*splashDuration: 0:00:05
5	*visualID: default	5	*visualID: default
Lines 6-15 Link Here
6	*captureStderr: True	6	*captureStderr: True
7	-*ignoreUninstalledPrograms: False	7	-*ignoreUninstalledPrograms: False
8	+*ignoreUninstalledPrograms: True	8	+*ignoreUninstalledPrograms: True
		9	*authWarningSlack: 20
9		10
10	*textMode: file	11	*textMode: file
11	*textLiteral: XScreenSaver	12	@@ -123,7 +123,7 @@ GetViewPortIsFullOfLies: False
12	@@ -122,7 +122,7 @@
13		13
14	! The format used for printing the date and time in the password dialog box	14	! The format used for printing the date and time in the password dialog box
15	! (see the strftime(3) manual page for details.)	15	! (see the strftime(3) manual page for details.)
Lines 18-24 Link Here
18	! To show the time only:	18	! To show the time only:
19	! *dateFormat: %I:%M %p	19	! *dateFormat: %I:%M %p
20	! For 24 hour time:	20	! For 24 hour time:
21	@@ -156,6 +156,18 @@	21	@@ -157,6 +157,18 @@ GetViewPortIsFullOfLies: False
22	! screen savers interactively.	22	! screen savers interactively.
23	!	23	!
24	*programs: \	24	*programs: \
Lines 37-51 Link Here
37	maze -root \n\	37	maze -root \n\
38	@GL_KLUDGE@ GL: superquadrics -root \n\	38	@GL_KLUDGE@ GL: superquadrics -root \n\
39	attraction -root \n\	39	attraction -root \n\
40	@@ -251,7 +263,6 @@
41	xspirograph -root \n\
42	@GL_KLUDGE@ GL: circuit -root \n\
43	@GL_KLUDGE@ GL: dangerball -root \n\

Lines 1-6 Link Here

(-)files/patch-hacks__config__sonar.xml (-5 / +5 lines)
1	--- hacks/config/sonar.xml.orig 2013-12-04 23:42:00.000000000 +0100	1	--- hacks/config/sonar.xml.orig 2015-06-13 23:08:53 UTC
2	+++ hacks/config/sonar.xml 2013-12-09 12:29:34.301395635 +0100	2	+++ hacks/config/sonar.xml
3	@@ -29,7 +29,7 @@	3	@@ -31,7 +31,7 @@
4		4
5	<option id="ssh" _label="Ping known SSH hosts" arg-set="-ping /etc/hosts,$HOME/.ssh/known_hosts,$HOME/.ssh/known_hosts2"/>	5	<option id="ssh" _label="Ping known SSH hosts" arg-set="-ping /etc/hosts,$HOME/.ssh/known_hosts,$HOME/.ssh/known_hosts2"/>
6		6
Lines 9-20 Link Here
9		9
10	<option id="sim" _label="Simulation (don't ping)" arg-set="-ping simulation"/>	10	<option id="sim" _label="Simulation (don't ping)" arg-set="-ping simulation"/>
11	</select>	11	</select>
12	@@ -76,6 +76,8 @@	12	@@ -78,6 +78,8 @@ respectively.
13		13
14	Alternately, it can run a simulation that doesn't involve hosts.	14	Alternately, it can run a simulation that doesn't involve hosts.
15		15
16	+To ping, use the port build option to install this suid.	16	+To ping, use the port build option to install this suid.
17	+	17	+
18	http://en.wikipedia.org/wiki/Ping#History	18	https://en.wikipedia.org/wiki/Ping#History
19		19
20	Written by Jamie Zawinski and Stephen Martin; 1998.	20	Written by Jamie Zawinski and Stephen Martin; 1998.

Lines 1-4 Link Here

(-)pkg-plist (-28 / +42 lines)
1	bin/xscreensaver	1	@(,,4755) bin/xscreensaver
2	bin/xscreensaver-command	2	bin/xscreensaver-command
3	bin/xscreensaver-demo	3	bin/xscreensaver-demo
4	bin/xscreensaver-getimage	4	bin/xscreensaver-getimage
Lines 17-22 Link Here
17	bin/xscreensaver-hacks/attraction	17	bin/xscreensaver-hacks/attraction
18	bin/xscreensaver-hacks/atunnel	18	bin/xscreensaver-hacks/atunnel
19	bin/xscreensaver-hacks/barcode	19	bin/xscreensaver-hacks/barcode
		20	bin/xscreensaver-hacks/binaryring
20	bin/xscreensaver-hacks/blaster	21	bin/xscreensaver-hacks/blaster
21	bin/xscreensaver-hacks/blinkbox	22	bin/xscreensaver-hacks/blinkbox
22	bin/xscreensaver-hacks/blitspin	23	bin/xscreensaver-hacks/blitspin
Lines 35-40 Link Here
35	bin/xscreensaver-hacks/ccurve	36	bin/xscreensaver-hacks/ccurve
36	bin/xscreensaver-hacks/celtic	37	bin/xscreensaver-hacks/celtic
37	bin/xscreensaver-hacks/circuit	38	bin/xscreensaver-hacks/circuit
		39	bin/xscreensaver-hacks/cityflow
38	bin/xscreensaver-hacks/cloudlife	40	bin/xscreensaver-hacks/cloudlife
39	bin/xscreensaver-hacks/companioncube	41	bin/xscreensaver-hacks/companioncube
40	bin/xscreensaver-hacks/compass	42	bin/xscreensaver-hacks/compass
Lines 77-82 Link Here
77	bin/xscreensaver-hacks/galaxy	79	bin/xscreensaver-hacks/galaxy
78	bin/xscreensaver-hacks/gears	80	bin/xscreensaver-hacks/gears
79	bin/xscreensaver-hacks/geodesic	81	bin/xscreensaver-hacks/geodesic
		82	bin/xscreensaver-hacks/geodesicgears
80	bin/xscreensaver-hacks/gflux	83	bin/xscreensaver-hacks/gflux
81	bin/xscreensaver-hacks/glblur	84	bin/xscreensaver-hacks/glblur
82	bin/xscreensaver-hacks/glcells	85	bin/xscreensaver-hacks/glcells
Lines 161-166 Link Here
161	bin/xscreensaver-hacks/rd-bomb	164	bin/xscreensaver-hacks/rd-bomb
162	bin/xscreensaver-hacks/ripples	165	bin/xscreensaver-hacks/ripples
163	bin/xscreensaver-hacks/rocks	166	bin/xscreensaver-hacks/rocks
		167	bin/xscreensaver-hacks/romanboy
164	bin/xscreensaver-hacks/rorschach	168	bin/xscreensaver-hacks/rorschach
165	bin/xscreensaver-hacks/rotzoomer	169	bin/xscreensaver-hacks/rotzoomer
166	bin/xscreensaver-hacks/rubik	170	bin/xscreensaver-hacks/rubik
Lines 177-182 Link Here
177	%%SETUID_HACKS%%@mode	181	%%SETUID_HACKS%%@mode
178	bin/xscreensaver-hacks/speedmine	182	bin/xscreensaver-hacks/speedmine
179	bin/xscreensaver-hacks/spheremonics	183	bin/xscreensaver-hacks/spheremonics
		184	bin/xscreensaver-hacks/splitflap
180	bin/xscreensaver-hacks/spotlight	185	bin/xscreensaver-hacks/spotlight
181	bin/xscreensaver-hacks/sproingies	186	bin/xscreensaver-hacks/sproingies
182	bin/xscreensaver-hacks/squiral	187	bin/xscreensaver-hacks/squiral
Lines 206-211 Link Here
206	bin/xscreensaver-hacks/webcollage	211	bin/xscreensaver-hacks/webcollage
207	bin/xscreensaver-hacks/webcollage-helper	212	bin/xscreensaver-hacks/webcollage-helper
208	bin/xscreensaver-hacks/whirlwindwarp	213	bin/xscreensaver-hacks/whirlwindwarp
		214	bin/xscreensaver-hacks/winduprobot
209	bin/xscreensaver-hacks/wormhole	215	bin/xscreensaver-hacks/wormhole
210	bin/xscreensaver-hacks/xanalogtv	216	bin/xscreensaver-hacks/xanalogtv
211	bin/xscreensaver-hacks/xflame	217	bin/xscreensaver-hacks/xflame
Lines 237-242 Link Here
237	man/man6/attraction.6.gz	243	man/man6/attraction.6.gz
238	man/man6/atunnel.6.gz	244	man/man6/atunnel.6.gz
239	man/man6/barcode.6.gz	245	man/man6/barcode.6.gz
		246	man/man6/binaryring.6.gz
240	man/man6/blaster.6.gz	247	man/man6/blaster.6.gz
241	man/man6/blinkbox.6.gz	248	man/man6/blinkbox.6.gz
242	man/man6/blitspin.6.gz	249	man/man6/blitspin.6.gz
Lines 255-260 Link Here
255	man/man6/ccurve.6.gz	262	man/man6/ccurve.6.gz
256	man/man6/celtic.6.gz	263	man/man6/celtic.6.gz
257	man/man6/circuit.6.gz	264	man/man6/circuit.6.gz
		265	man/man6/cityflow.6.gz
258	man/man6/cloudlife.6.gz	266	man/man6/cloudlife.6.gz
259	man/man6/companioncube.6.gz	267	man/man6/companioncube.6.gz
260	man/man6/compass.6.gz	268	man/man6/compass.6.gz
Lines 297-302 Link Here
297	man/man6/galaxy.6.gz	305	man/man6/galaxy.6.gz
298	man/man6/gears.6.gz	306	man/man6/gears.6.gz
299	man/man6/geodesic.6.gz	307	man/man6/geodesic.6.gz
		308	man/man6/geodesicgears.6.gz
300	man/man6/gflux.6.gz	309	man/man6/gflux.6.gz
301	man/man6/glblur.6.gz	310	man/man6/glblur.6.gz
302	man/man6/glcells.6.gz	311	man/man6/glcells.6.gz
Lines 376-381 Link Here
376	man/man6/qix.6.gz	385	man/man6/qix.6.gz
377	man/man6/quasicrystal.6.gz	386	man/man6/quasicrystal.6.gz
378	man/man6/queens.6.gz	387	man/man6/queens.6.gz
		388	man/man6/romanboy.6.gz
379	man/man6/rd-bomb.6.gz	389	man/man6/rd-bomb.6.gz
380	man/man6/ripples.6.gz	390	man/man6/ripples.6.gz
381	man/man6/rocks.6.gz	391	man/man6/rocks.6.gz
Lines 393-398 Link Here
393	man/man6/sonar.6.gz	403	man/man6/sonar.6.gz
394	man/man6/speedmine.6.gz	404	man/man6/speedmine.6.gz
395	man/man6/spheremonics.6.gz	405	man/man6/spheremonics.6.gz
		406	man/man6/splitflap.6.gz
396	man/man6/spotlight.6.gz	407	man/man6/spotlight.6.gz
397	man/man6/sproingies.6.gz	408	man/man6/sproingies.6.gz
398	man/man6/squiral.6.gz	409	man/man6/squiral.6.gz
Lines 421-426 Link Here
421	man/man6/wander.6.gz	432	man/man6/wander.6.gz
422	man/man6/webcollage.6.gz	433	man/man6/webcollage.6.gz
423	man/man6/whirlwindwarp.6.gz	434	man/man6/whirlwindwarp.6.gz
		435	man/man6/winduprobot.6.gz
424	man/man6/wormhole.6.gz	436	man/man6/wormhole.6.gz
425	man/man6/xanalogtv.6.gz	437	man/man6/xanalogtv.6.gz
426	man/man6/xflame.6.gz	438	man/man6/xflame.6.gz
Lines 436-464 Link Here
436	share/applications/xscreensaver-properties.desktop	448	share/applications/xscreensaver-properties.desktop
437	share/applications/xscreensaver-start.desktop	449	share/applications/xscreensaver-start.desktop
438	share/applications/xscreensaver-stop.desktop	450	share/applications/xscreensaver-stop.desktop
439	share/locale/ca/LC_MESSAGES/xscreensaver.mo	451	%%NLS%%share/locale/ca/LC_MESSAGES/xscreensaver.mo
440	share/locale/da/LC_MESSAGES/xscreensaver.mo	452	%%NLS%%share/locale/da/LC_MESSAGES/xscreensaver.mo
441	share/locale/de/LC_MESSAGES/xscreensaver.mo	453	%%NLS%%share/locale/de/LC_MESSAGES/xscreensaver.mo
442	share/locale/es/LC_MESSAGES/xscreensaver.mo	454	%%NLS%%share/locale/es/LC_MESSAGES/xscreensaver.mo
443	share/locale/et/LC_MESSAGES/xscreensaver.mo	455	%%NLS%%share/locale/et/LC_MESSAGES/xscreensaver.mo
444	share/locale/fi/LC_MESSAGES/xscreensaver.mo	456	%%NLS%%share/locale/fi/LC_MESSAGES/xscreensaver.mo
445	share/locale/fr/LC_MESSAGES/xscreensaver.mo	457	%%NLS%%share/locale/fr/LC_MESSAGES/xscreensaver.mo
446	share/locale/hu/LC_MESSAGES/xscreensaver.mo	458	%%NLS%%share/locale/hu/LC_MESSAGES/xscreensaver.mo
447	share/locale/it/LC_MESSAGES/xscreensaver.mo	459	%%NLS%%share/locale/it/LC_MESSAGES/xscreensaver.mo
448	share/locale/ja/LC_MESSAGES/xscreensaver.mo	460	%%NLS%%share/locale/ja/LC_MESSAGES/xscreensaver.mo
449	share/locale/ko/LC_MESSAGES/xscreensaver.mo	461	%%NLS%%share/locale/ko/LC_MESSAGES/xscreensaver.mo
450	share/locale/nb/LC_MESSAGES/xscreensaver.mo	462	%%NLS%%share/locale/nb/LC_MESSAGES/xscreensaver.mo
451	share/locale/nl/LC_MESSAGES/xscreensaver.mo	463	%%NLS%%share/locale/nl/LC_MESSAGES/xscreensaver.mo
452	share/locale/pl/LC_MESSAGES/xscreensaver.mo	464	%%NLS%%share/locale/pl/LC_MESSAGES/xscreensaver.mo
453	share/locale/pt/LC_MESSAGES/xscreensaver.mo	465	%%NLS%%share/locale/pt/LC_MESSAGES/xscreensaver.mo
454	share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo	466	%%NLS%%share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
455	share/locale/ru/LC_MESSAGES/xscreensaver.mo	467	%%NLS%%share/locale/ru/LC_MESSAGES/xscreensaver.mo
456	share/locale/sk/LC_MESSAGES/xscreensaver.mo	468	%%NLS%%share/locale/sk/LC_MESSAGES/xscreensaver.mo
457	share/locale/sv/LC_MESSAGES/xscreensaver.mo	469	%%NLS%%share/locale/sv/LC_MESSAGES/xscreensaver.mo
458	share/locale/vi/LC_MESSAGES/xscreensaver.mo	470	%%NLS%%share/locale/vi/LC_MESSAGES/xscreensaver.mo
459	share/locale/wa/LC_MESSAGES/xscreensaver.mo	471	%%NLS%%share/locale/wa/LC_MESSAGES/xscreensaver.mo
460	share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo	472	%%NLS%%share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
461	share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo	473	%%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
462	share/pixmaps/xscreensaver.xpm	474	share/pixmaps/xscreensaver.xpm
463	%%DATADIR%%/config/README	475	%%DATADIR%%/config/README
464	%%DATADIR%%/config/abstractile.xml	476	%%DATADIR%%/config/abstractile.xml
Lines 473-478 Link Here
473	%%DATADIR%%/config/attraction.xml	485	%%DATADIR%%/config/attraction.xml
474	%%DATADIR%%/config/atunnel.xml	486	%%DATADIR%%/config/atunnel.xml
475	%%DATADIR%%/config/barcode.xml	487	%%DATADIR%%/config/barcode.xml
		488	%%DATADIR%%/config/binaryring.xml
476	%%DATADIR%%/config/blaster.xml	489	%%DATADIR%%/config/blaster.xml
477	%%DATADIR%%/config/blinkbox.xml	490	%%DATADIR%%/config/blinkbox.xml
478	%%DATADIR%%/config/blitspin.xml	491	%%DATADIR%%/config/blitspin.xml
Lines 491-496 Link Here
491	%%DATADIR%%/config/ccurve.xml	504	%%DATADIR%%/config/ccurve.xml
492	%%DATADIR%%/config/celtic.xml	505	%%DATADIR%%/config/celtic.xml
493	%%DATADIR%%/config/circuit.xml	506	%%DATADIR%%/config/circuit.xml
		507	%%DATADIR%%/config/cityflow.xml
494	%%DATADIR%%/config/cloudlife.xml	508	%%DATADIR%%/config/cloudlife.xml
495	%%DATADIR%%/config/companioncube.xml	509	%%DATADIR%%/config/companioncube.xml
496	%%DATADIR%%/config/compass.xml	510	%%DATADIR%%/config/compass.xml
Lines 533-538 Link Here
533	%%DATADIR%%/config/galaxy.xml	547	%%DATADIR%%/config/galaxy.xml
534	%%DATADIR%%/config/gears.xml	548	%%DATADIR%%/config/gears.xml
535	%%DATADIR%%/config/geodesic.xml	549	%%DATADIR%%/config/geodesic.xml
		550	%%DATADIR%%/config/geodesicgears.xml
536	%%DATADIR%%/config/gflux.xml	551	%%DATADIR%%/config/gflux.xml
537	%%DATADIR%%/config/glblur.xml	552	%%DATADIR%%/config/glblur.xml
538	%%DATADIR%%/config/glcells.xml	553	%%DATADIR%%/config/glcells.xml
Lines 616-621 Link Here
616	%%DATADIR%%/config/rd-bomb.xml	631	%%DATADIR%%/config/rd-bomb.xml
617	%%DATADIR%%/config/ripples.xml	632	%%DATADIR%%/config/ripples.xml
618	%%DATADIR%%/config/rocks.xml	633	%%DATADIR%%/config/rocks.xml
		634	%%DATADIR%%/config/romanboy.xml
619	%%DATADIR%%/config/rorschach.xml	635	%%DATADIR%%/config/rorschach.xml
620	%%DATADIR%%/config/rotzoomer.xml	636	%%DATADIR%%/config/rotzoomer.xml
621	%%DATADIR%%/config/rubik.xml	637	%%DATADIR%%/config/rubik.xml
Lines 630-635 Link Here
630	%%DATADIR%%/config/sonar.xml	646	%%DATADIR%%/config/sonar.xml
631	%%DATADIR%%/config/speedmine.xml	647	%%DATADIR%%/config/speedmine.xml
632	%%DATADIR%%/config/spheremonics.xml	648	%%DATADIR%%/config/spheremonics.xml
		649	%%DATADIR%%/config/splitflap.xml
633	%%DATADIR%%/config/spotlight.xml	650	%%DATADIR%%/config/spotlight.xml
634	%%DATADIR%%/config/sproingies.xml	651	%%DATADIR%%/config/sproingies.xml
635	%%DATADIR%%/config/squiral.xml	652	%%DATADIR%%/config/squiral.xml
Lines 658-663 Link Here
658	%%DATADIR%%/config/wander.xml	675	%%DATADIR%%/config/wander.xml
659	%%DATADIR%%/config/webcollage.xml	676	%%DATADIR%%/config/webcollage.xml
660	%%DATADIR%%/config/whirlwindwarp.xml	677	%%DATADIR%%/config/whirlwindwarp.xml
		678	%%DATADIR%%/config/winduprobot.xml
661	%%DATADIR%%/config/wormhole.xml	679	%%DATADIR%%/config/wormhole.xml
662	%%DATADIR%%/config/xanalogtv.xml	680	%%DATADIR%%/config/xanalogtv.xml
663	%%DATADIR%%/config/xaos.xml	681	%%DATADIR%%/config/xaos.xml
Lines 680-686 Link Here
680	%%DATADIR%%/glade/screensaver-power.png	698	%%DATADIR%%/glade/screensaver-power.png
681	%%DATADIR%%/glade/screensaver-snap.png	699	%%DATADIR%%/glade/screensaver-snap.png
682	%%DATADIR%%/glade/xscreensaver-demo.glade2	700	%%DATADIR%%/glade/xscreensaver-demo.glade2
683	@dirrmtry bin/xscreensaver-hacks
684	@dirrmtry %%DATADIR%%/config
685	@dirrmtry %%DATADIR%%/glade
686	@dirrmtry %%DATADIR%%