- update to 8.3.1

feedback and ok kili@

games/gcompris/Makefile

@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2007/02/11 00:56:57 steven Exp $
+# $OpenBSD: Makefile,v 1.3 2007/05/03 17:42:55 ajacoutot Exp $
 
 COMMENT=	"educational game for children"
 
-DISTNAME=	gcompris-8.2.2
-PKGNAME=	${DISTNAME}p0
-SHARED_LIBS=	gcompris-1	0.0		# .0.0
+DISTNAME=	gcompris-8.3.1
 CATEGORIES=	games education
 
 HOMEPAGE=	http://gcompris.net/
@@ -19,12 +17,12 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gcompris/}
 
-WANTLIB=	ICE SM SDL X11 Xext Xrender Xxf86vm atk-1.0 c cairo smpeg z \
+WANTLIB=	Xau Xdmcp SDL X11 Xext Xrender atk-1.0 c cairo smpeg z \
 		fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 xml2 \
 		glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
 		gtk-x11-2.0 m mikmod ogg pango-1.0 pangocairo-1.0 util \
 		pangoft2-1.0 png pthread usbhid vorbis vorbisfile \
-		art_lgpl_2
+		art_lgpl_2 Xxf86vm expat Xcursor Xfixes Xi Xinerama Xrandr
 
 MODULES=	devel/gettext lang/python
 
@@ -36,7 +34,6 @@ LIB_DEPENDS=	python${MODPY_VERSION}::lang/python/${MODPY_VERSION} \
 		SDL_mixer.>=3::devel/sdl-mixer \
 		gnet-2.0::net/gnet \
 		sqlite3::databases/sqlite3 \
-		popt::devel/popt \
 		gnomecanvas-2::x11/gnome/libgnomecanvas
 RUN_DEPENDS=	::games/gnuchess \
 		::databases/py-sqlite2 \
@@ -49,9 +46,8 @@ USE_LIBTOOL=	Yes
 USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		LIBS="-pthread -lutil"
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--enable-static \
@@ -61,10 +57,11 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--enable-py-build-only \
 		--disable-cairo \
 		--disable-rpath \
-		--with-x
+		--with-x \
+		--with-python=${MODPY_BIN}
 
 pre-configure:
-	perl -pi -e 's,\@INTLTOOL_MERGE\@,${LOCALBASE}/bin/intltool-merge,g;' \
+	@perl -pi -e 's,\@INTLTOOL_MERGE\@,${LOCALBASE}/bin/intltool-merge,g;' \
 		-e 's,\@INTLTOOL_UPDATE\@,${LOCALBASE}/bin/intltool-update,g;' \
 		-e 's,\@INTLTOOL_EXTRACT\@,${LOCALBASE}/bin/intltool-extract,g' \
 		${WRKSRC}/Makefile.in ${WRKSRC}/po/Makefile.in.in

games/gcompris/distinfo

@@ -1,5 +1,5 @@
-MD5 (gcompris-8.2.2.tar.gz) = KX1lB+2aTGVY+LzmtvgUBg==
-RMD160 (gcompris-8.2.2.tar.gz) = W68T/nLdeBDj2hYOpMyqN5EtwJI=
-SHA1 (gcompris-8.2.2.tar.gz) = Js8zJiMRwpLfWTGh0V/kwGcJ17g=
-SHA256 (gcompris-8.2.2.tar.gz) = TV5vyZPvC+dTeCwPwLNSd+g2nSXbgxCNsxNDe1XOpE0=
-SIZE (gcompris-8.2.2.tar.gz) = 79037459
+MD5 (gcompris-8.3.1.tar.gz) = miuOPqkxU7ngdpTdANOvsQ==
+RMD160 (gcompris-8.3.1.tar.gz) = doFVNWBhMUuShuPRNMQNzybfCIM=
+SHA1 (gcompris-8.3.1.tar.gz) = +b6mNG+4bDkiz0ACvDLoIj7a7F4=
+SHA256 (gcompris-8.3.1.tar.gz) = 1XoU4sN6CrVjGxFqdUUgfXk0/I+eTZv5UTvnksRibIE=
+SIZE (gcompris-8.3.1.tar.gz) = 96861160

