Update to 2.5.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1489 df743ca5-7f9a-e211-a948-0013205c9059

12 files changed, 30 insertions, 84 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 5c39ce51b..963f2a540 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTVERSION=	2.5.2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.5
@@ -23,7 +22,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
+USE_GNOME=	gnomeprefix gnomehack gnomehier lthack libgnomeui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 954f37ba5..8b84426d0 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-2.5.1.tar.bz2) = b49046cab163c6151029fff90c4bd2ec
+MD5 (gnome2/gnome-games-2.5.2.tar.bz2) = e646c5665296bef5b0a14ceb7d0c1fa7
diff --git a/games/gnome-games/files/patch-ac b/games/gnome-games/files/patch-ac
index 4f62486fb..2605cefdf 100644
--- a/games/gnome-games/files/patch-ac
+++ b/games/gnome-games/files/patch-ac
@@ -1,11 +1,11 @@
---- gdk-card-image/Makefile.in.orig	Wed May  8 16:32:35 2002
-+++ gdk-card-image/Makefile.in	Wed May  8 16:32:41 2002
-@@ -164,7 +164,7 @@
- libgdkcardimage_la_SOURCES = gdk-card-image.c
+--- gdk-card-image/Makefile.in.orig	Wed Dec 10 11:44:58 2003
++++ gdk-card-image/Makefile.in	Wed Dec 10 11:45:48 2003
+@@ -243,7 +243,7 @@
+ libgdkcardimage_la_SOURCES = gdk-card-image.c card-style-file.c
  libgdkcardimageincludedir = $(includedir)/gdkcardimage
- libgdkcardimageinclude_HEADERS = gdk-card-image.h
+ libgdkcardimageinclude_HEADERS = gdk-card-image.h card-style-file.h
 -libgdkcardimage_la_LDFLAGS = -version-info 0:0:0
 +libgdkcardimage_la_LDFLAGS = -version-info 1:0:0
  libgdkcardimage_la_LIBADD = $(GNOME_GAMES_LIBS) @UCB_LDFLAGS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
+ subdir = gdk-card-image
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/games/gnome-games/files/patch-configure b/games/gnome-games/files/patch-configure
index ad46f4ce2..f8413ef3c 100644
--- a/games/gnome-games/files/patch-configure
+++ b/games/gnome-games/files/patch-configure
@@ -1,23 +1,6 @@
---- configure.orig	Wed Nov 19 05:43:17 2003
-+++ configure	Wed Nov 19 18:58:16 2003
-@@ -18545,6 +18545,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -18622,7 +18623,7 @@
- 
- 
- 
--if test "x$CXX_PRESENT" == xyes; then
-+if test "x$CXX_PRESENT" = xyes; then
-   HAVE_CXX_TRUE=
-   HAVE_CXX_FALSE='#'
- else
-@@ -22454,7 +22455,7 @@
+--- configure.orig	Wed Dec 17 11:58:34 2003
++++ configure	Wed Dec 17 11:58:35 2003
+@@ -22452,7 +22452,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
diff --git a/games/gnome-games/files/patch-gtali_Makefile.in b/games/gnome-games/files/patch-gtali_Makefile.in
deleted file mode 100644
index 38ba5b719..000000000
--- a/games/gnome-games/files/patch-gtali_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtali/Makefile.in.orig	Wed Nov 19 19:18:18 2003
-+++ gtali/Makefile.in	Wed Nov 19 19:18:26 2003
-@@ -688,7 +688,7 @@
- @INTLTOOL_DESKTOP_RULE@
- 
- install-data-local:
--@GCONF_SCHEMAS_INSTALL_TRUE@	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_buildir)/gtali/$(schema_DATA)
-+@GCONF_SCHEMAS_INSTALL_TRUE@	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gtali/$(schema_DATA)
- 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
- 	-touch $(DESTDIR)$(scoredir)/gtali.scores
- 	-chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gtali.scores
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 325efaf7a..5abbc24ab 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -94,6 +94,7 @@ etc/sound/events/gnect.soundlist
 etc/sound/events/gnibbles.soundlist
 etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
+include/gdkcardimage/card-style-file.h
 include/gdkcardimage/gdk-card-image.h
 lib/libgdkcardimage.a
 lib/libgdkcardimage.so
@@ -442,6 +443,7 @@ share/gnome/pixmaps/cards/backs/grey.png
 share/gnome/pixmaps/cards/backs/rods.png
 share/gnome/pixmaps/cards/backs/tux.png
 share/gnome/pixmaps/cards/baize.png
