diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index cc38b9dc790c..acaa9bd41b1d 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,110 +1,110 @@ 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 WWW= https://www.jwz.org/xscreensaver/ LICENSE= MIT RUN_DEPENDS= giftopnm:graphics/netpbm \ p5-libwww>0:www/p5-libwww \ p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https \ unix-selfauth-helper>0:security/unix-selfauth-helper LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgle.so:graphics/gle \ libharfbuzz.so:print/harfbuzz 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 GNU_CONFIGURE= yes CONFIGURE_ENV+= PERL="${PERL}" CONFIGURE_ARGS= --enable-locking \ --with-app-defaults=${PREFIX}/lib/X11/app-defaults/ \ --with-configdir=${PREFIX}/share/xscreensaver/config/ \ --with-dpms-ext \ --with-gl \ --with-gle \ --with-gtk \ --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ --with-jpeg=${LOCALBASE} \ --with-pam \ --with-pixbuf \ --with-randr-ext \ --with-xdbe-ext \ --with-xf86gamma-ext \ --with-xf86vmode-ext \ --with-xft \ --with-xinerama-ext \ --with-xshm-ext \ --without-kerberos \ --without-shadow MAKE_ARGS+= install_prefix=${STAGEDIR} MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= FIREF NLS NSFW SETUID_HACKS XAOS1 XDALI XEARTH \ XMOUN XPLANET XSNOW OPTIONS_SUB= yes SETUID_HACKS_DESC= Install sonar hack suid so it can ping SETUID_HACKS_CONFIGURE_WITH= setuid-hacks FIREF_DESC= Add extra port x11/fireflies FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:x11/fireflies NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NSFW_DESC= Include material that is Not Safe For Work XAOS1_DESC= Add extra port graphics/xaos XAOS1_RUN_DEPENDS= xaos:graphics/xaos XDALI_DESC= Add extra port x11-clocks/xdaliclock XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock XEARTH_DESC= Add extra port astro/xearth XEARTH_RUN_DEPENDS= xearth:astro/xearth XMOUN_DESC= Add extra port graphics/xmountains XMOUN_RUN_DEPENDS= xmountains:graphics/xmountains XPLANET_DESC= Add extra port astro/xplanet XPLANET_RUN_DEPENDS= xplanet:astro/xplanet XSNOW_DESC= Add extra port x11/xsnow XSNOW_RUN_DEPENDS= xsnow:x11/xsnow SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \ xscreensaver-start.desktop xscreensaver-stop.desktop \ xscreensaver.pam post-patch: ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|pkg_config --list-all|pkg_config --help|' \ ${WRKSRC}/configure.ac ${REINPLACE_CMD} -e "s|/etc/pam.d|${PREFIX}/etc/pam.d|g" \ ${WRKSRC}/driver/passwd-pam.c \ ${WRKSRC}/driver/xscreensaver.man post-patch-NSFW-off: ${REINPLACE_CMD} -e 's|Dick Pix|Stuff|' ${WRKSRC}/hacks/bsod.c ${REINPLACE_CMD} -e 's|dick pics|data, etc.|' ${WRKSRC}/hacks/bsod.c 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 ${INSTALL_DATA} ${WRKDIR}/xscreensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver .include diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 31f6542aa743..705de1aee22f 100644 --- 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 index e8ece901c93d..000000000000 --- 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 header file. */ - #undef HAVE_UTIL_H - -+/* Define to 1 if you have the 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 index e685985492fe..d7a6115c6f7e 100644 --- a/x11/xscreensaver/files/patch-configure.ac +++ b/x11/xscreensaver/files/patch-configure.ac @@ -1,11 +1,20 @@ ---- 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= -AC_CHECK_HEADERS(pty.h util.h sys/termios.h) +AC_CHECK_HEADERS(pty.h util.h libutil.h sys/termios.h) AC_CHECK_X_LIB(util, forkpty, [PTY_LIBS="-lutil" ac_have_forkpty=yes diff --git a/x11/xscreensaver/files/patch-hacks__config__sonar.xml b/x11/xscreensaver/files/patch-hacks__config__sonar.xml deleted file mode 100644 index 59842a528bb4..000000000000 --- 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 @@ - -