View | Details | Raw Unified | Return to bug 254178 | Differences between
and this patch

Collapse All | Expand All

(-)x11/xscreensaver/Makefile (-2 / +5 lines)
Lines 1-7 Link Here
1
# Created by: dom@myrddin.demon.co.uk
1
# Created by: dom@myrddin.demon.co.uk
2
2
3
PORTNAME=	xscreensaver
3
PORTNAME=	xscreensaver
4
PORTVERSION=	5.45
4
PORTVERSION=	6.01
5
CATEGORIES=	x11
5
CATEGORIES=	x11
6
MASTER_SITES=	http://www.jwz.org/xscreensaver/
6
MASTER_SITES=	http://www.jwz.org/xscreensaver/
7
7
Lines 14-20 RUN_DEPENDS= giftopnm:graphics/netpbm \ Link Here
14
		p5-libwww>0:www/p5-libwww
14
		p5-libwww>0:www/p5-libwww
15
LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
15
LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
16
		libfreetype.so:print/freetype2 \
16
		libfreetype.so:print/freetype2 \
17
		libgle.so:graphics/gle
17
		libgle.so:graphics/gle \
18
		libharfbuzz.so:print/harfbuzz
18
19
19
USES=		autoreconf gettext gl gmake gnome jpeg localbase:ldflags perl5 \
20
USES=		autoreconf gettext gl gmake gnome jpeg localbase:ldflags perl5 \
20
		pkgconfig xorg
21
		pkgconfig xorg
Lines 23-28 USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2 Link Here
23
USE_PERL5=	run
24
USE_PERL5=	run
24
USE_XORG=	ice sm x11 xext xi xinerama xmu xpm xrandr xrender xt xxf86vm
25
USE_XORG=	ice sm x11 xext xi xinerama xmu xpm xrandr xrender xt xxf86vm
25
USE_CSTD=	gnu99
26
USE_CSTD=	gnu99
27
# ignore error from tar due to duplicate driver/xscreensaver-command.man
28
EXTRACT_AFTER_ARGS+=	|| :
26
29
27
CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
30
CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
28
31
(-)x11/xscreensaver/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1615330387
1
TIMESTAMP = 1628111167
2
SHA256 (xscreensaver-5.45.tar.gz) = 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d
2
SHA256 (xscreensaver-6.01.tar.gz) = 085484665d91f60b4a1dedacd94bcf9b74b0fb096bcedc89ff1c245168e5473b
3
SIZE (xscreensaver-5.45.tar.gz) = 27729147
3
SIZE (xscreensaver-6.01.tar.gz) = 27820165
(-)x11/xscreensaver/files/patch-config.h.in (-5 / +5 lines)
Lines 1-12 Link Here
1
--- config.h.in.orig	2016-04-03 20:07:59 UTC
1
--- config.h.in.orig	2021-05-08 15:22:06 UTC
2
+++ config.h.in
2
+++ config.h.in
3
@@ -307,6 +307,9 @@
3
@@ -315,6 +315,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
 
7
+/* Define to 1 if you have the <libutil.h> header file. */
7
+/* Define to 1 if you have the <libutil.h> header file. */
8
+#undef HAVE_LIBUTIL_H
8
+#undef HAVE_LIBUTIL_H
9
+
9
+
10
 /* Define this if you have the XF86MiscSetGrabKeysState function (which allows
10
 /* Define this if you have XF86VidModeGetViewPort, for virtual desktops. */
11
    the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key sequences to be temporarily
11
 #undef HAVE_XF86VMODE
12
    disabled. Sadly, it doesn't affect Ctrl-Alt-BS or Ctrl-Alt-F1.) */
12
 
(-)x11/xscreensaver/files/patch-configure.ac (-2 / +2 lines)
Lines 1-6 Link Here
1
--- configure.ac.orig	2020-12-06 15:54:46 UTC
1
--- configure.ac.orig	2021-05-20 16:46:35 UTC
2
+++ configure.ac
2
+++ configure.ac
3
@@ -3971,7 +3971,7 @@ fi
3
@@ -4010,7 +4010,7 @@ fi
4
 ###############################################################################
4
 ###############################################################################
5
 
5
 
6
 PTY_LIBS=
6
 PTY_LIBS=
(-)x11/xscreensaver/files/patch-driver_Makefile.in (-14 / +12 lines)
Lines 1-22 Link Here
1
--- driver/Makefile.in.orig	2016-05-24 18:02:30 UTC
1
--- driver/Makefile.in.orig	2021-06-09 15:47:14 UTC
2
+++ driver/Makefile.in
2
+++ driver/Makefile.in
3
@@ -51,7 +51,7 @@ DEPEND_DEFINES	= @DEPEND_DEFINES@
3
@@ -46,7 +46,7 @@ DEPEND_FLAGS	= @DEPEND_FLAGS@
4
 DEPEND_DEFINES	= @DEPEND_DEFINES@
