Update to 9.2.

svn path=/head/; revision=251347

games/gcompris/Makefile

@@ -1,4 +1,3 @@
-
 # New ports collection makefile for:	gcompris2
 # Date created:				23 April 2003
 # Whom:					Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
@@ -7,10 +6,10 @@
 #
 
 PORTNAME=	gcompris
-DISTVERSION=	8.4.12
-PORTREVISION=	3
+PORTVERSION=	9.2
 CATEGORIES=	games gnome
 MASTER_SITES=	SF
+DISTNAME=	gcompris-9.2-2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome2 educational games and activities for kids ages 2 to 10
@@ -22,10 +21,12 @@ LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		ao.3:${PORTSDIR}/audio/libao \
 		assetml.0:${PORTSDIR}/devel/libassetml \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		gnet-2.0.0:${PORTSDIR}/net/gnet2
+		gnet-2.0.0:${PORTSDIR}/net/gnet2 \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	gnuchess:${PORTSDIR}/games/gnuchess \
 		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
@@ -33,8 +34,9 @@ USE_GSTREAMER=	yes
 USE_PYTHON=	yes
 USE_SDL=	mixer
 USE_DISPLAY=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui pygnome2
-CONFIGURE_ARGS=	--enable-gnet
+USE_GNOME=	gnomehack intlhack gnomeprefix gtk20 pygtk2 libxml2 librsvg2
+CONFIGURE_ARGS=	--enable-gnet \
+		--enable-dbus
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="${PTHREAD_LIBS} -lm"

games/gcompris/distinfo

@@ -1,3 +1,3 @@
-MD5 (gcompris-8.4.12.tar.gz) = 8a1519e71caa0924d5df73faa311eea3
-SHA256 (gcompris-8.4.12.tar.gz) = 55025808dcb4afb3fa9ea8e232684e651da3ac2c673cb36592d6583ebec2d4c7
-SIZE (gcompris-8.4.12.tar.gz) = 104355638
+MD5 (gcompris-9.2-2.tar.gz) = ccff63947b1beb010731b4288ad19fca
+SHA256 (gcompris-9.2-2.tar.gz) = 6390b56ad3f7394b81818ad2194c5e65bbd9626cb0c0d0e0838c15beb5c1bfc9
+SIZE (gcompris-9.2-2.tar.gz) = 123861044

games/gcompris/files/patch-ac

@@ -1,11 +0,0 @@
---- Makefile.in.orig	2009-03-20 23:34:56.000000000 -0400
-+++ Makefile.in	2009-03-20 23:34:56.000000000 -0400
-@@ -885,7 +885,7 @@ install-data-local:
- 	@$(NORMAL_INSTALL)
- 	if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \
- 	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR); \
--	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn --mode 644 * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf - ; find -type d -exec chmod 755 '{}' \;) ; cd .. ; \
-+	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf - ; find . -type d -exec chmod 755 '{}' \; ; find . -type f -exec chmod 644 '{}' \;) ; cd .. ; \
- 	fi
- 
- uninstall-local:

games/gcompris/files/patch-configure

@@ -1,15 +1,6 @@
---- configure.orig	2007-07-02 01:31:20.000000000 -0400
-+++ configure	2007-07-02 01:33:05.000000000 -0400
-@@ -25746,7 +25746,7 @@ else
- fi
- 
- found_xf86vidmode=no
--if test "x$USE_XF86VM" == "xyes" ; then
-+if test "x$USE_XF86VM" = "xyes" ; then
-   XF86VM_LIBS=
-   { echo "$as_me:$LINENO: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5
- echo $ECHO_N "checking for XF86VidModeQueryExtension in -lXxf86vm... $ECHO_C" >&6; }
-@@ -27439,7 +27439,7 @@ else
+--- configure.orig	2010-03-21 14:18:33.000000000 -0400
++++ configure	2010-03-21 14:18:33.000000000 -0400
+@@ -15286,7 +15286,7 @@ else
    USE_DEBUG="no"
  fi
  

games/gcompris/files/patch-src_gcompris_gameutil.c

@@ -0,0 +1,19 @@
+--- src/gcompris/gameutil.c.orig	2010-03-21 17:02:26.000000000 -0400
++++ src/gcompris/gameutil.c	2010-03-21 17:03:23.000000000 -0400
+@@ -568,6 +568,7 @@ gc_file_find_absolute(const gchar *forma
+   int			 i = 0;
+   gchar			*filename;
+   gchar			*absolute_filename;
++  gchar                         rpath[PATH_MAX];
+   gchar			*dir_to_search[4];
+   GcomprisProperties	*properties = gc_prop_get();
+ 
+@@ -654,7 +655,7 @@ gc_file_find_absolute(const gchar *forma
+ 
+  FOUND:
+   g_free(filename);
+-  char *abs_name = realpath(absolute_filename, NULL);
++  char *abs_name = g_strdup (realpath(absolute_filename, rpath));
+   g_free(absolute_filename);
+   return abs_name;
+ }

games/gcompris/files/patch-src_gcompris_gcompris.c

@@ -1,6 +1,6 @@
---- src/gcompris/gcompris.c.orig	2008-07-04 17:35:40.000000000 -0400
-+++ src/gcompris/gcompris.c	2008-08-15 02:05:47.000000000 -0400
-@@ -1127,11 +1127,11 @@ static void load_properties ()
+--- src/gcompris/gcompris.c.orig	2010-02-13 08:38:20.000000000 -0500
++++ src/gcompris/gcompris.c	2010-03-21 14:22:42.000000000 -0400
+@@ -1202,7 +1202,7 @@ static void load_properties ()
  #ifdef NSBUNDLE
    exec_prefix = gcompris_nsbundle_resource ();
  #else
@@ -9,8 +9,3 @@
  #endif
    g_warning("exec_prefix %s\n", (exec_prefix==NULL ? "NONE" : exec_prefix));
  
--  prefix_dir = gbr_find_prefix(NULL);
-+  prefix_dir = gbr_find_prefix("%%PREFIX%%");
- 
-   /* Check if we are in the source code (developper usage) */
-   tmpstr = g_strconcat(prefix_dir, "/gcompris/gcompris.c", NULL);