2 files changed, 27 insertions, 36 deletions

diff --git a/games/gcompris2/files/patch-ac b/games/gcompris2/files/patch-ac
index 3a2a9986299b..8e75eb26b92c 100644
--- a/games/gcompris2/files/patch-ac
+++ b/games/gcompris2/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Tue Apr 17 11:15:52 2001
-+++ Makefile.in	Tue Apr 17 11:35:09 2001
-@@ -173,9 +173,9 @@
+--- Makefile.in.orig	Mon May 28 13:18:45 2001
++++ Makefile.in	Mon May 28 13:33:59 2001
+@@ -183,9 +183,9 @@
  		rm -f $(srcdir)/stamp-h.in; \
  		$(MAKE) $(srcdir)/stamp-h.in; \
  	else :; fi
@@ -16,30 +16,29 @@ $FreeBSD$
  
  mostlyclean-hdr:
  
-@@ -456,22 +456,22 @@
+@@ -417,7 +417,7 @@
+ install-exec-am:
+ install-exec: install-exec-recursive
+ 
+-install-data-am: install-GamesDATA install-MenuDATA install-iconDATA \
++install-data-am: install-GamesDATA install-iconDATA \
+ 		install-data-local
+ install-data: install-data-recursive
+ 
+@@ -488,14 +488,14 @@
  	@$(NORMAL_INSTALL)
- 	if test -d pixmaps; then \
- 	  $(mkinstalldirs) $(pixmapdir); \
--	  cd pixmaps ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd $(pixmapdir) ; tar xf -) ; cd .. ; \
-+	  cd pixmaps ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd $(pixmapdir) ; tar xf -) ; cd .. ; \
- 	fi
- 	if test -d data; then \
- 	  $(mkinstalldirs) $(leveldatadir); \
--	  cd data ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd $(leveldatadir) ; tar xf -) ; cd .. ; \
-+	  cd data ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd $(leveldatadir) ; tar xf -) ; cd .. ; \
+ 	if test -d @PACKAGE_DATA_DIR@; then \
+ 	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
+-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
  	fi
  
  dist-hook:
  	cp gcompris.spec $(distdir)
- 	if test -d pixmaps; then \
- 	  $(mkinstalldirs) $(distdir)/pixmaps; \
--	  cd pixmaps ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/pixmaps ; tar xf -) ; cd .. ; \
-+	  cd pixmaps ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/pixmaps ; tar xf -) ; cd .. ; \
- 	fi
- 	if test -d data; then \
- 	  $(mkinstalldirs) $(distdir)/data; \
--	  cd data ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/data ; tar xf -) ; cd .. ; \
-+	  cd data ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/data ; tar xf -) ; cd .. ; \
+ 	if test -d @PACKAGE_DATA_DIR@; then \
+ 	  $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
+-	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
  	fi
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/games/gcompris2/files/patch-configure b/games/gcompris2/files/patch-configure
index 60de4a21276d..4dc527f10096 100644
--- a/games/gcompris2/files/patch-configure
+++ b/games/gcompris2/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Apr 17 11:15:52 2001
-+++ configure	Tue Apr 17 11:16:39 2001
-@@ -4463,21 +4463,21 @@
+--- configure.orig	Mon May 28 13:15:07 2001
++++ configure	Mon May 28 13:17:17 2001
+@@ -5147,14 +5147,14 @@
  PACKAGE_SOUNDS_DIR="sounds"
  
  cat >> confdefs.h <<EOF
@@ -12,19 +12,11 @@ $FreeBSD$
  EOF
  
  
- PACKAGE_DATA_DIR="data"
+ PACKAGE_DATA_DIR="boards"
  
  cat >> confdefs.h <<EOF
--#define PACKAGE_DATA_DIR "${myprefix}/${DATADIRNAME}/${PACKAGE}/data"
-+#define PACKAGE_DATA_DIR "${myprefix}/${DATADIRNAME}/gnome/${PACKAGE}/data"
- EOF
- 
- 
- PACKAGE_PIXMAPS_DIR="pixmaps"
- 
- cat >> confdefs.h <<EOF
--#define PACKAGE_PIXMAPS_DIR "${myprefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-+#define PACKAGE_PIXMAPS_DIR "${myprefix}/${DATADIRNAME}/gnome/${PACKAGE}/pixmaps"
+-#define PACKAGE_DATA_DIR "${myprefix}/${DATADIRNAME}/${PACKAGE}/boards"
++#define PACKAGE_DATA_DIR "${myprefix}/${DATADIRNAME}/gnome/${PACKAGE}/boards"
  EOF