* Update to 4.10 [1]

* Convert to a GTK+-2 port [2]

Obtained from:	x11/xscreensaver [1]
Submitted by:	Alexander Nedotsukov <bland@mail.ru> [2]

7 files changed, 30 insertions, 72 deletions

diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 752ff182ad3d..df4a9cc1e4e7 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xscreensaver-gnome
-PORTVERSION=	4.09
-PORTREVISION=	2
+PORTVERSION=	4.10
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -17,21 +16,22 @@ COMMENT=	Save your screen while you entertain your cat (for GNOME users)
 
 LIB_DEPENDS=	gle.3:${PORTSDIR}/graphics/gle
 
+CONFLICTS=	xscreensaver-[0-9]*
+
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehier gnomelibs libcapplet gdkpixbuf
+USE_GNOME=	gnomehier libglade2
 GNU_CONFIGURE=	yes
 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-motif --with-gnome \
+		--with-jpeg=${LOCALBASE} --without-motif \
 		--without-kerberos
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		X_CFLAGS="-I${LOCALBASE}/include/gnome-xml"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(XS_WITH_ALL_FORTUNES)
 CONFIGURE_ARGS+=	--with-fortune="/usr/games/fortune -sa"
@@ -61,7 +61,7 @@ MAN1=   anemone.1 ant.1 apollonian.1 atlantis.1 attraction.1 blaster.1 \
 	xmatrix.1 xrayswarm.1 xspirograph.1 xsublim.1 xteevee.1 zoom.1 \
 	endgame.1 glblur.1 halftone.1 barcode.1 eruption.1 flurry.1 \
 	metaballs.1 atunnel.1 piecewise.1 bouncingcow.1 flyingtoasters.1 \
-	glslideshow.1 \
+	glslideshow.1 jigglypuff.1 klein.1 \
 	xscreensaver-command.1 xscreensaver-demo.1 \
 	xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \
 	xscreensaver-getimage.1 xscreensaver-gl-helper.1 xscreensaver.1
@@ -71,11 +71,8 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD}  -e 's|malloc[.]h|stdlib.h|g' \
 		${WRKSRC}/hacks/glx/extrusion.c
-
-.if !defined(PACKAGE_BUILDING)
-pre-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
+	@${REINPLACE_CMD} -e 's|
||' \
+		${WRKSRC}/hacks/glx/klein.c
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/utils/images/logo-50.xpm \
diff --git a/x11/xscreensaver-gnome/distinfo b/x11/xscreensaver-gnome/distinfo
index 81d4d1b9a5c0..f5788c1dc02a 100644
--- a/x11/xscreensaver-gnome/distinfo
+++ b/x11/xscreensaver-gnome/distinfo
@@ -1 +1 @@
-MD5 (xscreensaver-4.09.tar.gz) = fa43fdd68d75a1d2fa08afb8b0d9fa8e
+MD5 (xscreensaver-4.10.tar.gz) = e12fd9a598feaa46b05ee7121e423330
diff --git a/x11/xscreensaver-gnome/files/patch-ab b/x11/xscreensaver-gnome/files/patch-ab
index 6c67406a6e40..1eab7a77fdeb 100644
--- a/x11/xscreensaver-gnome/files/patch-ab
+++ b/x11/xscreensaver-gnome/files/patch-ab
@@ -3,24 +3,6 @@ $FreeBSD$
 
 --- configure.orig	Tue Jun 11 12:09:04 2002
 +++ configure	Thu Jul 18 15:09:54 2002
-@@ -12483,7 +12483,7 @@
-     pkg_check_version  gmodule-2.0  2.0.0
-     pkg_check_version   libxml-2.0  2.4.6
-     pkg_check_version libglade-2.0  1.99.0
--    have_gtk="$ok"
-+    have_gtk="no"
- 
-     if test "$have_gtk" = yes; then
-       have_gtk2=yes
-@@ -13116,7 +13116,7 @@
- 
-     # First check for XML 2.x.
-     #
--    pkg_check_version libxml-2.0 2.4.6
-+    pkg_check_version libxml 1.0
- 
-     # If that didn't work (we don't have XML 2.x) and we *don't* have
-     # Gtk 2.x, then check to see if we have XML 1.x
 @@ -17491,13 +17491,13 @@
  # Now that we know whether we have Gnome, we can decide where the XML
  # config files get installed.
diff --git a/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in b/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in
deleted file mode 100644
index aa2bbc2ec14c..000000000000
--- a/x11/xscreensaver-gnome/files/patch-driver::screensaver-properties.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$FreeBSD$
-
---- driver/screensaver-properties.desktop.in	2002/08/06 08:25:53	1.1
-+++ driver/screensaver-properties.desktop.in	2002/08/06 08:26:01
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Exec=xscreensaver-demo --crapplet
-+Exec=xscreensaver-demo
- TryExec=xscreensaver-demo
- Icon=xscreensaver.xpm
- Terminal=0
diff --git a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
index b66a4a20c0bb..f109e7d16612 100644
--- a/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
+++ b/x11/xscreensaver-gnome/files/patch-driver_Makefile.in
@@ -1,20 +1,22 @@
---- driver/Makefile.in.orig	Wed Oct 23 23:26:18 2002
-+++ driver/Makefile.in	Sun Nov 10 01:07:33 2002
-@@ -23,11 +23,11 @@
+--- driver/Makefile.in.orig	Tue Mar 18 07:30:00 2003
++++ driver/Makefile.in	Mon May 19 22:01:49 2003
+@@ -24,11 +24,11 @@
  INTLTOOL_MERGE	= @INTLTOOL_MERGE@
  
  GNOME_DATADIR	= @GNOME_DATADIR@
 -GNOME_CCDIR_1	= $(GNOME_DATADIR)/control-center/Desktop
