From dfafd86d7d32d32cf2b76f5c0a7181a3be0b80c2 Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Thu, 30 May 2002 22:27:36 +0000
Subject: Update to 1.0.5.

---
 games/gcompris/files/patch-configure          | 43 +++++++++++++--------------
 games/gcompris/files/patch-ltmain.sh          | 28 -----------------
 games/gcompris/files/patch-po::Makefile.in.in | 22 +++++++-------
 3 files changed, 32 insertions(+), 61 deletions(-)
 delete mode 100644 games/gcompris/files/patch-ltmain.sh

(limited to 'games/gcompris/files')

diff --git a/games/gcompris/files/patch-configure b/games/gcompris/files/patch-configure
index db31635c6e87..6bd6f5eadef7 100644
--- a/games/gcompris/files/patch-configure
+++ b/games/gcompris/files/patch-configure
@@ -1,19 +1,18 @@
 
 $FreeBSD$
 
---- 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"
+--- configure	2002/05/30 12:46:09	1.1
++++ configure	2002/05/30 12:46:56
+@@ -5891,6 +5891,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7312,7 +7313,7 @@
+ #line 7313 "configure"
  #include "confdefs.h"
  
 -#include <xmlversion.h>
@@ -21,16 +20,16 @@ $FreeBSD$
  #include <stdio.h>
  
  int main() {
-@@ -8915,7 +8915,7 @@
- fi
- 
- 
--	     CATOBJEXT=.gmo
-+	     CATOBJEXT=.mo
- 	   fi
- 	
+@@ -9203,7 +9204,7 @@
+ EOF
+ if { (eval echo configure:9205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+-  CATOBJEXT=.gmo
++  CATOBJEXT=.mo
+ 	         DATADIRNAME=share
  else
-@@ -9211,14 +9211,14 @@
+   echo "configure: failed program was:" >&5
+@@ -9376,14 +9377,14 @@
  PACKAGE_SOUNDS_DIR="sounds"
  
  cat >> confdefs.h <<EOF
diff --git a/games/gcompris/files/patch-ltmain.sh b/games/gcompris/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/games/gcompris/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/games/gcompris/files/patch-po::Makefile.in.in b/games/gcompris/files/patch-po::Makefile.in.in
index c62cc934e068..82088f06b4b0 100644
--- a/games/gcompris/files/patch-po::Makefile.in.in
+++ b/games/gcompris/files/patch-po::Makefile.in.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- po/Makefile.in.in	2001/10/25 12:58:36	1.1
-+++ po/Makefile.in.in	2001/10/25 12:59:13
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
+--- po/Makefile.in.in	2002/05/30 13:59:02	1.1
++++ po/Makefile.in.in	2002/05/30 13:59:32
+@@ -12,7 +12,7 @@
+ # - Modified by jacob berkman <jacob@ximian.com> to install
+ #   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+ 
+-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GETTEXT_PACKAGE = gcompris
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
-- 
cgit v1.2.3