Update to 4.22, with the usual collection of a few new hacks

and bug fixes.

3 files changed, 13 insertions, 11 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 97d5de37392c..5f9a91228518 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -5,14 +5,8 @@
 # $FreeBSD$
 #
 
-#************************************************************************
-#									*
-#	DO NOT COMMIT TO THIS PORT WITHOUT MY PERMISSION. THANKS.	*
-#									*
-#************************************************************************
-
 PORTNAME=	xscreensaver
-PORTVERSION=	4.21
+PORTVERSION=	4.22
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 
@@ -33,7 +27,7 @@ CONFIGURE_ARGS=	--without-pam --with-gl --with-gle --with-xpm --with-xml \
 		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
 		--with-configdir=${PREFIX}/share/xscreensaver/config/ \
 		--with-jpeg=${LOCALBASE} --without-gnome --without-kerberos \
-		--without-motif
+		--without-motif --mandir=${PREFIX}/man
 
 .include <bsd.port.pre.mk>
 
@@ -78,7 +72,7 @@ MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	xanalogtv.1 mismunch.1 noof.1 pacman.1 wormhole.1 anemotaxis.1 \
 	antinspect.1 fuzzyflakes.1 polyhedra.1 providence.1 memscroller.1 \
 	boing.1 boxfit.1 carousel.1 fiberlamp.1 fireworkx.1 fliptext.1 intermomentary.1 \
-	pinion.1 substrate.1 \
+	pinion.1 substrate.1 antmaze.1 crackberg.1 interaggregate.1 tangram.1 \
 	xscreensaver-command.1 xscreensaver-demo.1 xscreensaver-text.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
 	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index 7a345aaf5d64..6f9e1e553121 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,2 +1,2 @@
-MD5 (xscreensaver-4.21.tar.gz) = 3ea7d0bc9b7159523855296e175d7ac7
-SIZE (xscreensaver-4.21.tar.gz) = 4519828
+MD5 (xscreensaver-4.22.tar.gz) = 9f37c428f034e581026e243445378195
+SIZE (xscreensaver-4.22.tar.gz) = 4620066
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index a5a37fc449da..b2bdccb31b9b 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -10,6 +10,7 @@ bin/xscreensaver-hacks/anemone
 bin/xscreensaver-hacks/anemotaxis
 bin/xscreensaver-hacks/ant
 bin/xscreensaver-hacks/antinspect
+bin/xscreensaver-hacks/antmaze
 bin/xscreensaver-hacks/antspotlight
 bin/xscreensaver-hacks/apollonian
 bin/xscreensaver-hacks/apple2
@@ -38,6 +39,7 @@ bin/xscreensaver-hacks/circuit
 bin/xscreensaver-hacks/cloudlife
 bin/xscreensaver-hacks/compass
 bin/xscreensaver-hacks/coral
+bin/xscreensaver-hacks/crackberg
 bin/xscreensaver-hacks/critical
 bin/xscreensaver-hacks/crystal
 bin/xscreensaver-hacks/cubenetic
@@ -96,6 +98,7 @@ bin/xscreensaver-hacks/hypercube
 bin/xscreensaver-hacks/hypertorus
 bin/xscreensaver-hacks/ifs
 bin/xscreensaver-hacks/imsmap
+bin/xscreensaver-hacks/interaggregate
 bin/xscreensaver-hacks/interference
 bin/xscreensaver-hacks/intermomentary
 bin/xscreensaver-hacks/jigglypuff
@@ -179,6 +182,7 @@ bin/xscreensaver-hacks/substrate
 bin/xscreensaver-hacks/superquadrics
 bin/xscreensaver-hacks/swirl
 bin/xscreensaver-hacks/t3d
+bin/xscreensaver-hacks/tangram
 bin/xscreensaver-hacks/thornbird
 bin/xscreensaver-hacks/triangle
 bin/xscreensaver-hacks/truchet
@@ -209,6 +213,7 @@ share/xscreensaver/config/anemone.xml
 share/xscreensaver/config/anemotaxis.xml
 share/xscreensaver/config/ant.xml
 share/xscreensaver/config/antinspect.xml
+share/xscreensaver/config/antmaze.xml
 share/xscreensaver/config/antspotlight.xml
 share/xscreensaver/config/apollonian.xml
 share/xscreensaver/config/apple2.xml
@@ -237,6 +242,7 @@ share/xscreensaver/config/circuit.xml
 share/xscreensaver/config/cloudlife.xml
 share/xscreensaver/config/compass.xml
 share/xscreensaver/config/coral.xml
+share/xscreensaver/config/crackberg.xml
 share/xscreensaver/config/critical.xml
 share/xscreensaver/config/crystal.xml
 share/xscreensaver/config/cubenetic.xml
@@ -295,6 +301,7 @@ share/xscreensaver/config/hypercube.xml
 share/xscreensaver/config/hypertorus.xml
 share/xscreensaver/config/ifs.xml
 share/xscreensaver/config/imsmap.xml
+share/xscreensaver/config/interaggregate.xml
 share/xscreensaver/config/interference.xml
 share/xscreensaver/config/intermomentary.xml
 share/xscreensaver/config/jigglypuff.xml
@@ -377,6 +384,7 @@ share/xscreensaver/config/substrate.xml
 share/xscreensaver/config/superquadrics.xml
 share/xscreensaver/config/swirl.xml
 share/xscreensaver/config/t3d.xml
+share/xscreensaver/config/tangram.xml
 share/xscreensaver/config/thornbird.xml
 share/xscreensaver/config/triangle.xml
 share/xscreensaver/config/truchet.xml