Page MenuHomeFreeBSD
Files F109695101

D37461.diff
No OneTemporary
Actions

D37461.diff
View Options

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,8 +1,8 @@
PORTNAME= xscreensaver
-PORTVERSION= 6.04
-PORTREVISION= 1
+DISTVERSION= 6.05
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
+EXTRACT_SUFX= .1.tar.gz
MAINTAINER= x11@FreeBSD.org
COMMENT= Save your screen while you entertain your cat
@@ -22,7 +22,7 @@
USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags \
perl5 pkgconfig xorg
USE_GL= gl glu
-USE_GNOME= cairo gdkpixbuf2 gdkpixbuf2xlib gtk20 intltool libglade2 libxml2
+USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libxml2
USE_PERL5= run
USE_XORG= ice sm x11 xext xft xi xinerama xmu xrandr xrender xt xxf86vm
CPE_VENDOR= xscreensaver_project
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655112914
-SHA256 (xscreensaver-6.04.tar.gz) = 787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152
-SIZE (xscreensaver-6.04.tar.gz) = 26112437
+TIMESTAMP = 1669032437
+SHA256 (xscreensaver-6.05.1.tar.gz) = 2da512b201cacc85c496f602e73947da4e89bfb5bb67a74e65e052fd5e677b3a
+SIZE (xscreensaver-6.05.1.tar.gz) = 26110057
diff --git a/x11/xscreensaver/files/patch-config.h.in b/x11/xscreensaver/files/patch-config.h.in
deleted file mode 100644
--- a/x11/xscreensaver/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig 2022-02-20 19:12:54 UTC
-+++ config.h.in
-@@ -311,6 +311,9 @@
- /* Define to 1 if you have the <util.h> header file. */
- #undef HAVE_UTIL_H
-
-+/* Define to 1 if you have the <libutil.h> header file. */
-+#undef HAVE_LIBUTIL_H
-+
- /* Define this if you have XF86VidModeGetViewPort, for virtual desktops. */
- #undef HAVE_XF86VMODE
-
diff --git a/x11/xscreensaver/files/patch-configure.ac b/x11/xscreensaver/files/patch-configure.ac
--- a/x11/xscreensaver/files/patch-configure.ac
+++ b/x11/xscreensaver/files/patch-configure.ac
@@ -1,6 +1,15 @@
---- configure.ac.orig 2022-02-20 21:05:40 UTC
+--- configure.ac.orig 2022-09-02 16:10:15 UTC
+++ configure.ac
-@@ -3986,7 +3986,7 @@ fi
+@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then
+
+ GTK_DATADIR=""
+ if test "$have_gtk" = yes; then
+- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
++ GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
+ GTK_DATADIR="$GTK_DATADIR/share"
+ fi
+
+@@ -4031,7 +4031,7 @@ fi
###############################################################################
PTY_LIBS=
diff --git a/x11/xscreensaver/files/patch-hacks__config__sonar.xml b/x11/xscreensaver/files/patch-hacks__config__sonar.xml
deleted file mode 100644
--- a/x11/xscreensaver/files/patch-hacks__config__sonar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
---- hacks/config/sonar.xml.orig 2016-04-08 02:15:38 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="popular" _label="Ping Google, Facebook, etc." arg-set="-ping google.com,facebook.com,twitter.com,yahoo.com,flickr.com,www.apple.com,wikipedia.org,linux.org,youtube.com,disqus.com,blogger.com,wordpress.com,tumblr.com,whitehouse.gov"/>
-+ <option id="popular" _label="Ping Google, Facebook, etc." arg-set="-ping google.com,facebook.com,twitter.com,yahoo.com,flickr.com,www.apple.com,wikipedia.org,freebsd.org,youtube.com,disqus.com,blogger.com,wordpress.com,tumblr.com,whitehouse.gov"/>
-
- <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.
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -552,7 +552,6 @@
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
share/pixmaps/xscreensaver.png
%%DATADIR%%/config/README
-%%DATADIR%%/ui/xscreensaver.ui
%%DATADIR%%/config/abstractile.xml
%%DATADIR%%/config/anemone.xml
%%DATADIR%%/config/anemotaxis.xml
@@ -807,9 +806,3 @@
%%DATADIR%%/config/xspirograph.xml
%%DATADIR%%/config/zoom.xml
%%DATADIR%%/xscreensaver.service
-%%DATADIR%%/ui/screensaver-cmndln.png
-%%DATADIR%%/ui/screensaver-colorselector.png
-%%DATADIR%%/ui/screensaver-diagnostic.png
-%%DATADIR%%/ui/screensaver-locking.png
-%%DATADIR%%/ui/screensaver-power.png
-%%DATADIR%%/ui/screensaver-snap.png

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 9, 11:09 AM (21 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16551981
Default Alt Text
D37461.diff (4 KB)

Event Timeline