4
 
5
 
5
 SHELL		= /bin/sh
6
 INSTALL		= @INSTALL@
6
 INSTALL		= @INSTALL@
7
-SUID_FLAGS      = -o root -m 4755
7
-SUID_FLAGS      = -o root -m 4755
8
+SUID_FLAGS      = -m 755
8
+SUID_FLAGS      = -m 755
9
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
9
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
10
 INSTALL_SCRIPT  = @INSTALL_SCRIPT@
10
 INSTALL_SETUID	= $(INSTALL_PROGRAM) $(SUID_FLAGS)
11
 INSTALL_SETUID  = @INSTALL_SETUID@
11
 INSTALL_DATA	= @INSTALL_DATA@
12
@@ -81,8 +81,8 @@ XPM_LIBS	= @XPM_LIBS@
12
@@ -76,7 +76,7 @@ INTL_LIBS	= @INTLLIBS@
13
 
14
 
15
 AD_DIR		= @APPDEFAULTS@
13
 AD_DIR		= @APPDEFAULTS@
16
-PAM_DIR		= /etc/pam.d
17
-PAM_CONF	= /etc/pam.conf
18
+PAM_DIR		= ${prefix}/etc/pam.d
19
+PAM_CONF	= ${prefix}/etc/pam.conf
20
 
14
 
21
 UTILS_SRC	= $(srcdir)/../utils
15
 # $(sysconfdir) is either /usr/local/etc or /usr/etc but this must be /etc.
22
 UTILS_BIN	= ../utils
16
-PAM_ROOT	= /etc
17
+PAM_ROOT	= ${prefix}/etc
18
 PAM_DIR		= $(PAM_ROOT)/pam.d
19
 PAM_CONF	= $(PAM_ROOT)/pam.conf
20
 
(-)x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in (-17 / +17 lines)
Lines 1-6 Link Here
1
--- driver/XScreenSaver.ad.in.orig	2019-07-10 03:31:26 UTC
1
--- driver/XScreenSaver.ad.in.orig	2021-06-09 15:47:14 UTC
2
+++ driver/XScreenSaver.ad.in
2
+++ driver/XScreenSaver.ad.in
3
@@ -56,7 +56,7 @@
3
@@ -55,7 +55,7 @@
4
 *splashDuration:	0:00:05
4
 *splashDuration:	0:00:05
5
 *visualID:		default
5
 *visualID:		default
6
 *installColormap:	True
6
 *installColormap:	True
Lines 9-24 Link Here
9
 *authWarningSlack:	20
9
 *authWarningSlack:	20
10
 
10
 
11
 *textMode:		file
11
 *textMode:		file
12
@@ -124,7 +124,7 @@
12
@@ -103,7 +103,7 @@
13
 
13
 
14
 ! The format used for printing the date and time in the password dialog box
14
 
15
 ! (see the strftime(3) manual page for details.)
15
 ! The strftime(3) format string for printing the time on the password dialog.
16
-*dateFormat:		%d-%b-%y (%a); %I:%M %p
16
-*dateFormat:		%I:%M %p, %a %b %e
17
+*dateFormat:		%Y-%m-%d %H:%M:%S
17
+*dateFormat:		%Y-%m-%d %H:%M:%S
18
 ! For day month date:
18
 ! DD MMM:
19
 ! *dateFormat:		%a %b %d, %I:%M %p
19
 ! *dateFormat:		%I:%M %p, %e %b (%a)
20
 ! To show the time only:
20
 ! 12 hour time only:
21
@@ -343,6 +343,18 @@ XScreenSaver.bourneShell:		/bin/sh
21
@@ -324,6 +324,18 @@ XScreenSaver.bourneShell:		/bin/sh
22
 !=============================================================================
22
 !=============================================================================
23
 
23
 
24
 *programs:								      \
24
 *programs:								      \
Lines 37-47 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
@@ -610,7 +622,6 @@ XScreenSaver.bourneShell:		/bin/sh
40
@@ -602,7 +614,6 @@ XScreenSaver.bourneShell:		/bin/sh
41
 *hacks.dangerball.name:     DangerBall
41
 *hacks.dangerball.name:     Danger Ball
42
 *hacks.decayscreen.name:    DecayScreen
42
 *hacks.decayscreen.name:    Decay Screen
43
 *hacks.deepstars.name:      DeepStars
43
 *hacks.deepstars.name:      Deep Stars