+-GNOME_CCDIR_2	= $(GNOME_DATADIR)/control-center/capplets
+-GNOME_CCDIR_3	= $(GNOME_DATADIR)/control-center-2.0/capplets
 +GNOME_CCDIR_1	= $(GNOME_DATADIR)/gnome/control-center/Desktop
- GNOME_CCDIR_2	= $(GNOME_DATADIR)/control-center/capplets
- GNOME_CCDIR_3	= $(GNOME_DATADIR)/control-center-2.0/capplets
++GNOME_CCDIR_2	= $(GNOME_DATADIR)/gnome/control-center/capplets
++GNOME_CCDIR_3	= $(GNOME_DATADIR)/gnome/control-center-2.0/capplets
  GNOME_PANELDIR1 = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop
 -GNOME_PANELDIR2	= $(GNOME_DATADIR)/applications
 +GNOME_PANELDIR2 = $(GNOME_DATADIR)/gnome/applications
  GNOME_PANELDIR	= @GNOME_PANELDIR@
  GLADE_DATADIR	= @GLADE_DATADIR@
  GNOME_BINDIR	= $(bindir)
-@@ -475,8 +475,11 @@
+@@ -477,8 +477,11 @@
  	                                                                      \
             echo $(INSTALL_DATA) screensaver-properties.desktop		      \
               $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
diff --git a/x11/xscreensaver-gnome/pkg-install b/x11/xscreensaver-gnome/pkg-install
deleted file mode 100644
index 3b8fcf367c39..000000000000
--- a/x11/xscreensaver-gnome/pkg-install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ -n "${PACKAGE_BUILDING}" ]; then
-    exit 0
-fi
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH}
-export PATH
-
-if [ "$2" = "PRE-INSTALL" ]; then
-    if pkg_info | grep "^xscreensaver-[0-9]" >/dev/null 2>&1; then
-	     echo ""
-	     echo "*********************************************************"
-	     echo "You already have the non-gnome xscreensaver installed."
-	     echo "Please deinstall it before installing xscreensaver-gnome."
-	     echo "*********************************************************"
-	     echo ""
-	     false
-    fi
-fi
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index a674ee02056d..8195482e3ae9 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -26,6 +26,7 @@ bin/xscreensaver-hacks/bumps
 bin/xscreensaver-hacks/cage
 bin/xscreensaver-hacks/ccurve
 bin/xscreensaver-hacks/circuit
+bin/xscreensaver-hacks/cloudlife
 bin/xscreensaver-hacks/compass
 bin/xscreensaver-hacks/coral
 bin/xscreensaver-hacks/critical
@@ -81,6 +82,7 @@ bin/xscreensaver-hacks/jigsaw
 bin/xscreensaver-hacks/juggle
 bin/xscreensaver-hacks/julia
 bin/xscreensaver-hacks/kaleidescope
+bin/xscreensaver-hacks/klein
 bin/xscreensaver-hacks/kumppa
 bin/xscreensaver-hacks/lament
 bin/xscreensaver-hacks/laser
@@ -167,21 +169,26 @@ bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/xteevee
 bin/xscreensaver-hacks/zoom
 lib/X11/app-defaults/XScreenSaver
-share/gnome/apps/Settings/Desktop/screensaver-properties.desktop
+share/gnome/control-center/capplets/screensaver-properties.desktop
 share/gnome/control-center/Desktop/screensaver-properties.desktop
+share/gnome/applications/screensaver-properties.desktop
+share/gnome/control-center-2.0/capplets/screensaver-properties.desktop
 share/gnome/pixmaps/xscreensaver.xpm
 share/locale/ca/LC_MESSAGES/xscreensaver.mo
-share/locale/de/LC_MESSAGES/xscreensaver.mo
+share/locale/da/LC_MESSAGES/xscreensaver.mo
+share/locale/es/LC_MESSAGES/xscreensaver.mo
+share/locale/et/LC_MESSAGES/xscreensaver.mo
 share/locale/fi/LC_MESSAGES/xscreensaver.mo
 share/locale/fr/LC_MESSAGES/xscreensaver.mo
 share/locale/hu/LC_MESSAGES/xscreensaver.mo
 share/locale/it/LC_MESSAGES/xscreensaver.mo
+share/locale/ja/LC_MESSAGES/xscreensaver.mo
+share/locale/ko/LC_MESSAGES/xscreensaver.mo
 share/locale/nl/LC_MESSAGES/xscreensaver.mo
 share/locale/no/LC_MESSAGES/xscreensaver.mo
 share/locale/pl/LC_MESSAGES/xscreensaver.mo
 share/locale/pt/LC_MESSAGES/xscreensaver.mo
 share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo
-share/locale/ru/LC_MESSAGES/xscreensaver.mo
 share/locale/sk/LC_MESSAGES/xscreensaver.mo
 share/locale/sv/LC_MESSAGES/xscreensaver.mo
 share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
@@ -207,6 +214,7 @@ share/xscreensaver/config/bumps.xml
 share/xscreensaver/config/cage.xml
 share/xscreensaver/config/ccurve.xml
 share/xscreensaver/config/circuit.xml
+share/xscreensaver/config/cloudlife.xml
 share/xscreensaver/config/compass.xml
 share/xscreensaver/config/coral.xml
 share/xscreensaver/config/cosmos.xml
@@ -260,6 +268,7 @@ share/xscreensaver/config/hypercube.xml
 share/xscreensaver/config/ifs.xml
 share/xscreensaver/config/imsmap.xml
 share/xscreensaver/config/interference.xml
+share/xscreensaver/config/jigglypuff.xml
 share/xscreensaver/config/jigsaw.xml
 share/xscreensaver/config/juggle.xml
 share/xscreensaver/config/julia.xml