Make sure gnect's GConf schemas get installed. This lets gnect work

again.

Reported by:	kris

4 files changed, 88 insertions, 7 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index ec75d9666941..d552b9d6051b 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomegames2
 PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.2
@@ -15,7 +15,7 @@ DISTNAME=	gnome-games-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	The game applications package for the Gnome 2.0 Desktop Environment
+COMMENT=	The game applications package for the Gnome 2 Desktop Environment
 
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
@@ -27,7 +27,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
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 000000000000..08a1f4d64147
--- /dev/null
+++ b/games/gnome-games/files/patch-gnect_data_Makefile.in
@@ -0,0 +1,30 @@
+--- gnect/data/Makefile.in.orig	Sun May 25 13:52:25 2003
++++ gnect/data/Makefile.in	Sun May 25 13:56:14 2003
+@@ -300,7 +300,7 @@
+ install-exec-am:
+ install-exec: install-exec-am
+ 
+-install-data-am: install-GamesDATA install-schemaDATA \
++install-data-am: install-GamesDATA install-schemaDATA install-data-local \
+ 		install-soundlistDATA install-themeDATA \
+ 		install-velenaDATA
+ install-data: install-data-am
+@@ -351,7 +351,7 @@
+ maintainer-clean: maintainer-clean-am
+ 
+ .PHONY: uninstall-GamesDATA install-GamesDATA uninstall-schemaDATA \
+-install-schemaDATA uninstall-soundlistDATA install-soundlistDATA \
++install-schemaDATA install-data-local uninstall-soundlistDATA install-soundlistDATA \
+ uninstall-themeDATA install-themeDATA uninstall-velenaDATA \
+ install-velenaDATA tags distdir info-am info dvi-am dvi check check-am \
+ installcheck-am installcheck install-exec-am install-exec \
+@@ -363,6 +363,9 @@
+ @INTLTOOL_DESKTOP_RULE@
+ @INTLTOOL_SCHEMAS_RULE@
+ @INTLTOOL_SOUNDLIST_RULE@
++
++install-data-local:
++	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(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.
diff --git a/games/gnome-games/files/patch-gnect_src_prefs.c b/games/gnome-games/files/patch-gnect_src_prefs.c
new file mode 100644
index 000000000000..2737e28846a7
--- /dev/null
+++ b/games/gnome-games/files/patch-gnect_src_prefs.c
@@ -0,0 +1,51 @@
+--- gnect/src/prefs.c.orig	Sun May 25 14:21:05 2003
++++ gnect/src/prefs.c	Sun May 25 14:21:15 2003
+@@ -264,40 +264,6 @@
+ 
+ 
+ 
+-static void 
+-sanity_check(void)
+-{
+-  gchar *tileset;
+-  GError *error = NULL;
+-  
+-  tileset = gconf_client_get_string (gnect_gconf_client,
+-                                     "/apps/gnect/theme", &error);
+-  if (error) {
+-    GtkWidget *dialog;
+-    dialog = gtk_message_dialog_new (NULL,
+-                                     0,
+-                                     GTK_MESSAGE_ERROR,
+-                                     GTK_BUTTONS_CLOSE,
+-                                     _("There was an error accessing GConf: %s"),
+-                                     error->message);
+-    gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+-    gtk_dialog_run(GTK_DIALOG(dialog));
+-    exit(1);
+-  } else if (!tileset) {
+-    GtkWidget *dialog;
+-    dialog = gtk_message_dialog_new (NULL,
+-                                     0,
+-                                     GTK_MESSAGE_ERROR,
+-                                     GTK_BUTTONS_CLOSE,
+-                                     _("The default configuration values could not be retrieved correctly. Please check your GConf configuration, specifically that the schemas are installed correctly"));
+-    gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+-    gtk_dialog_run(GTK_DIALOG(dialog));
+-    exit(1);
+-  } else {
+-    g_free (tileset);
+-  }
+-}
+-
+ void
+ prefs_init (gint argc, gchar **argv)
+ {
+@@ -313,7 +279,6 @@
+ 
+         gconf_init (argc, argv, NULL);
+         gnect_gconf_client = gconf_client_get_default ();
+-        sanity_check();
+         gconf_client_add_dir (gnect_gconf_client, "/apps/gnect",
+                               GCONF_CLIENT_PRELOAD_NONE, NULL);
+ 
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 8a9b5ff0b027..57453f73eddb 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -16,11 +16,10 @@ bin/iagno
 bin/mahjongg
 bin/same-gnome
 bin/sol
-etc/gconf/gconf.xml.defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/freecell/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/freecell/option/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/freecell/score/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnect/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnometris/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnometris/options/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomine/%gconf.xml
@@ -29,12 +28,11 @@ etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/freecell/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gataxx/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnect/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/%gconf.xml
@@ -802,6 +800,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnect
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gataxx
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option
@@ -814,6 +813,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris/options
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnect
 @dirrm etc/gconf/gconf.xml.defaults/apps/freecell/score
 @dirrm etc/gconf/gconf.xml.defaults/apps/freecell/option
 @dirrm etc/gconf/gconf.xml.defaults/apps/freecell