games/gcompris/patches/patch-Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/01/26 17:40:57 ajacoutot Exp $
---- Makefile.in.orig	Sat Nov 18 14:37:19 2006
-+++ Makefile.in	Wed Jan 17 15:06:05 2007
-@@ -789,7 +789,7 @@ info: info-recursive
+$OpenBSD: patch-Makefile_in,v 1.2 2007/05/03 17:42:55 ajacoutot Exp $
+--- Makefile.in.orig	Sun Apr 29 17:35:22 2007
++++ Makefile.in	Mon Apr 30 20:00:14 2007
+@@ -867,7 +867,7 @@ info: info-recursive
  
  info-am:
  
@@ -10,12 +10,12 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/01/26 17:40:57 ajacoutot Exp $
  	install-data-local install-iconDATA
  
  install-exec-am:
-@@ -849,7 +849,7 @@ install-data-local:
+@@ -927,7 +927,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 CVS --exclude .xvpics --exclude "1[1-9].ogg"  --exclude "2?.ogg" * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
-+	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar -cf - -s '/^.*Makefile.*$$//' -s '/^.*\.in.*$$//' -s '/^.*~.*$$//' -s '/^.*CVS.*$$//' -s '/^.*\.xvpics.*$$//' -s '/^.*1[1-9]\.ogg.*$$//' -s '/^.*2.\.ogg.*$$//' * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
+-	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn --exclude .xvpics --exclude "1[1-9].ogg"  --exclude "2?.ogg" * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
++	  cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar -cf - -s '/^.*Makefile.*$$//' -s '/^.*\.in.*$$//' -s '/^.*~.*$$//' -s '/^.*svn.*$$//' -s '/^.*\.xvpics.*$$//' -s '/^.*1[1-9]\.ogg.*$$//' -s '/^.*2.\.ogg.*$$//' * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \
  	fi
  
  dist-hook:

games/gcompris/patches/patch-configure

@@ -0,0 +1,57 @@
+$OpenBSD: patch-configure,v 1.1 2007/05/03 17:42:55 ajacoutot Exp $
+--- configure.orig	Sun Apr 29 16:22:57 2007
++++ configure	Tue May  1 10:21:39 2007
+@@ -23439,13 +23439,13 @@ _ACEOF
+ 
+ 		if test "x$enable_binreloc_threads" = "xyes"; then
+ 
+-{ echo "$as_me:$LINENO: checking for pthread_getspecific in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_getspecific in -lpthread... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_getspecific in -pthread" >&5
++echo $ECHO_N "checking for pthread_getspecific in -pthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_getspecific+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="-pthread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -23505,7 +23505,7 @@ if test $ac_cv_lib_pthread_pthread_getspecific = yes; 
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+ 
+-  LIBS="-lpthread $LIBS"
++  LIBS="-pthread $LIBS"
+ 
+ fi
+ 
+@@ -23530,7 +23530,7 @@ fi
+ echo "${ECHO_T}$br_cv_binreloc_threads" >&6; }
+ 
+ 		if test "x$br_cv_binreloc_threads" = "xyes"; then
+-			BINRELOC_LIBS="-lpthread"
++			BINRELOC_LIBS="-pthread"
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define BR_PTHREAD 1
+@@ -25847,9 +25847,6 @@ fi
+ 
+ 
+ XLIBADD=
+-if "x$x_libraries" != "x"; then
+-  XLIBADD=" -L$x_libraries "
+-fi
+ 
+ # Check whether --enable-xf86vidmode was given.
+ if test "${enable_xf86vidmode+set}" = set; then
+@@ -28201,7 +28198,7 @@ if test  "x$PYTHON_LIBS" = "x" ; then
+ 
+    python_libdir=`$PYTHON -c "import distutils.sysconfig ; print distutils.sysconfig.get_config_var(\"LIBDIR\")"`
+ 
+-   PYTHON_LIBS="-L${python_libdir} ${python_link}"
++   PYTHON_LIBS="-L${python_libdir} ${python_link} -lutil"
+ fi
+ 
+ 

games/gcompris/patches/patch-po_Makefile_in_in

@@ -1,11 +1,11 @@
-$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2007/01/26 17:40:57 ajacoutot Exp $
---- po/Makefile.in.in.orig	Fri Jul  7 14:01:54 2006
-+++ po/Makefile.in.in	Fri Jan 12 11:02:26 2007
-@@ -212,9 +212,6 @@ Makefile POTFILES: stamp-it
+$OpenBSD: patch-po_Makefile_in_in,v 1.2 2007/05/03 17:42:55 ajacoutot Exp $
+--- po/Makefile.in.in.orig	Mon Apr 30 19:34:26 2007
++++ po/Makefile.in.in	Mon Apr 30 19:34:54 2007
+@@ -209,9 +209,6 @@ Makefile POTFILES: stamp-it
  	fi
  
