diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 0656bd4b0760..e2e6f800d012 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,105 +1,104 @@ PORTNAME= xscreensaver DISTVERSION= 6.08 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ MAINTAINER= zirias@FreeBSD.org COMMENT= Save your screen while you entertain your cat WWW= https://www.jwz.org/xscreensaver/ LICENSE= MIT LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgle.so:graphics/gle \ libharfbuzz.so:print/harfbuzz 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 -USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags \ - perl5 pkgconfig shebangfix xorg +USES= cpe gettext gl gmake gnome jpeg localbase:ldflags perl5 \ + pkgconfig shebangfix xorg CPE_VENDOR= xscreensaver_project USE_GL= gl glu USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libxml2 -USE_PERL5= run USE_XORG= ice sm x11 xext xft xi xinerama xmu xrandr xrender xt xxf86vm SHEBANG_FILES= hacks/check-configs.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-locking \ - --with-app-defaults=${PREFIX}/lib/X11/app-defaults/ \ + --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 CONFIGURE_ENV= PERL="${PERL}" MAKE_ARGS= install_prefix=${STAGEDIR} SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \ xscreensaver-start.desktop xscreensaver-stop.desktop OPTIONS_DEFINE= FIREF NLS NSFW SETUID_HACKS XAOS1 XDALI XEARTH XMOUN XPLANET \ XSNOW OPTIONS_SUB= yes FIREF_DESC= Add extra port x11/fireflies NSFW_DESC= Include material that is Not Safe For Work SETUID_HACKS_DESC= Install sonar hack suid so it can ping XAOS1_DESC= Add extra port graphics/xaos XDALI_DESC= Add extra port x11-clocks/xdaliclock XEARTH_DESC= Add extra port astro/xearth XMOUN_DESC= Add extra port graphics/xmountains XPLANET_DESC= Add extra port astro/xplanet XSNOW_DESC= Add extra port x11/xsnow FIREF_RUN_DEPENDS= ${FIREF_HACKBIN}:x11/fireflies NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls SETUID_HACKS_CONFIGURE_WITH= setuid-hacks XAOS1_RUN_DEPENDS= xaos:graphics/xaos XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock XEARTH_RUN_DEPENDS= xearth:astro/xearth XMOUN_RUN_DEPENDS= xmountains:graphics/xmountains XPLANET_RUN_DEPENDS= xplanet:astro/xplanet XSNOW_RUN_DEPENDS= xsnow:x11/xsnow FIREF_HACKBIN= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies 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 +pre-configure-NLS-on: + cd ${WRKSRC} && ${LOCALBASE}/bin/intltoolize -f -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 ${LN} -s ${LOCALBASE}/etc/pam.d/unix-selfauth \ ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver .include diff --git a/x11/xscreensaver/files/patch-configure.ac b/x11/xscreensaver/files/patch-configure.ac deleted file mode 100644 index bb50e3c9278c..000000000000 --- a/x11/xscreensaver/files/patch-configure.ac +++ /dev/null @@ -1,53 +0,0 @@ ---- configure.ac.orig 2023-08-07 17:52:35 UTC -+++ configure.ac -@@ -612,8 +612,8 @@ AC_DEFUN([AC_PATH_X_APP_DEFAULTS_DIRECT],[ - /usr/share/X11/app-defaults \ - \ - /usr/X11/lib/app-defaults \ -- /usr/X11R6/lib/app-defaults \ -- /usr/X11R6/lib/X11/app-defaults \ -+ /usr/local/lib/app-defaults \ -+ /usr/local/lib/X11/app-defaults \ - /usr/X11R5/lib/app-defaults \ - /usr/X11R5/lib/X11/app-defaults \ - /usr/X11R4/lib/app-defaults \ -@@ -3181,10 +3181,10 @@ case "$with_textfile" in - - #### Could use some more defaults here... - for f in \ -- "/usr/X11R6/lib/X11/doc/README" \ -+ "/usr/local/lib/X11/doc/README" \ - "/usr/share/doc/xserver-common/copyright" \ - "/usr/share/doc/xserver-xorg-core/copyright" \ -- "/usr/X11R6/README" \ -+ "/usr/local/README" \ - "/usr/share/doc/libX11*/COPYING" \ - "/usr/X11/share/X11/doc/README*" \ - "/usr/share/doc/debian/debian-manifesto" \ -@@ -4139,7 +4139,7 @@ PTY_LIBS= - ############################################################################### - - 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 -@@ -4397,7 +4397,7 @@ if test -z "$PO_DATADIR" ; then - if test -z "$PO_DATADIR" ; then - # - # #### Total fucking kludge -- -- # Map /build/prefix/usr/X11R6/share/ to /build/prefix/usr/share/ -+ # Map /build/prefix/usr/local/share/ to /build/prefix/usr/share/ - # but of course we need to expand all the nested variables to do that... - # - dd=`eval eval eval eval eval eval eval eval eval eval eval echo $datadir` -@@ -4665,7 +4665,7 @@ else - warn2 "detection of the various GTK libraries won't work." - CONF_STATUS=1 - else -- pkgerr=`$pkg_config --list-all 2>&1 >/dev/null` -+ pkgerr=`$pkg_config --help 2>&1 >/dev/null` - if test "x$pkgerr" != "x" ; then - warnL 'The "pkg-config" program produces errors. This often causes' - warn2 "detection of the various GTK libraries to malfunction." diff --git a/x11/xscreensaver/files/patch-utils_textclient.c b/x11/xscreensaver/files/patch-utils_textclient.c index bdb656e9cc80..f258723f72cc 100644 --- a/x11/xscreensaver/files/patch-utils_textclient.c +++ b/x11/xscreensaver/files/patch-utils_textclient.c @@ -1,12 +1,10 @@ --- utils/textclient.c.orig 2016-04-28 02:29:36 UTC +++ utils/textclient.c -@@ -55,6 +55,9 @@ +@@ -55,6 +55,7 @@ # ifdef HAVE_SYS_TERMIOS_H # include # endif -+# ifdef HAVE_LIBUTIL_H -+# include -+# endif ++# include #endif /* HAVE_FORKPTY */ #undef DEBUG