Index: x11/xscreensaver/files/patch-configure.ac =================================================================== --- x11/xscreensaver/files/patch-configure.ac +++ x11/xscreensaver/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.in.orig 2016-05-19 17:59:17 UTC -+++ configure.in -@@ -3538,7 +3538,7 @@ fi +--- configure.ac.orig 2020-12-06 15:54:46 UTC ++++ configure.ac +@@ -3971,7 +3971,7 @@ fi ############################################################################### PTY_LIBS= Index: xscreensaver/Makefile =================================================================== --- xscreensaver/Makefile +++ xscreensaver/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xscreensaver -PORTVERSION= 5.44 +PORTVERSION= 5.45 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ @@ -11,72 +11,83 @@ LICENSE= MIT -RUN_DEPENDS= p5-libwww>0:www/p5-libwww \ - giftopnm:graphics/netpbm -LIB_DEPENDS= libgle.so:graphics/gle \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 - -CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]* +RUN_DEPENDS= giftopnm:graphics/netpbm \ + p5-libwww>0:www/p5-libwww +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgle.so:graphics/gle USES= autoreconf gettext gl gmake gnome jpeg localbase:ldflags perl5 \ pkgconfig xorg USE_GL= gl glu USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2 USE_PERL5= run -USE_XORG= ice sm x11 xext xi xinerama xmu xrandr xrender xpm xt xxf86vm +USE_XORG= ice sm x11 xext xi xinerama xmu xpm xrandr xrender xt xxf86vm USE_CSTD= gnu99 +CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]* + GNU_CONFIGURE= yes CONFIGURE_ENV+= PERL="${PERL}" -CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \ - --with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \ - --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ +CONFIGURE_ARGS= --enable-locking \ + --with-app-defaults=${PREFIX}/lib/X11/app-defaults/ \ --with-configdir=${PREFIX}/share/xscreensaver/config/ \ - --with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/ \ - --with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \ - --with-xf86gamma-ext --with-randr-ext --without-kerberos \ - --without-setuid-hacks --enable-locking + --with-dpms-ext \ + --with-gl \ + --with-gle \ + --with-gtk \ + --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ + --with-jpeg=${LOCALBASE} \ + --with-pixbuf \ + --with-randr-ext \ + --with-xdbe-ext \ + --with-xf86gamma-ext \ + --with-xf86vmode-ext \ + --with-xinerama-ext \ + --with-xpm \ + --with-xshm-ext \ + --without-kerberos \ + --without-setuid-hacks MAKE_ARGS+= install_prefix=${STAGEDIR} -MAKE_JOBS_UNSAFE=yes +MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= PAM SETUID_HACKS FIREF NLS NSFW XAOS1 XDALI XEARTH \ - XFT XMOUN XPLANET XSNOW -OPTIONS_DEFAULT=PAM XFT -OPTIONS_SUB= yes +OPTIONS_DEFINE= FIREF NLS NSFW PAM SETUID_HACKS XAOS1 XDALI XEARTH XFT \ + XMOUN XPLANET XSNOW +OPTIONS_DEFAULT= PAM XFT +OPTIONS_SUB= yes -PAM_CONFIGURE_WITH= pam +PAM_CONFIGURE_WITH= pam -SETUID_HACKS_DESC= Install sonar hack suid so it can ping +SETUID_HACKS_DESC= Install sonar hack suid so it can ping -FIREF_DESC= Add extra port x11/fireflies -FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:x11/fireflies +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 +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls -NSFW_DESC= Include material that is Not Safe For Work +NSFW_DESC= Include material that is Not Safe For Work -XAOS1_DESC= Add extra port graphics/xaos -XAOS1_RUN_DEPENDS= xaos:graphics/xaos +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 +XDALI_DESC= Add extra port x11-clocks/xdaliclock +XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock -XFT_CONFIGURE_WITH= xft -XFT_USE= XORG=xft +XFT_CONFIGURE_WITH= xft +XFT_USE= XORG=xft -XEARTH_DESC= Add extra port astro/xearth -XEARTH_RUN_DEPENDS= xearth:astro/xearth +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 +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 +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 +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 @@ -84,7 +95,7 @@ post-patch: ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|pkg_config --list-all|pkg_config --help|' \ - ${WRKSRC}/configure.in + ${WRKSRC}/configure.ac ${REINPLACE_CMD} -e "s|/etc/pam.d|${PREFIX}/etc/pam.d|g" \ ${WRKSRC}/driver/passwd-pam.c \ ${WRKSRC}/driver/xscreensaver.man Index: xscreensaver/distinfo =================================================================== --- xscreensaver/distinfo +++ xscreensaver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1585756235 -SHA256 (xscreensaver-5.44.tar.gz) = 73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95 -SIZE (xscreensaver-5.44.tar.gz) = 27001826 +TIMESTAMP = 1615330387 +SHA256 (xscreensaver-5.45.tar.gz) = 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d +SIZE (xscreensaver-5.45.tar.gz) = 27729147 Index: xscreensaver/pkg-plist =================================================================== --- xscreensaver/pkg-plist +++ xscreensaver/pkg-plist @@ -17,6 +17,7 @@ bin/xscreensaver-hacks/attraction bin/xscreensaver-hacks/atunnel bin/xscreensaver-hacks/barcode +bin/xscreensaver-hacks/beats bin/xscreensaver-hacks/binaryring bin/xscreensaver-hacks/blaster bin/xscreensaver-hacks/blinkbox @@ -41,6 +42,7 @@ bin/xscreensaver-hacks/companioncube bin/xscreensaver-hacks/compass bin/xscreensaver-hacks/coral +bin/xscreensaver-hacks/covid19 bin/xscreensaver-hacks/crackberg bin/xscreensaver-hacks/crumbler bin/xscreensaver-hacks/crystal @@ -90,8 +92,8 @@ bin/xscreensaver-hacks/gears bin/xscreensaver-hacks/geodesic bin/xscreensaver-hacks/geodesicgears -bin/xscreensaver-hacks/gibson bin/xscreensaver-hacks/gflux +bin/xscreensaver-hacks/gibson bin/xscreensaver-hacks/glblur bin/xscreensaver-hacks/glcells bin/xscreensaver-hacks/gleidescope @@ -111,6 +113,7 @@ bin/xscreensaver-hacks/halftone bin/xscreensaver-hacks/halo bin/xscreensaver-hacks/handsy +bin/xscreensaver-hacks/headroom bin/xscreensaver-hacks/helix bin/xscreensaver-hacks/hexadrop bin/xscreensaver-hacks/hexstrut @@ -201,6 +204,7 @@ bin/xscreensaver-hacks/sonar %%SETUID_HACKS%%@mode bin/xscreensaver-hacks/speedmine +bin/xscreensaver-hacks/sphereeversion bin/xscreensaver-hacks/spheremonics bin/xscreensaver-hacks/splitflap bin/xscreensaver-hacks/splodesic @@ -269,6 +273,7 @@ man/man6/attraction.6.gz man/man6/atunnel.6.gz man/man6/barcode.6.gz +man/man6/beats.6.gz man/man6/binaryring.6.gz man/man6/blaster.6.gz man/man6/blinkbox.6.gz @@ -293,6 +298,7 @@ man/man6/companioncube.6.gz man/man6/compass.6.gz man/man6/coral.6.gz +man/man6/covid19.6.gz man/man6/crackberg.6.gz man/man6/crumbler.6.gz man/man6/crystal.6.gz @@ -363,6 +369,7 @@ man/man6/halftone.6.gz man/man6/halo.6.gz man/man6/handsy.6.gz +man/man6/headroom.6.gz man/man6/helix.6.gz man/man6/hexadrop.6.gz man/man6/hexstrut.6.gz @@ -449,6 +456,7 @@ man/man6/slip.6.gz man/man6/sonar.6.gz man/man6/speedmine.6.gz +man/man6/sphereeversion.6.gz man/man6/spheremonics.6.gz man/man6/splitflap.6.gz man/man6/splodesic.6.gz @@ -535,6 +543,7 @@ %%DATADIR%%/config/attraction.xml %%DATADIR%%/config/atunnel.xml %%DATADIR%%/config/barcode.xml +%%DATADIR%%/config/beats.xml %%DATADIR%%/config/binaryring.xml %%DATADIR%%/config/blaster.xml %%DATADIR%%/config/blinkbox.xml @@ -559,6 +568,7 @@ %%DATADIR%%/config/companioncube.xml %%DATADIR%%/config/compass.xml %%DATADIR%%/config/coral.xml +%%DATADIR%%/config/covid19.xml %%DATADIR%%/config/crackberg.xml %%DATADIR%%/config/crumbler.xml %%DATADIR%%/config/crystal.xml @@ -608,8 +618,8 @@ %%DATADIR%%/config/gears.xml %%DATADIR%%/config/geodesic.xml %%DATADIR%%/config/geodesicgears.xml -%%DATADIR%%/config/gibson.xml %%DATADIR%%/config/gflux.xml +%%DATADIR%%/config/gibson.xml %%DATADIR%%/config/glblur.xml %%DATADIR%%/config/glcells.xml %%DATADIR%%/config/gleidescope.xml @@ -629,6 +639,7 @@ %%DATADIR%%/config/halftone.xml %%DATADIR%%/config/halo.xml %%DATADIR%%/config/handsy.xml +%%DATADIR%%/config/headroom.xml %%DATADIR%%/config/helix.xml %%DATADIR%%/config/hexadrop.xml %%DATADIR%%/config/hexstrut.xml @@ -716,6 +727,7 @@ %%DATADIR%%/config/slip.xml %%DATADIR%%/config/sonar.xml %%DATADIR%%/config/speedmine.xml +%%DATADIR%%/config/sphereeversion.xml %%DATADIR%%/config/spheremonics.xml %%DATADIR%%/config/splitflap.xml %%DATADIR%%/config/splodesic.xml @@ -766,10 +778,10 @@ %%DATADIR%%/config/xsnow.xml %%DATADIR%%/config/xspirograph.xml %%DATADIR%%/config/zoom.xml -%%DATADIR%%/glade/screensaver-cmndln.png -%%DATADIR%%/glade/screensaver-colorselector.png -%%DATADIR%%/glade/screensaver-diagnostic.png -%%DATADIR%%/glade/screensaver-locking.png -%%DATADIR%%/glade/screensaver-power.png -%%DATADIR%%/glade/screensaver-snap.png -%%DATADIR%%/glade/xscreensaver-demo.glade2 +%%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 +%%DATADIR%%/ui/xscreensaver-demo.ui