- stamp-it: Makefile.in.in ../config.status POTFILES.in
--	cd .. \
+ stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+-	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
 -	       $(SHELL) ./config.status
  

games/gcompris/patches/patch-src_boards_erase_c

@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_boards_erase_c,v 1.1 2007/05/03 17:42:55 ajacoutot Exp $
+--- src/boards/erase.c.orig	Thu May  3 17:03:28 2007
++++ src/boards/erase.c	Thu May  3 16:58:32 2007
+@@ -517,14 +517,6 @@ canvas_event(GnomeCanvas *canvas, GdkEvent *event)
+   switch (event->type)
+     {
+     case GDK_BUTTON_PRESS:
+-      if (board_mode == NORMAL) {
+-	int x = event->button.x;
+-	int y = event->button.y;
+-	int item_x = x / (BOARDWIDTH/number_of_item_x);
+-	int item_y = y / (BOARDHEIGHT/number_of_item_y);
+-	if (items_per_cell[item_x * number_of_item_x + item_y] == 0)
+-	  add_one_item(x, y, 1);
+-      }
+       break;
+     default:
+       break;

games/gcompris/patches/patch-src_gcompris_gcompris_c

@@ -1,39 +0,0 @@
-$OpenBSD: patch-src_gcompris_gcompris_c,v 1.1.1.1 2007/01/26 17:40:57 ajacoutot Exp $
---- src/gcompris/gcompris.c.orig	Sat Nov 11 00:12:10 2006
-+++ src/gcompris/gcompris.c	Fri Jan 19 14:46:00 2007
-@@ -1162,7 +1162,7 @@ const gchar *gc_locale_get()
- 
-   locale = g_getenv("LC_ALL");
-   if(locale == NULL)
--    locale = g_getenv("LC_MESSAGES");
-+    locale = g_getenv("LC_CTYPE");
-   if(locale == NULL)
-     locale = g_getenv("LANG");
- 
-@@ -1203,7 +1203,7 @@ gc_locale_set(gchar *locale)
-   setlocale(LC_MESSAGES, locale);
-   setlocale(LC_ALL, locale);
- #else
--  gc_locale = g_strdup(setlocale(LC_MESSAGES, locale));
-+  gc_locale = g_strdup(setlocale(LC_CTYPE, locale));
-   if (!gc_locale)
-     gc_locale = g_strdup(locale);
- #endif
-@@ -1217,7 +1217,7 @@ gc_locale_set(gchar *locale)
-   /* Override the env locale to what the user requested */
-   /* This makes gettext to give us the new locale text  */
-   gc_setenv ("LC_ALL", gc_locale_get());
--  gc_setenv ("LC_MESSAGES", gc_locale_get());
-+  gc_setenv ("LC_CTYPE", gc_locale_get());
-   gc_setenv ("LANGUAGE", gc_locale_get());
-   gc_setenv ("LANG", gc_locale_get());
- 
-@@ -1424,7 +1424,7 @@ gc_init (int argc, char *argv[])
-     gc_locale_set(properties->locale);
-   }
- #else
--  gc_user_default_locale = g_strdup(setlocale(LC_MESSAGES, NULL));
-+  gc_user_default_locale = g_strdup(setlocale(LC_CTYPE, NULL));
-   // Set the user's choice locale
-   gc_locale_set(properties->locale);
- #endif

games/gcompris/pkg/PFRAG.shared

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2007/01/26 17:40:57 ajacoutot Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2007/05/03 17:42:55 ajacoutot Exp $
 lib/gcompris/libadvanced_colors.so
 lib/gcompris/libalgebra.so
 lib/gcompris/libalgebra_guesscount.so
@@ -34,6 +34,7 @@ lib/gcompris/librailroad.so
 lib/gcompris/libread_colors.so
 lib/gcompris/libreading.so
 lib/gcompris/libreversecount.so
+lib/gcompris/libscale.so
 lib/gcompris/libshapegame.so
 lib/gcompris/libsmallnumbers.so
 lib/gcompris/libsubmarine.so
@@ -42,4 +43,3 @@ lib/gcompris/libtarget.so
 lib/gcompris/libtraffic.so
 lib/gcompris/libwordprocessor.so
 lib/gcompris/libwordsgame.so
-@lib lib/libgcompris-1.so.${LIBgcompris-1_VERSION}