[Midnightbsd-cvs] mports: x11/xscreensaver: update to 5.05

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Jun 2 11:52:07 EDT 2008 

Log Message:
-----------
update to 5.05

Modified Files:
--------------
    mports/x11/xscreensaver:
        Makefile (r1.5 -> r1.6)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11/xscreensaver/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/xscreensaver/pkg-plist -L x11/xscreensaver/pkg-plist -u -r1.1 -r1.2
--- x11/xscreensaver/pkg-plist
+++ x11/xscreensaver/pkg-plist
@@ -5,6 +5,7 @@
 bin/xscreensaver-getimage-file
 bin/xscreensaver-getimage-video
 bin/xscreensaver-gl-helper
+bin/xscreensaver-hacks/abstractile
 bin/xscreensaver-hacks/anemone
 bin/xscreensaver-hacks/anemotaxis
 bin/xscreensaver-hacks/antinspect
@@ -44,6 +45,8 @@
 bin/xscreensaver-hacks/cube21
 bin/xscreensaver-hacks/cubenetic
 bin/xscreensaver-hacks/cubestorm
+bin/xscreensaver-hacks/cubicgrid
+bin/xscreensaver-hacks/cwaves
 bin/xscreensaver-hacks/cynosure
 bin/xscreensaver-hacks/dangerball
 bin/xscreensaver-hacks/decayscreen
@@ -78,6 +81,7 @@
 bin/xscreensaver-hacks/gears
 bin/xscreensaver-hacks/gflux
 bin/xscreensaver-hacks/glblur
+bin/xscreensaver-hacks/glcells
 bin/xscreensaver-hacks/gleidescope
 bin/xscreensaver-hacks/glforestfire
 bin/xscreensaver-hacks/glhanoi
@@ -98,6 +102,7 @@
 bin/xscreensaver-hacks/hyperball
 bin/xscreensaver-hacks/hypercube
 bin/xscreensaver-hacks/hypertorus
+bin/xscreensaver-hacks/hypnowheel
 bin/xscreensaver-hacks/ifs
 bin/xscreensaver-hacks/imsmap
 bin/xscreensaver-hacks/interaggregate
@@ -114,12 +119,15 @@
 bin/xscreensaver-hacks/lament
 bin/xscreensaver-hacks/laser
 bin/xscreensaver-hacks/lavalite
+bin/xscreensaver-hacks/lcdscrub
 bin/xscreensaver-hacks/lightning
 bin/xscreensaver-hacks/lisa
 bin/xscreensaver-hacks/lissie
 bin/xscreensaver-hacks/ljlatest
 bin/xscreensaver-hacks/lmorph
+bin/xscreensaver-hacks/lockward
 bin/xscreensaver-hacks/loop
+bin/xscreensaver-hacks/m6502
 bin/xscreensaver-hacks/maze
 bin/xscreensaver-hacks/memscroller
 bin/xscreensaver-hacks/menger
@@ -127,6 +135,7 @@
 bin/xscreensaver-hacks/mirrorblob
 bin/xscreensaver-hacks/mismunch
 bin/xscreensaver-hacks/moebius
+bin/xscreensaver-hacks/moebiusgears
 bin/xscreensaver-hacks/moire
 bin/xscreensaver-hacks/moire2
 bin/xscreensaver-hacks/molecule
@@ -195,6 +204,7 @@
 bin/xscreensaver-hacks/vermiculate
 bin/xscreensaver-hacks/vidwhacker
 bin/xscreensaver-hacks/vines
+bin/xscreensaver-hacks/voronoi
 bin/xscreensaver-hacks/wander
 bin/xscreensaver-hacks/webcollage
 bin/xscreensaver-hacks/whirlwindwarp
@@ -211,9 +221,10 @@
 bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
-lib/X11/app-defaults/XScreenSaver
+%%PAM%%etc/pam.d/xscreensaver
 share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/README
+%%DATADIR%%/config/abstractile.xml
 %%DATADIR%%/config/anemone.xml
 %%DATADIR%%/config/anemotaxis.xml
 %%DATADIR%%/config/antinspect.xml