44
-*hacks.dnalogo.name:        DNA Logo
44
-*hacks.dnalogo.name:        DNA Logo
45
 *hacks.dymaxionmap.name:    DymaxionMap
45
 *hacks.dymaxionmap.name:    Dymaxion Map
46
 *hacks.energystream.name:   EnergyStream
46
 *hacks.energystream.name:   Energy Stream
47
 *hacks.euler2d.name:        Euler2D
47
 *hacks.etruscanvenus.name:  Etruscan Venus
(-)x11/xscreensaver/pkg-plist (-14 / +24 lines)
Lines 1-10 Link Here
1
@(,,4755) 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
5
bin/xscreensaver-getimage-file
6
bin/xscreensaver-getimage-video
7
bin/xscreensaver-gl-helper
8
bin/xscreensaver-hacks/abstractile
4
bin/xscreensaver-hacks/abstractile
9
bin/xscreensaver-hacks/anemone
5
bin/xscreensaver-hacks/anemone
10
bin/xscreensaver-hacks/anemotaxis
6
bin/xscreensaver-hacks/anemotaxis
Lines 138-144 bin/xscreensaver-hacks/kumppa Link Here
138
bin/xscreensaver-hacks/lament
134
bin/xscreensaver-hacks/lament
139
bin/xscreensaver-hacks/lavalite
135
bin/xscreensaver-hacks/lavalite
140
bin/xscreensaver-hacks/lcdscrub
136
bin/xscreensaver-hacks/lcdscrub
141
bin/xscreensaver-hacks/ljlatest
142
bin/xscreensaver-hacks/lockward
137
bin/xscreensaver-hacks/lockward
143
bin/xscreensaver-hacks/loop
138
bin/xscreensaver-hacks/loop
144
bin/xscreensaver-hacks/m6502
139
bin/xscreensaver-hacks/m6502
Lines 200-205 bin/xscreensaver-hacks/sierpinski3d Link Here
200
bin/xscreensaver-hacks/skytentacles
195
bin/xscreensaver-hacks/skytentacles
201
bin/xscreensaver-hacks/slidescreen
196
bin/xscreensaver-hacks/slidescreen
202
bin/xscreensaver-hacks/slip
197
bin/xscreensaver-hacks/slip
198
bin/xscreensaver-hacks/xscreensaver-auth
199
bin/xscreensaver-hacks/xscreensaver-getimage
200
bin/xscreensaver-hacks/xscreensaver-getimage-file
201
bin/xscreensaver-hacks/xscreensaver-getimage-video
202
bin/xscreensaver-hacks/xscreensaver-gfx
203
bin/xscreensaver-hacks/xscreensaver-gl-visual
204
bin/xscreensaver-hacks/xscreensaver-text
203
%%SETUID_HACKS%%@mode 4755
205
%%SETUID_HACKS%%@mode 4755
204
bin/xscreensaver-hacks/sonar
206
bin/xscreensaver-hacks/sonar
205
%%SETUID_HACKS%%@mode
207
%%SETUID_HACKS%%@mode
Lines 250-265 bin/xscreensaver-hacks/xmatrix Link Here
250
bin/xscreensaver-hacks/xrayswarm
252
bin/xscreensaver-hacks/xrayswarm
251
bin/xscreensaver-hacks/xspirograph
253
bin/xscreensaver-hacks/xspirograph
252
bin/xscreensaver-hacks/zoom
254
bin/xscreensaver-hacks/zoom
253
bin/xscreensaver-text
255
bin/xscreensaver-settings
254
%%PAM%%etc/pam.d/xscreensaver
256
%%PAM%%etc/pam.d/xscreensaver
255
lib/X11/app-defaults/XScreenSaver
257
lib/X11/app-defaults/XScreenSaver
256
man/man1/xscreensaver-command.1.gz
258
man/man1/xscreensaver-command.1.gz
257
man/man1/xscreensaver-demo.1.gz
259
man/man1/xscreensaver-demo.1.gz
258
man/man1/xscreensaver-getimage-file.1.gz
259
man/man1/xscreensaver-getimage-video.1.gz
260
man/man1/xscreensaver-getimage.1.gz
261
man/man1/xscreensaver-systemd.1.gz
262
man/man1/xscreensaver-text.1.gz
263
man/man1/xscreensaver.1.gz
260
man/man1/xscreensaver.1.gz
264
man/man6/abstractile.6.gz
261
man/man6/abstractile.6.gz
265
man/man6/anemone.6.gz
262
man/man6/anemone.6.gz
Lines 269-274 man/man6/antmaze.6.gz Link Here
269
man/man6/antspotlight.6.gz
266
man/man6/antspotlight.6.gz
270
man/man6/apollonian.6.gz
267
man/man6/apollonian.6.gz
271
man/man6/apple2.6.gz
268
man/man6/apple2.6.gz
269
man/man1/xscreensaver-settings.1.gz
270
man/man6/xscreensaver-auth.6.gz
271
man/man6/xscreensaver-command.6.gz
272
man/man6/xscreensaver-getimage-file.6.gz
273
man/man6/xscreensaver-getimage-video.6.gz
274
man/man6/xscreensaver-getimage.6.gz
275
man/man6/xscreensaver-gfx.6.gz
276
man/man6/xscreensaver-gl-visual.6.gz
277
man/man6/xscreensaver-systemd.6.gz
278
man/man6/xscreensaver-text.6.gz
272
man/man6/atlantis.6.gz
279
man/man6/atlantis.6.gz
273
man/man6/attraction.6.gz
280
man/man6/attraction.6.gz
274
man/man6/atunnel.6.gz
281
man/man6/atunnel.6.gz
Lines 394-400 man/man6/kumppa.6.gz Link Here
394
man/man6/lament.6.gz
401
man/man6/lament.6.gz
395
man/man6/lavalite.6.gz
402
man/man6/lavalite.6.gz
396
man/man6/lcdscrub.6.gz
403
man/man6/lcdscrub.6.gz
397
man/man6/ljlatest.6.gz
398
man/man6/lockward.6.gz
404
man/man6/lockward.6.gz
399
man/man6/loop.6.gz
405
man/man6/loop.6.gz
400
man/man6/maze.6.gz
406
man/man6/maze.6.gz
Lines 499-505 man/man6/xjack.6.gz Link Here
499
man/man6/xlyap.6.gz
505
man/man6/xlyap.6.gz
500
man/man6/xmatrix.6.gz
506
man/man6/xmatrix.6.gz
501
man/man6/xrayswarm.6.gz
507
man/man6/xrayswarm.6.gz
502
man/man6/xscreensaver-gl-helper.6.gz
503
man/man6/xspirograph.6.gz
508
man/man6/xspirograph.6.gz
504
man/man6/zoom.6.gz
509
man/man6/zoom.6.gz
505
share/applications/xscreensaver-blank.desktop
510
share/applications/xscreensaver-blank.desktop
Lines 507-512 share/applications/xscreensaver-lock.desktop Link Here
507
share/applications/xscreensaver-properties.desktop
512
share/applications/xscreensaver-properties.desktop
508
share/applications/xscreensaver-start.desktop
513
share/applications/xscreensaver-start.desktop
509
share/applications/xscreensaver-stop.desktop
514
share/applications/xscreensaver-stop.desktop
515
share/fonts/xscreensaver/OCRAStd.otf
516
share/fonts/xscreensaver/SpecialElite.ttf
517
share/fonts/xscreensaver/clacon.ttf
518
share/fonts/xscreensaver/gallant12x22.ttf
519
share/fonts/xscreensaver/luximr.ttf
510
%%NLS%%share/locale/da/LC_MESSAGES/xscreensaver.mo
520
%%NLS%%share/locale/da/LC_MESSAGES/xscreensaver.mo
511
%%NLS%%share/locale/de/LC_MESSAGES/xscreensaver.mo
521
%%NLS%%share/locale/de/LC_MESSAGES/xscreensaver.mo
512
%%NLS%%share/locale/es/LC_MESSAGES/xscreensaver.mo
522
%%NLS%%share/locale/es/LC_MESSAGES/xscreensaver.mo
Lines 531-536 share/applications/xscreensaver-stop.desktop Link Here
531
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
541
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
532
share/pixmaps/xscreensaver.xpm
542
share/pixmaps/xscreensaver.xpm
533
%%DATADIR%%/config/README
543
%%DATADIR%%/config/README
544
%%DATADIR%%/ui/xscreensaver.ui
534
%%DATADIR%%/config/abstractile.xml
545
%%DATADIR%%/config/abstractile.xml
535
%%DATADIR%%/config/anemone.xml
546
%%DATADIR%%/config/anemone.xml
536
%%DATADIR%%/config/anemotaxis.xml
547
%%DATADIR%%/config/anemotaxis.xml
Lines 784-787 share/pixmaps/xscreensaver.xpm Link Here
784
%%DATADIR%%/ui/screensaver-locking.png
795
%%DATADIR%%/ui/screensaver-locking.png
785
%%DATADIR%%/ui/screensaver-power.png
796
%%DATADIR%%/ui/screensaver-power.png
786
%%DATADIR%%/ui/screensaver-snap.png
797
%%DATADIR%%/ui/screensaver-snap.png
787
%%DATADIR%%/ui/xscreensaver-demo.ui

Return to bug 254178