Fix a bug in the gnect/data Makefile.in so that GConf schemas are properly

installed.


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

6 files changed, 46 insertions, 0 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 276d2badf..b4442ab71 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomegames2
 PORTVERSION=	2.5.4
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.5
diff --git a/games/gnome-games/files/patch-gnect_data_Makefile.in b/games/gnome-games/files/patch-gnect_data_Makefile.in
new file mode 100644
index 000000000..c9c69bcee
--- /dev/null
+++ b/games/gnome-games/files/patch-gnect_data_Makefile.in
@@ -0,0 +1,18 @@
+--- gnect/data/Makefile.in.orig	Sun Jan 11 21:44:10 2004
++++ gnect/data/Makefile.in	Sun Jan 11 21:44:33 2004
+@@ -222,7 +222,6 @@
+ 
+ 
+ CLEANFILES = $(schema_DATA)
+-@GCONF_SCHEMAS_INSTALL_TRUE@GCONF_CONFIG_SOURCE = $(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnect/data/$(schema_DATA)
+ subdir = gnect/data
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -455,6 +454,7 @@
+ @INTLTOOL_SOUNDLIST_RULE@
+ 
+ install-data-local:
++@GCONF_SCHEMAS_INSTALL_TRUE	@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnect/data/$(schema_DATA)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 711719337..a018c0875 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -23,6 +23,7 @@ etc/gconf/gconf.xml.defaults/apps/gataxx/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/glines/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/glines/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/glines/saved/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnect/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnibbles/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/%gconf.xml
@@ -52,6 +53,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gataxx/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/glines/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnect/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/%gconf.xml
@@ -813,6 +815,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnect
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines
@@ -842,6 +845,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnect
 @dirrm etc/gconf/gconf.xml.defaults/apps/glines/saved
 @dirrm etc/gconf/gconf.xml.defaults/apps/glines/preferences
 @dirrm etc/gconf/gconf.xml.defaults/apps/glines
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 276d2badf..b4442ab71 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomegames2
 PORTVERSION=	2.5.4
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.5
diff --git a/games/gnomegames2/files/patch-gnect_data_Makefile.in b/games/gnomegames2/files/patch-gnect_data_Makefile.in
new file mode 100644
index 000000000..c9c69bcee
--- /dev/null
+++ b/games/gnomegames2/files/patch-gnect_data_Makefile.in
@@ -0,0 +1,18 @@
+--- gnect/data/Makefile.in.orig	Sun Jan 11 21:44:10 2004
++++ gnect/data/Makefile.in	Sun Jan 11 21:44:33 2004
+@@ -222,7 +222,6 @@
+ 
+ 
+ CLEANFILES = $(schema_DATA)
+-@GCONF_SCHEMAS_INSTALL_TRUE@GCONF_CONFIG_SOURCE = $(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnect/data/$(schema_DATA)
+ subdir = gnect/data
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -455,6 +454,7 @@
+ @INTLTOOL_SOUNDLIST_RULE@
+ 
+ install-data-local:
++@GCONF_SCHEMAS_INSTALL_TRUE	@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnect/data/$(schema_DATA)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 711719337..a018c0875 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -23,6 +23,7 @@ etc/gconf/gconf.xml.defaults/apps/gataxx/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/glines/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/glines/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/glines/saved/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnect/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnibbles/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/%gconf.xml
@@ -52,6 +53,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gataxx/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/glines/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnect/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/%gconf.xml
@@ -813,6 +815,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnect
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines
@@ -842,6 +845,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnect
 @dirrm etc/gconf/gconf.xml.defaults/apps/glines/saved
 @dirrm etc/gconf/gconf.xml.defaults/apps/glines/preferences
 @dirrm etc/gconf/gconf.xml.defaults/apps/glines