@@ -254,6 +265,8 @@
 %%DATADIR%%/config/cube21.xml
 %%DATADIR%%/config/cubenetic.xml
 %%DATADIR%%/config/cubestorm.xml
+%%DATADIR%%/config/cubicgrid.xml
+%%DATADIR%%/config/cwaves.xml
 %%DATADIR%%/config/cynosure.xml
 %%DATADIR%%/config/dangerball.xml
 %%DATADIR%%/config/decayscreen.xml
@@ -290,6 +303,7 @@
 %%DATADIR%%/config/gears.xml
 %%DATADIR%%/config/gflux.xml
 %%DATADIR%%/config/glblur.xml
+%%DATADIR%%/config/glcells.xml
 %%DATADIR%%/config/gleidescope.xml
 %%DATADIR%%/config/glforestfire.xml
 %%DATADIR%%/config/glhanoi.xml
@@ -311,6 +325,7 @@
 %%DATADIR%%/config/hyperball.xml
 %%DATADIR%%/config/hypercube.xml
 %%DATADIR%%/config/hypertorus.xml
+%%DATADIR%%/config/hypnowheel.xml
 %%DATADIR%%/config/ifs.xml
 %%DATADIR%%/config/imsmap.xml
 %%DATADIR%%/config/interaggregate.xml
@@ -327,11 +342,14 @@
 %%DATADIR%%/config/lament.xml
 %%DATADIR%%/config/laser.xml
 %%DATADIR%%/config/lavalite.xml
+%%DATADIR%%/config/lcdscrub.xml
 %%DATADIR%%/config/lightning.xml
 %%DATADIR%%/config/lisa.xml
 %%DATADIR%%/config/lissie.xml
 %%DATADIR%%/config/lmorph.xml
+%%DATADIR%%/config/lockward.xml
 %%DATADIR%%/config/loop.xml
+%%DATADIR%%/config/m6502.xml
 %%DATADIR%%/config/maze.xml
 %%DATADIR%%/config/memscroller.xml
 %%DATADIR%%/config/menger.xml
@@ -339,6 +357,7 @@
 %%DATADIR%%/config/mirrorblob.xml
 %%DATADIR%%/config/mismunch.xml
 %%DATADIR%%/config/moebius.xml
+%%DATADIR%%/config/moebiusgears.xml
 %%DATADIR%%/config/moire.xml
 %%DATADIR%%/config/moire2.xml
 %%DATADIR%%/config/molecule.xml
@@ -408,6 +427,7 @@
 %%DATADIR%%/config/vermiculate.xml
 %%DATADIR%%/config/vidwhacker.xml
 %%DATADIR%%/config/vines.xml
+%%DATADIR%%/config/voronoi.xml
 %%DATADIR%%/config/wander.xml
 %%DATADIR%%/config/webcollage.xml
 %%DATADIR%%/config/whirlwindwarp.xml
@@ -435,6 +455,8 @@
 %%DATADIR%%/glade/screensaver-snap.png
 %%DATADIR%%/glade/xscreensaver-demo.glade2
 @dirrmtry bin/xscreensaver-hacks
- at dirrm %%DATADIR%%/config
+ at dirrmtry %%DATADIR%%/config
 @dirrm %%DATADIR%%/glade
- at dirrm %%DATADIR%%
+ at dirrmtry %%DATADIR%%
+ at cwd %%LOCALBASE%%
+lib/X11/app-defaults/XScreenSaver
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/xscreensaver/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L x11/xscreensaver/Makefile -L x11/xscreensaver/Makefile -u -r1.5 -r1.6
--- x11/xscreensaver/Makefile
+++ x11/xscreensaver/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	xscreensaver
-PORTVERSION=	5.01
-PORTREVISION=   1
+PORTVERSION=	5.05
+PORTREVISION=   0
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
@@ -28,14 +28,16 @@
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-pam --with-gl --with-gle --with-xpm --with-xml \
+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/ \
 		--with-configdir=${PREFIX}/share/xscreensaver/config/ \
