4 files changed, 19 insertions, 10 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index db662b236063..83acc20cc034 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xscreensaver-gnome
-PORTVERSION=	4.19
+PORTVERSION=	4.20
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -66,7 +66,8 @@ MAN1=	anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	fontglide.1 gleidescope.1 mirrorblob.1 pong.1 xanalogtv.1 \
 	mismunch.1 noof.1 pacman.1 wormhole.1 antinspect.1 fuzzyflakes.1\
 	polyhedra.1 anemotaxis.1 providence.1 memscroller.1 fireworkx.1 \
-	intermomentary.1 pinion.1 substrate.1 \
+	intermomentary.1 pinion.1 substrate.1 boing.1 boxfit.1 carousel.1 \
+	fiberlamp.1 \
 	xscreensaver-command.1 xscreensaver-demo.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
 	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
diff --git a/x11/xscreensaver-gnome/distinfo b/x11/xscreensaver-gnome/distinfo
index 1d5c4adb7898..2bb07d04590b 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/distinfo
@@ -1,2 +1,2 @@
-MD5 (xscreensaver-4.19.tar.gz) = 3ef2b585cd1185a9f277d53f24e13142
-SIZE (xscreensaver-4.19.tar.gz) = 4360791
+MD5 (xscreensaver-4.20.tar.gz) = 7df61d5d8e3190711988534f7ca84eda
+SIZE (xscreensaver-4.20.tar.gz) = 4437919
diff --git a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
index 711c6b14536c..440569f6b9ee 100644
--- a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
@@ -1,5 +1,5 @@
---- driver/Makefile.in.orig	Mon Feb  2 14:07:14 2004
-+++ driver/Makefile.in	Mon Feb  2 14:33:43 2004
+--- driver/Makefile.in.orig	Thu Feb 24 02:30:59 2005
++++ driver/Makefile.in	Thu Feb 24 02:31:32 2005
 @@ -24,14 +24,14 @@
  INTLTOOL_MERGE	= @INTLTOOL_MERGE@
  
@@ -20,16 +20,16 @@
  GNOME_BINDIR	= $(bindir)
  HACK_CONF_DIR	= @HACK_CONF_DIR@
  
-@@ -252,7 +252,7 @@
+@@ -256,7 +256,7 @@
  tests: $(TEST_EXES)
  
  install:   install-program   install-ad    install-scripts \
--	   install-gnome     install-kde   install-man   @INSTALL_PAM@
+-	   install-gnome     install-man   @INSTALL_PAM@
 +	   install-gnome     install-man
  uninstall: uninstall-program uninstall-ad  \
- 	   uninstall-gnome   uninstall-kde uninstall-man
+ 	   uninstall-gnome   uninstall-man
  
-@@ -485,8 +485,11 @@
+@@ -489,8 +489,11 @@
  	                                                                      \
             echo $(INSTALL_DATA) screensaver-properties.desktop		      \
               $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 014c24c93cba..958b8e796ebb 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -21,15 +21,18 @@ bin/xscreensaver-hacks/blaster
 bin/xscreensaver-hacks/blinkbox
 bin/xscreensaver-hacks/blitspin
 bin/xscreensaver-hacks/blocktube
+bin/xscreensaver-hacks/boing
 bin/xscreensaver-hacks/bouboule
 bin/xscreensaver-hacks/bouncingcow
 bin/xscreensaver-hacks/boxed
+bin/xscreensaver-hacks/boxfit
 bin/xscreensaver-hacks/braid
 bin/xscreensaver-hacks/bsod
 bin/xscreensaver-hacks/bubble3d
 bin/xscreensaver-hacks/bubbles
 bin/xscreensaver-hacks/bumps
 bin/xscreensaver-hacks/cage
+bin/xscreensaver-hacks/carousel
 bin/xscreensaver-hacks/ccurve
 bin/xscreensaver-hacks/circuit
 bin/xscreensaver-hacks/cloudlife
@@ -55,6 +58,7 @@ bin/xscreensaver-hacks/eruption
 bin/xscreensaver-hacks/euler2d
 bin/xscreensaver-hacks/extrusion
 bin/xscreensaver-hacks/fadeplot
+bin/xscreensaver-hacks/fiberlamp
 bin/xscreensaver-hacks/fireworkx
 bin/xscreensaver-hacks/flag
 bin/xscreensaver-hacks/flame
@@ -243,15 +247,18 @@ share/xscreensaver/config/blaster.xml
 share/xscreensaver/config/blinkbox.xml
 share/xscreensaver/config/blitspin.xml
 share/xscreensaver/config/blocktube.xml
+share/xscreensaver/config/boing.xml
 share/xscreensaver/config/bouboule.xml
 share/xscreensaver/config/bouncingcow.xml
 share/xscreensaver/config/boxed.xml
+share/xscreensaver/config/boxfit.xml
 share/xscreensaver/config/braid.xml
 share/xscreensaver/config/bsod.xml
 share/xscreensaver/config/bubble3d.xml
 share/xscreensaver/config/bubbles.xml
 share/xscreensaver/config/bumps.xml
 share/xscreensaver/config/cage.xml
+share/xscreensaver/config/carousel.xml
 share/xscreensaver/config/ccurve.xml
 share/xscreensaver/config/circuit.xml
 share/xscreensaver/config/cloudlife.xml
@@ -279,6 +286,7 @@ share/xscreensaver/config/eruption.xml
 share/xscreensaver/config/euler2d.xml
 share/xscreensaver/config/extrusion.xml
 share/xscreensaver/config/fadeplot.xml
+share/xscreensaver/config/fiberlamp.xml
 share/xscreensaver/config/fireflies.xml
 share/xscreensaver/config/fireworkx.xml
 share/xscreensaver/config/flag.xml