+share/gnome/pixmaps/cards/card-styles.xml
 share/gnome/pixmaps/cards/honors/bonded.png
 share/gnome/pixmaps/cards/honors/dondorf.png
 share/gnome/pixmaps/cards/honors/xpat.png
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 5c39ce51b..963f2a540 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTVERSION=	2.5.2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.5
@@ -23,7 +22,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
+USE_GNOME=	gnomeprefix gnomehack gnomehier lthack libgnomeui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index 954f37ba5..8b84426d0 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-2.5.1.tar.bz2) = b49046cab163c6151029fff90c4bd2ec
+MD5 (gnome2/gnome-games-2.5.2.tar.bz2) = e646c5665296bef5b0a14ceb7d0c1fa7
diff --git a/games/gnomegames2/files/patch-ac b/games/gnomegames2/files/patch-ac
index 4f62486fb..2605cefdf 100644
--- a/games/gnomegames2/files/patch-ac
+++ b/games/gnomegames2/files/patch-ac
@@ -1,11 +1,11 @@
---- gdk-card-image/Makefile.in.orig	Wed May  8 16:32:35 2002
-+++ gdk-card-image/Makefile.in	Wed May  8 16:32:41 2002
-@@ -164,7 +164,7 @@
- libgdkcardimage_la_SOURCES = gdk-card-image.c
+--- gdk-card-image/Makefile.in.orig	Wed Dec 10 11:44:58 2003
++++ gdk-card-image/Makefile.in	Wed Dec 10 11:45:48 2003
+@@ -243,7 +243,7 @@
+ libgdkcardimage_la_SOURCES = gdk-card-image.c card-style-file.c
  libgdkcardimageincludedir = $(includedir)/gdkcardimage
- libgdkcardimageinclude_HEADERS = gdk-card-image.h
+ libgdkcardimageinclude_HEADERS = gdk-card-image.h card-style-file.h
 -libgdkcardimage_la_LDFLAGS = -version-info 0:0:0
 +libgdkcardimage_la_LDFLAGS = -version-info 1:0:0
  libgdkcardimage_la_LIBADD = $(GNOME_GAMES_LIBS) @UCB_LDFLAGS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
+ subdir = gdk-card-image
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/games/gnomegames2/files/patch-configure b/games/gnomegames2/files/patch-configure
index ad46f4ce2..f8413ef3c 100644
--- a/games/gnomegames2/files/patch-configure
+++ b/games/gnomegames2/files/patch-configure
@@ -1,23 +1,6 @@
---- configure.orig	Wed Nov 19 05:43:17 2003
-+++ configure	Wed Nov 19 18:58:16 2003
-@@ -18545,6 +18545,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -18622,7 +18623,7 @@
- 
- 
- 
--if test "x$CXX_PRESENT" == xyes; then
-+if test "x$CXX_PRESENT" = xyes; then
-   HAVE_CXX_TRUE=
-   HAVE_CXX_FALSE='#'
- else
-@@ -22454,7 +22455,7 @@
+--- configure.orig	Wed Dec 17 11:58:34 2003
++++ configure	Wed Dec 17 11:58:35 2003
+@@ -22452,7 +22452,7 @@
  else
  
  cat >>confdefs.h <<_ACEOF
diff --git a/games/gnomegames2/files/patch-gtali_Makefile.in b/games/gnomegames2/files/patch-gtali_Makefile.in
deleted file mode 100644
index 38ba5b719..000000000
--- a/games/gnomegames2/files/patch-gtali_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtali/Makefile.in.orig	Wed Nov 19 19:18:18 2003
-+++ gtali/Makefile.in	Wed Nov 19 19:18:26 2003
-@@ -688,7 +688,7 @@
- @INTLTOOL_DESKTOP_RULE@
- 
- install-data-local:
--@GCONF_SCHEMAS_INSTALL_TRUE@	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_buildir)/gtali/$(schema_DATA)
-+@GCONF_SCHEMAS_INSTALL_TRUE@	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gtali/$(schema_DATA)
- 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
- 	-touch $(DESTDIR)$(scoredir)/gtali.scores
- 	-chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gtali.scores
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 325efaf7a..5abbc24ab 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -94,6 +94,7 @@ etc/sound/events/gnect.soundlist
 etc/sound/events/gnibbles.soundlist
 etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
+include/gdkcardimage/card-style-file.h
 include/gdkcardimage/gdk-card-image.h
 lib/libgdkcardimage.a
 lib/libgdkcardimage.so
@@ -442,6 +443,7 @@ share/gnome/pixmaps/cards/backs/grey.png
 share/gnome/pixmaps/cards/backs/rods.png
 share/gnome/pixmaps/cards/backs/tux.png
 share/gnome/pixmaps/cards/baize.png
+share/gnome/pixmaps/cards/card-styles.xml
 share/gnome/pixmaps/cards/honors/bonded.png
 share/gnome/pixmaps/cards/honors/dondorf.png
 share/gnome/pixmaps/cards/honors/xpat.png