- Update to 6.3 rc1

PR:		ports/72092
Submitted by:	Michael Johnson <ahze@ahze.net>

games/gcompris2/Makefile

@@ -6,26 +6,29 @@
 #
 
 PORTNAME=	gcompris2
-PORTVERSION=	5.2
-PORTREVISION=	1
+PORTVERSION=	6.3.r1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gcompris
-DISTNAME=	gcompris-${PORTVERSION}
+DISTNAME=	gcompris-${PORTVERSION:S/.r/RC/}
 
 MAINTAINER=	gnome@freebsd.org
 COMMENT=	A simple Gnome2-based education game for children starting at 3
 
-BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
+BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html \
+		gnuchess:${PORTSDIR}/games/gnuchess
 LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
 		ao.3:${PORTSDIR}/audio/libao \
 		assetml.0:${PORTSDIR}/devel/libassetml
+RUN_DEPENDS=	gnuchess:${PORTSDIR}/games/gnuchess
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_PYTHON=	yes
+USE_SDL=	mixer
 USE_GNOME=	gnomehack lthack gnomeprefix libgnomeui pygnome2
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="${PTHREAD_LIBS} -lm"

games/gcompris2/distinfo

@@ -1,2 +1,2 @@
-MD5 (gcompris-5.2.tar.gz) = 93145ecf6cc4629afa3c0ed959793ee1
-SIZE (gcompris-5.2.tar.gz) = 33275848
+MD5 (gcompris-6.3RC1.tar.gz) = 2dcaa171791ca5b604be3a97832d0d60
+SIZE (gcompris-6.3RC1.tar.gz) = 36082547

games/gcompris2/files/patch-src::boards::gletters.c

@@ -0,0 +1,18 @@
+--- src/boards/gletters.c.orig	Sat Sep 25 18:23:03 2004
++++ src/boards/gletters.c	Sat Sep 25 18:34:39 2004
+@@ -436,6 +436,7 @@
+   char c;
+   char lcStr[6],ucStr[6];
+   gchar *str;
++  gchar list_of_letters[255];
+   char utf8char[6], keyChar[6], mapChar[6];
+   int i;
+ 
+@@ -575,7 +576,6 @@
+     }
+   }
+ 
+-  gchar list_of_letters[255];
+   list_of_letters[0] = '\0';
+ 
+   /* We have to loop to concat the letters */

games/gcompris2/files/patch-src::gcompris::gameutil.c

@@ -1,15 +0,0 @@
---- src/gcompris/gameutil.c.orig	Sun Mar  7 17:36:56 2004
-+++ src/gcompris/gameutil.c	Sun Mar  7 17:37:28 2004
-@@ -121,9 +121,11 @@
-   filename = g_strdup_printf("%s/%s", PACKAGE_DATA_DIR, pixmapfile);
- 
-   if (!g_file_test ((filename), G_FILE_TEST_EXISTS)) {
-+    char *str;
-+
-     g_warning (_("Couldn't find file %s !"), filename);
- 
--    char *str = g_strdup_printf("%s\n%s\n%s\n%s", 
-+    str = g_strdup_printf("%s\n%s\n%s\n%s", 
- 				_("Couldn't find file"), 
- 				pixmapfile,
- 				_("This activity is incomplete."),

games/gcompris2/files/patch-src::gcompris::log.c

@@ -1,6 +1,6 @@
---- src/gcompris/log.c.orig	Sun Mar  7 17:36:34 2004
-+++ src/gcompris/log.c	Sun Mar  7 17:35:56 2004
-@@ -137,6 +137,7 @@
+--- src/gcompris/log.c.orig	Wed May 12 18:42:15 2004
++++ src/gcompris/log.c	Fri Sep 24 23:34:23 2004
+@@ -150,6 +150,7 @@
  void gcompris_log_end (GcomprisBoard *gcomprisBoard, gchar *status) {
    FILE *flog;
    gchar *file;
@@ -8,11 +8,14 @@
  
    /* Prepare our log */
  
-@@ -153,7 +154,6 @@
+@@ -162,9 +163,7 @@
+   time_t end_time = time(NULL);
+   double duration = difftime(end_time,start_time);
+ 
+-  struct tm *tp;
+-
+-  if(gcomprisBoard_set != gcomprisBoard)
++    if(gcomprisBoard_set != gcomprisBoard)
      return;
  
    /* and convert it to UTC or local time representation */
--  struct tm *tp;
-   if (USE_UTC)
-     tp = gmtime(&start_time);
-   else

games/gcompris2/files/patch-src::gcompris::soundutil.c

@@ -1,18 +0,0 @@
---- src/gcompris/soundutil.c.orig	Sun Dec  7 07:12:51 2003
-+++ src/gcompris/soundutil.c	Mon Feb  2 21:44:57 2004
-@@ -22,6 +22,7 @@
- #endif
- #include <dirent.h>
- 
-+#include <signal.h>
- #include "gcompris.h"
- #include <signal.h>
- #include <pthread.h>
-@@ -176,6 +177,7 @@
- 	{
- 	  int err;
- 
-+	  pthread_mutex_lock( &lock );
- 	  err = pthread_cond_wait (&cond, &lock);
- 	  if (err)
- 	    printf ("cond_wait  : %s\n", strerror (err));

games/gcompris2/pkg-descr

@@ -2,5 +2,5 @@ Gcompris is a full featured educational application that propose different
 activities to children from 3 to 10.  Now also avaliable for gnome2 (this 
 port) in many different languages.
 
-WWW: http://gcompris.sourceforge.net/
+WWW: http://www.ofset.org/gcompris/
 - Martin Klaffenboeck <martin.klaffenboeck@gmx.at>