Fix gnome-stones by removing a patch that was installing the game plug-ins

in the wrong directory.

6 files changed, 10 insertions, 28 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index f17dee8d1c2..96197380c4f 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomegames2
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.6
diff --git a/games/gnome-games/files/patch-ab b/games/gnome-games/files/patch-ab
deleted file mode 100644
index 67cea1ce815..00000000000
--- a/games/gnome-games/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-stones/objects/Makefile.in.orig	Sun Jun 15 20:28:06 2003
-+++ gnome-stones/objects/Makefile.in	Sun Jun 15 20:28:06 2003
-@@ -136,7 +136,7 @@
- 
- GSTONES_SRC_DIR = $(srcdir)/../
- 
--objectdir = $(libdir)/gnome-stones/objects
-+objectdir = $(datadir)/gnome-stones/objects
- 
- INCLUDES = \
- 	-I$(GSTONES_SRC_DIR)				\
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 02745dda6d6..a6e3f7e7787 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -66,6 +66,8 @@ etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
 include/gdkcardimage/card-style-file.h
 include/gdkcardimage/gdk-card-image.h
+lib/gnome-stones/objects/libgnome-stones.so
+lib/gnome-stones/objects/libgnomekoban.so
 lib/libgdkcardimage.a
 lib/libgdkcardimage.so
 lib/libgdkcardimage.so.1
@@ -192,8 +194,6 @@ share/gnome/gnome-stones/default.caves
 share/gnome/gnome-stones/gnome-stonesrc
 share/gnome/gnome-stones/gnome-stonesrc.ko
 share/gnome/gnome-stones/gnomekoban.caves
-share/gnome/gnome-stones/objects/libgnome-stones.so
-share/gnome/gnome-stones/objects/libgnomekoban.so
 share/gnome/gnome-stones/tutorial.caves
 share/gnome/help/aisleriot/C/agnes.xml
 share/gnome/help/aisleriot/C/aisleriot.xml
@@ -794,12 +794,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/help/aisleriot/C/figures
 @dirrm share/gnome/help/aisleriot/C
 @dirrm share/gnome/help/aisleriot
-@dirrm share/gnome/gnome-stones/objects
 @dirrm share/gnome/gnome-stones
 @dirrm share/gnome/gnobots2
 @dirrm share/gnome/gnibbles
 @dirrm share/gnome/gnect
 @dirrm share/gnome/blackjack
+@dirrm lib/gnome-stones/objects
+@dirrm lib/gnome-stones
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index f17dee8d1c2..96197380c4f 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomegames2
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.6
diff --git a/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab
deleted file mode 100644
index 67cea1ce815..00000000000
--- a/games/gnomegames2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-stones/objects/Makefile.in.orig	Sun Jun 15 20:28:06 2003
-+++ gnome-stones/objects/Makefile.in	Sun Jun 15 20:28:06 2003
-@@ -136,7 +136,7 @@
- 
- GSTONES_SRC_DIR = $(srcdir)/../
- 
--objectdir = $(libdir)/gnome-stones/objects
-+objectdir = $(datadir)/gnome-stones/objects
- 
- INCLUDES = \
- 	-I$(GSTONES_SRC_DIR)				\
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 02745dda6d6..a6e3f7e7787 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -66,6 +66,8 @@ etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
 include/gdkcardimage/card-style-file.h
 include/gdkcardimage/gdk-card-image.h
+lib/gnome-stones/objects/libgnome-stones.so
+lib/gnome-stones/objects/libgnomekoban.so
 lib/libgdkcardimage.a
 lib/libgdkcardimage.so
 lib/libgdkcardimage.so.1
@@ -192,8 +194,6 @@ share/gnome/gnome-stones/default.caves
 share/gnome/gnome-stones/gnome-stonesrc
 share/gnome/gnome-stones/gnome-stonesrc.ko
 share/gnome/gnome-stones/gnomekoban.caves
-share/gnome/gnome-stones/objects/libgnome-stones.so
-share/gnome/gnome-stones/objects/libgnomekoban.so
 share/gnome/gnome-stones/tutorial.caves
 share/gnome/help/aisleriot/C/agnes.xml
 share/gnome/help/aisleriot/C/aisleriot.xml
@@ -794,12 +794,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/help/aisleriot/C/figures
 @dirrm share/gnome/help/aisleriot/C
 @dirrm share/gnome/help/aisleriot
-@dirrm share/gnome/gnome-stones/objects
 @dirrm share/gnome/gnome-stones
 @dirrm share/gnome/gnobots2
 @dirrm share/gnome/gnibbles
 @dirrm share/gnome/gnect
 @dirrm share/gnome/blackjack
+@dirrm lib/gnome-stones/objects
+@dirrm lib/gnome-stones
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true