Update to 1.0.3.

5 files changed, 45 insertions, 55 deletions

diff --git a/games/gcompris/files/patch-ac b/games/gcompris/files/patch-ac
index f7129bd61e53..dbecd07d983b 100644
--- a/games/gcompris/files/patch-ac
+++ b/games/gcompris/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Wed Dec 19 12:49:19 2001
-+++ Makefile.in	Wed Dec 19 13:21:48 2001
-@@ -192,9 +192,9 @@
+--- Makefile.in.orig	Thu Apr 18 14:49:06 2002
++++ Makefile.in	Thu Apr 18 14:51:49 2002
+@@ -212,9 +212,9 @@
  		rm -f $(srcdir)/stamp-h.in; \
  		$(MAKE) $(srcdir)/stamp-h.in; \
  	else :; fi
@@ -16,7 +16,7 @@ $FreeBSD$
  
  mostlyclean-hdr:
  
-@@ -426,7 +426,7 @@
+@@ -446,7 +446,7 @@
  install-exec-am:
  install-exec: install-exec-recursive
  
@@ -25,24 +25,19 @@ $FreeBSD$
  		install-data-local
  install-data: install-data-recursive
  
-@@ -498,16 +498,16 @@
+@@ -519,13 +519,13 @@
  	@$(NORMAL_INSTALL)
  	if test -d @PACKAGE_DATA_DIR@; then \
  	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
--	  find @PACKAGE_DATA_DIR@ -name \*~ -or -name \*.in  -printf \"%f\n\" >/tmp/GCOMPRIS_LIST.txt ; \
--	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
-+	  find @PACKAGE_DATA_DIR@ -name \*~ -or -name \*.in >/tmp/GCOMPRIS_LIST.txt ; \
-+	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
- 	  rm -f /tmp/GCOMPRIS_LIST.txt ; \
+-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
  	fi
  
  dist-hook:
  	if test -d @PACKAGE_DATA_DIR@; then \
  	  $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
--	  find @PACKAGE_DATA_DIR@ -name \*~  -printf \"%f\n\" >/tmp/GCOMPRIS_LIST.txt ; \
--	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
-+	  find @PACKAGE_DATA_DIR@ -name \*~ >/tmp/GCOMPRIS_LIST.txt ; \
-+	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics --exclude-from  /tmp/GCOMPRIS_LIST.txt -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
- 	  rm -f /tmp/GCOMPRIS_LIST.txt ; \
+-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
  	fi
  
+ clean-local:
diff --git a/games/gcompris/files/patch-configure b/games/gcompris/files/patch-configure
index 891546c18b3b..db31635c6e87 100644
--- a/games/gcompris/files/patch-configure
+++ b/games/gcompris/files/patch-configure
@@ -1,17 +1,27 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Oct 25 16:02:31 2001
-+++ configure	Thu Oct 25 16:03:10 2001
-@@ -6711,6 +6711,7 @@
-   
- 		
- 		GNOME_XML_LIB=`$GNOME_CONFIG --libs xml2`
-+		CPPFLAGS="$CPPFLAGS `$GNOME_CONFIG --cflags xml2`"
- 	
- else
-   echo "$ac_t""no" 1>&6
-@@ -8315,7 +8316,7 @@
+--- configure.orig	Thu Apr 18 14:54:09 2002
++++ configure	Thu Apr 18 14:56:30 2002
+@@ -7272,7 +7272,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <xmlversion.h>
++#include <libxml/xmlversion.h>
+ 
+ int 
+ main()
+@@ -7383,7 +7383,7 @@
+ #line 7384 "configure"
+ #include "confdefs.h"
+ 
+-#include <xmlversion.h>
++#include <libxml/xmlversion.h>
+ #include <stdio.h>
+ 
+ int main() {
+@@ -8915,7 +8915,7 @@
  fi
  
  
@@ -20,7 +30,7 @@ $FreeBSD$
  	   fi
  	
  else
-@@ -8611,14 +8612,14 @@
+@@ -9211,14 +9211,14 @@
  PACKAGE_SOUNDS_DIR="sounds"
  
  cat >> confdefs.h <<EOF
diff --git a/games/gcompris/files/patch-src::boards::Makefile.in b/games/gcompris/files/patch-src::boards::Makefile.in
deleted file mode 100644
index 5718d029b493..000000000000
--- a/games/gcompris/files/patch-src::boards::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/boards/Makefile.in	2001/12/23 08:00:35	1.1
-+++ src/boards/Makefile.in	2001/12/23 08:01:15
-@@ -133,7 +133,7 @@
- 
- 
- libdir = $(plugindir)
--INCLUDES = -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -I..
-+INCLUDES = $(GDK_PIXBUF_CFLAGS) -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -I..
- 
- libmenu_la_LDFLAGS = -module -avoid-version
- libmenu_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIB@
diff --git a/games/gcompris/files/patch-src::gcompris::Makefile.in b/games/gcompris/files/patch-src::gcompris::Makefile.in
deleted file mode 100644
index f33d171eb367..000000000000
--- a/games/gcompris/files/patch-src::gcompris::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/gcompris/Makefile.in	2001/12/19 10:53:08	1.1
-+++ src/gcompris/Makefile.in	2001/12/19 10:53:29
-@@ -130,7 +130,7 @@
- cxxflags_set = @cxxflags_set@
- plugindir = @plugindir@
- 
--INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)
-+INCLUDES =  	$(GDK_PIXBUF_CFLAGS)	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR)
- 
- 
- bin_PROGRAMS = gcompris
diff --git a/games/gcompris/files/patch-src::gcompris::soundutil.c b/games/gcompris/files/patch-src::gcompris::soundutil.c
new file mode 100644
index 000000000000..048ea2cc243e
--- /dev/null
+++ b/games/gcompris/files/patch-src::gcompris::soundutil.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/gcompris/soundutil.c	2002/03/20 10:35:57	1.1
++++ src/gcompris/soundutil.c	2002/03/20 10:36:14
+@@ -19,6 +19,7 @@
+  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <signal.h>
+ #include "gcompris.h"
+ 
+ static GList *pending_queue = NULL;