Update to 9.6.1.

PR:		ports/159718
Submitted by:	Ruslan Mahmatkhanov <cvs-src@yandex.ru>

games/gcompris/Makefile

@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	gcompris
-PORTVERSION=	9.2
-PORTREVISION=	5
+PORTVERSION=	9.6.1
 CATEGORIES=	games gnome
-MASTER_SITES=	SF
-DISTNAME=	gcompris-9.2-2
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome2 educational games and activities for kids ages 2 to 10
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html \
 		gnuchess:${PORTSDIR}/games/gnuchess \
 		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20
@@ -25,9 +26,9 @@ LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		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
+		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20 \
+		gnucap:${PORTSDIR}/cad/gnucap
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
@@ -38,8 +39,8 @@ USE_DISPLAY=	yes
 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" \
+CPPFLAGS=	"-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="${PTHREAD_LIBS} -lm"
 
 MAN6=		gcompris.6
@@ -48,14 +49,12 @@ INFO=		gcompris
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g ; \
-	    	s|-Werror||g' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 	    	${WRKSRC}/src/gcompris/gcompris.c
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-DGTK_DISABLE_DEPRECATED||g' -e \
 		's|-DGNOME_DISABLE_DEPRECATED||g'
+	@${FIND} ${WRKSRC} -type f -name "*.bak" -delete
 
 .if !defined(DISPLAY)
 pre-configure:

games/gcompris/distinfo

@@ -1,2 +1,2 @@
-SHA256 (gcompris-9.2-2.tar.gz) = 6390b56ad3f7394b81818ad2194c5e65bbd9626cb0c0d0e0838c15beb5c1bfc9
-SIZE (gcompris-9.2-2.tar.gz) = 123861044
+SHA256 (gcompris-9.6.1.tar.gz) = ffc3c127ff628c57f6a113bb1c568541bf4fc2f1e4242315d8a3fa7a5111f4e9
+SIZE (gcompris-9.6.1.tar.gz) = 145196483

games/gcompris/files/patch-src_gcompris_gameutil.c

@@ -1,19 +0,0 @@
---- 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,11 +1,11 @@
---- 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
+--- src/gcompris/gcompris.c.orig	2011-02-22 23:55:08.000000000 +0300
++++ src/gcompris/gcompris.c	2011-08-12 10:54:59.000000000 +0400
+@@ -1295,7 +1295,7 @@
+       g_error_free (error);
+     }
+ 
 -  exec_prefix = gbr_find_exe_dir(NULL);
 +  exec_prefix = gbr_find_exe_dir("%%PREFIX%%");
- #endif
    g_warning("exec_prefix %s\n", (exec_prefix==NULL ? "NONE" : exec_prefix));
  
+   {