-		--with-jpeg=${LOCALBASE} --without-gnome --without-kerberos \
-		--without-motif --mandir=${PREFIX}/man \
-		--with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/		
+		--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \
+		--with-xf86gamma-ext --with-randr-ext --enable-locking
 
 OPTIONS=	ALL_FORTUNES "Run fortune with -sa argument" off \
+		KERBEROS "Add support for kerberos" off \
+		PAM "Add support for pam authentication" off \
 		SETUID_HACKS "Install sonar hack suid so it can ping" off
 
 .include <bsd.port.pre.mk>
@@ -46,6 +48,18 @@
 .if defined(WITH_SETUID_HACKS)
 CONFIGURE_ARGS+=	--with-setuid-hacks
 .endif
+.if defined(WITH_KERBEROS)
+CONFIGURE_ARGS+=	--with-kerberos
+.else
+CONFIGURE_ARGS+=	--without-kerberos
+.endif
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+=	--with-pam
+PLIST_SUB+=		PAM=""
+.else
+CONFIGURE_ARGS+=	--without-pam
+PLIST_SUB+=		PAM="@comment not installed: "
+.endif
 
 .undef HAVE_GNOME
 
@@ -87,7 +101,8 @@
 	triangle.6 truchet.6 twang.6 vermiculate.6 vidwhacker.6 vines.6 \
 	wander.6 webcollage.6 whirlwindwarp.6 whirlygig.6 worm.6 wormhole.6 \
 	xanalogtv.6 xflame.6 xjack.6 xlyap.6 xmatrix.6 xrayswarm.6 \
-	xspirograph.6 xsublim.6 zoom.6 \
+	xspirograph.6 xsublim.6 zoom.6 cwaves.6 glcells.6 voronoi.6 \
+	abstractile.6 moebiusgears.6 lockward.6 cubicgrid.6 hypnowheel.6 \
 	xscreensaver-gl-helper.6
 
 .if ${ARCH} == "amd64"
@@ -111,6 +126,18 @@
 		-e 's#malloc.h#stdlib.h#g' \
 		-e 's#/usr/X11R6#${LOCALBASE}#g' \
 		${WRKSRC}/configure.Patched > ${WRKSRC}/configure
+.if defined(WITH_PAM)
+.for f in driver/passwd-pam.c driver/xscreensaver.man
+	@ ${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
+	@ ${SED} -e "s#/etc/pam.d#${PREFIX}/etc/pam.d#g" \
+		${WRKSRC}/${f}.presed > ${WRKSRC}/${f}
+.endfor
+	@ ${CP} ${FILESDIR}/xscreensaver.pam ${WRKSRC}/driver/xscreensaver.pam
+.else
+	@ ${CP} ${WRKSRC}/driver/Makefile.in ${WRKSRC}/driver/Makefile.in.post
+	@ ${SED} -e "s#install-xml install-pam#install-xml#" \
+		${WRKSRC}/driver/Makefile.in.post > ${WRKSRC}/driver/Makefile.in
+.endif
 
 post-install:
 	@(if test -x ${LOCALBASE}/bin/xscreensaver-hacks/webcollage-helper; then \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11/xscreensaver/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/xscreensaver/distinfo -L x11/xscreensaver/distinfo -u -r1.1 -r1.2
--- x11/xscreensaver/distinfo
+++ x11/xscreensaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xscreensaver-5.01.tar.gz) = b60abc52b39591750f48f9c9f20c4167
-SHA256 (xscreensaver-5.01.tar.gz) = 3e34657a9180c3355a2bc81cec993bf8417daf6f8968d93bcb26751db9c9b0cf
-SIZE (xscreensaver-5.01.tar.gz) = 5270954
+MD5 (xscreensaver-5.05.tar.gz) = d759262b10d76f87f1a7fc50ae8664d4
+SHA256 (xscreensaver-5.05.tar.gz) = 3c64366f1990ebe173db422660dce5d9d80b1c758f3a9ad6e55fb72657dc821a
+SIZE (xscreensaver-5.05.tar.gz) = 5468293

More information about the Midnightbsd-cvs mailing list