head	1.18;
access;
symbols
	RELEASE_5_3_0:1.17
	RELEASE_4_10_0:1.14
	RELEASE_5_2_1:1.14
	RELEASE_5_2_0:1.14
	RELEASE_4_9_0:1.14
	RELEASE_5_1_0:1.14
	RELEASE_4_8_0:1.12
	RELEASE_5_0_0:1.10
	old_RELEASE_4_7_0:1.9
	old_RELEASE_4_6_2:1.9
	old_RELEASE_4_6_1:1.9
	old_RELEASE_4_6_0:1.9
	old_RELEASE_5_0_DP1:1.7
	old_RELEASE_4_5_0:1.5
	old_RELEASE_4_4_0:1.1;
locks; strict;
comment	@# @;


1.18
date	2004.10.24.19.31.27;	author marcus;	state dead;
branches;
next	1.17;

1.17
date	2004.08.10.06.15.47;	author marcus;	state Exp;
branches;
next	1.16;

1.16
date	2004.07.03.21.07.27;	author marcus;	state Exp;
branches;
next	1.15;

1.15
date	2004.06.01.12.16.39;	author pav;	state Exp;
branches;
next	1.14;

1.14
date	2003.04.20.03.34.37;	author marcus;	state Exp;
branches;
next	1.13;

1.13
date	2003.04.08.03.12.17;	author marcus;	state Exp;
branches;
next	1.12;

1.12
date	2003.02.17.00.15.55;	author marcus;	state Exp;
branches;
next	1.11;

1.11
date	2003.01.21.20.47.55;	author marcus;	state Exp;
branches;
next	1.10;

1.10
date	2002.11.17.22.15.47;	author marcus;	state Exp;
branches;
next	1.9;

1.9
date	2002.04.26.06.20.31;	author sobomax;	state Exp;
branches;
next	1.8;

1.8
date	2002.04.25.18.37.03;	author sobomax;	state Exp;
branches;
next	1.7;

1.7
date	2002.03.13.10.01.32;	author sobomax;	state Exp;
branches;
next	1.6;

1.6
date	2002.02.06.16.30.36;	author sobomax;	state Exp;
branches;
next	1.5;

1.5
date	2001.11.19.13.41.39;	author sobomax;	state Exp;
branches;
next	1.4;

1.4
date	2001.11.13.12.28.37;	author sobomax;	state Exp;
branches;
next	1.3;

1.3
date	2001.09.24.10.29.09;	author sobomax;	state Exp;
branches;
next	1.2;

1.2
date	2001.09.18.08.12.37;	author sobomax;	state Exp;
branches;
next	1.1;

1.1
date	2001.07.05.07.33.46;	author sobomax;	state Exp;
branches;
next	;


desc
@@


1.18
log
@Update to 1.3.18.  See http://galeon.sourceforge.net/Main/GaleonRelease1318
for a list of what's changed.
@
text
@--- configure.orig	Mon Aug  9 23:57:15 2004
+++ configure	Mon Aug  9 23:57:15 2004
@@@@ -22744,11 +22744,11 @@@@
 echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5
 echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6
 
-if test $MOZILLA_VERSION == "trunk"; then
+if test $MOZILLA_VERSION = "trunk"; then
 	MOZILLA_VERSION=99.0 # use a high number
 fi
 
-version=$(echo $MOZILLA_VERSION | sed -e 's/\([0-9]\+\|[a-z]\+\)/\1 /g' -e 's/\.//g')
+version=$(echo $MOZILLA_VERSION | sed -E -e 's/([0-9]+|[a-z]+)/\1 /g' -e 's/\.//g')
 
 set -- $version;
 
@


1.17
log
@Update to 1.3.17.
@
text
@@


1.16
log
@Update to 1.3.16.  The list of changes can be found at
http://galeon.sourceforge.net/news/index.php#83.
@
text
@d1 3
a3 34
--- configure.orig	Sat Jul  3 16:37:01 2004
+++ configure	Sat Jul  3 16:40:21 2004
@@@@ -1705,30 +1705,7 @@@@
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
   mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
 
 for ac_prog in gawk mawk nawk awk
 do
@@@@ -22732,11 +22709,11 @@@@
@


1.15
log
@- Patch out mkdir -p check from configure script, it returns wrong result
  on post 5.2.1 -CURRENT. This is bandaid for now, I'll look for proper
  solution.

Reported by:	arved
@
text
@d1 3
a3 3
--- configure.orig	Tue Jun  1 13:57:51 2004
+++ configure	Tue Jun  1 13:58:33 2004
@@@@ -1706,30 +1706,7 @@@@
d34 3
a36 1
@@@@ -19101,6 +19078,7 @@@@
d38 9
a46 3
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
a47 2
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@


1.14
log
@Update to 1.3.4.
@
text
@d1 34
a34 3
--- configure.orig	Sun Mar  9 08:30:25 2003
+++ configure	Mon Apr  7 21:57:40 2003
@@@@ -7838,6 +7838,7 @@@@
@


1.13
log
@Bump the MOZILLA_SNAPSHOT version to fix the build with mozilla-1.3

Reported by:	Mike Harding <mvh@@ix.netcom.com>
@
text
@a10 11
@@@@ -10305,8 +10306,8 @@@@
  1.3a) MOZILLA_SNAPSHOT=4 ;;
  1.3b) MOZILLA_SNAPSHOT=5 ;;
   1.3) MOZILLA_SNAPSHOT=6 ;;
- 1.4a) MOZILLA_SNAPSHOT=6 ;;
-trunk) MOZILLA_SNAPSHOT=6 ;;
+ 1.4a) MOZILLA_SNAPSHOT=7 ;;
+trunk) MOZILLA_SNAPSHOT=7 ;;
     *) { { echo "$as_me:$LINENO: error:
 *****************************************************************************
 Galeon can be built using mozilla 1.3a, 1.3b or trunk snapshot, but the version
@


1.12
log
@Update to 1.3.2.  Note, galeon2 now requires mozilla-devel-gtk2.  You
can no longer build with mozilla-gtk2.
@
text
@d1 3
a3 3
--- configure.orig	Tue Jan 21 15:44:16 2003
+++ configure	Tue Jan 21 15:45:28 2003
@@@@ -14219,6 +14219,7 @@@@
d11 11
@


1.11
log
@Fix build on -CURRENT by making sure -Werror is really disabled.

Reported by:	Martin Klaffenboeck <martin.klaffenboeck@@gmx.at>
Adapted from:	Galeon CVS
@
text
@a10 13
@@@@ -18588,7 +18589,11 @@@@
 # Check whether --enable-werror or --disable-werror was given.
 if test "${enable_werror+set}" = set; then
   enableval="$enable_werror"
-  disable_werror=no
+  if test "x$enable_werror" != "xno"; then                                
+    disable_werror=no
+  else
+    disable_werror=yes
+  fi
 else
   disable_werror=yes
 fi;
@


1.10
log
@Add galeon2 after a repo copy from galeon.  Galeon 2 is the GNOME 2
version of the Gecko-based web browser.  Note, this is a development version,
and problems are likely to occur.
@
text
@d1 3
a3 3
--- configure	Thu Nov  7 02:51:25 2002
+++ configure2	Thu Nov  7 02:51:32 2002
@@@@ -7140,6 +7140,7 @@@@
d11 13
@


1.9
log
@Move misplaced hunk where it belongs (from patch-configure to patch-hairy).
@
text
@d1 3
a3 6

$FreeBSD: ports/www/galeon/files/patch-configure,v 1.8 2002/04/25 18:37:03 sobomax Exp $

--- configure.orig	Thu Apr 25 21:02:26 2002
+++ configure	Thu Apr 25 21:03:14 2002
@@@@ -5434,6 +5434,7 @@@@
d10 1
a10 1
 LIBTOOL='$(SHELL) $(top_builddir)/libtool' 
@


1.8
log
@USE_LIBTOOL strikes back: use the new and improved way for dealing with
configure scripts created using autoconf 2.13 or later, which allows
to replace many patch-ltmain.sh out there with USE_LIBTOOL and one
additional line in configure script.
@
text
@d2 1
a2 1
$FreeBSD$
d13 1
a13 10
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@@@ -7078,7 +7079,7 @@@@
 #define ENABLE_NAUTILUS_VIEW 1
 EOF
 
-  _gnome_modules="$_gnome_modules bonobox nautilus"
+  _gnome_modules="$_gnome_modules bonobox"
 fi
 echo "$ac_t""$enable_nautilus_view" 1>&6
 
@


1.7
log
@Update to 1.2.0.
@
text
@d4 3
a6 4
--- configure.orig	Wed Mar 13 10:57:19 2002
+++ configure	Wed Mar 13 10:58:12 2002
@@@@ -9966,7 +9966,7 @@@@
 fi
d8 3
d12 5
a16 16
-	     CATOBJEXT=.gmo
+	     CATOBJEXT=.mo
 	   fi
 	
 else
@@@@ -10088,7 +10088,7 @@@@
         
 	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
-        CATOBJEXT=.gmo
+        CATOBJEXT=.mo
 	INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
 	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
@@@@ -10173,7 +10173,7 @@@@
     fi
d18 4
a21 5
                 for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
+      GMOFILES="$GMOFILES $lang.mo"
       POFILES="$POFILES $lang.po"
     done
a22 15
@@@@ -10502,10 +10502,10 @@@@
 s%@@INSTALL_DATA@@%$INSTALL_DATA%g
 s%@@PACKAGE@@%$PACKAGE%g
 s%@@VERSION@@%$VERSION%g
-s%@@ACLOCAL@@%$ACLOCAL%g
-s%@@AUTOCONF@@%$AUTOCONF%g
-s%@@AUTOMAKE@@%$AUTOMAKE%g
-s%@@AUTOHEADER@@%$AUTOHEADER%g
+s%@@ACLOCAL@@%/usr/bin/true%g
+s%@@AUTOCONF@@%/usr/bin/true%g
+s%@@AUTOMAKE@@%/usr/bin/true%g
+s%@@AUTOHEADER@@%/usr/bin/true%g
 s%@@MAKEINFO@@%$MAKEINFO%g
 s%@@SET_MAKE@@%$SET_MAKE%g
 s%@@host@@%$host%g
@


1.6
log
@Update to 1.0.3.

PR:		34653
Submitted by:	Joe Marcus Clarke <marcus@@marcuscom.com>
@
text
@d4 3
a6 4
--- configure.orig	Wed Feb  6 17:45:43 2002
+++ configure	Wed Feb  6 17:46:27 2002
@@@@ -13087,7 +13087,7 @@@@
 echo "${ECHO_T}no" >&6
d9 1
d13 4
a16 4
 
 fi
@@@@ -13213,7 +13213,7 @@@@
 
d24 1
a24 1
@@@@ -13306,7 +13306,7 @@@@
d33 15
a47 15
@@@@ -14083,10 +14083,10 @@@@
 s,@@INSTALL_DATA@@,$INSTALL_DATA,;t t
 s,@@PACKAGE@@,$PACKAGE,;t t
 s,@@VERSION@@,$VERSION,;t t
-s,@@ACLOCAL@@,$ACLOCAL,;t t
-s,@@AUTOCONF@@,$AUTOCONF,;t t
-s,@@AUTOMAKE@@,$AUTOMAKE,;t t
-s,@@AUTOHEADER@@,$AUTOHEADER,;t t
+s,@@ACLOCAL@@,/usr/bin/true,;t t
+s,@@AUTOCONF@@,/usr/bin/true,;t t
+s,@@AUTOMAKE@@,/usr/bin/true,;t t
+s,@@AUTOHEADER@@,/usr/bin/true,;t t
 s,@@MAKEINFO@@,$MAKEINFO,;t t
 s,@@SET_MAKE@@,$SET_MAKE,;t t
 s,@@build@@,$build,;t t
@


1.5
log
@Update to 0.12.8.
@
text
@d4 4
a7 3
--- configure.orig	Mon Nov 19 14:20:52 2001
+++ configure	Mon Nov 19 14:21:50 2001
@@@@ -6182,7 +6182,7 @@@@
a9 1
 
d13 4
a16 4
 	
 else
@@@@ -6304,7 +6304,7 @@@@
         
d24 1
a24 1
@@@@ -6389,7 +6389,7 @@@@
d33 15
a47 15
@@@@ -6755,10 +6755,10 @@@@
 s%@@INSTALL_DATA@@%$INSTALL_DATA%g
 s%@@PACKAGE@@%$PACKAGE%g
 s%@@VERSION@@%$VERSION%g
-s%@@ACLOCAL@@%$ACLOCAL%g
-s%@@AUTOCONF@@%$AUTOCONF%g
-s%@@AUTOMAKE@@%$AUTOMAKE%g
-s%@@AUTOHEADER@@%$AUTOHEADER%g
+s%@@ACLOCAL@@%/usr/bin/true%g
+s%@@AUTOCONF@@%/usr/bin/true%g
+s%@@AUTOMAKE@@%/usr/bin/true%g
+s%@@AUTOHEADER@@%/usr/bin/true%g
 s%@@MAKEINFO@@%$MAKEINFO%g
 s%@@SET_MAKE@@%$SET_MAKE%g
 s%@@host@@%$host%g
@


1.4
log
@Update to 0.12.7.
@
text
@d4 3
a6 4
--- configure.orig	Tue Nov 13 14:04:39 2001
+++ configure	Tue Nov 13 14:13:44 2001
@@@@ -12031,7 +12031,7 @@@@
 echo "${ECHO_T}no" >&6
d9 1
d13 4
a16 4
 
 fi
@@@@ -12155,7 +12155,7 @@@@
 
d24 1
a24 1
@@@@ -12245,7 +12245,7 @@@@
d33 15
a47 15
@@@@ -12862,10 +12862,10 @@@@
 s,@@INSTALL_DATA@@,$INSTALL_DATA,;t t
 s,@@PACKAGE@@,$PACKAGE,;t t
 s,@@VERSION@@,$VERSION,;t t
-s,@@ACLOCAL@@,$ACLOCAL,;t t
-s,@@AUTOCONF@@,$AUTOCONF,;t t
-s,@@AUTOMAKE@@,$AUTOMAKE,;t t
-s,@@AUTOHEADER@@,$AUTOHEADER,;t t
+s,@@ACLOCAL@@,/usr/bin/true,;t t
+s,@@AUTOCONF@@,/usr/bin/true,;t t
+s,@@AUTOMAKE@@,/usr/bin/true,;t t
+s,@@AUTOHEADER@@,/usr/bin/true,;t t
 s,@@MAKEINFO@@,$MAKEINFO,;t t
 s,@@SET_MAKE@@,$SET_MAKE,;t t
 s,@@build@@,$build,;t t
@


1.3
log
@Update to 0.12.2.
@
text
@d4 44
a47 17
--- configure.orig	Mon Sep 24 12:03:11 2001
+++ configure	Mon Sep 24 12:05:46 2001
@@@@ -6862,10 +6862,10 @@@@
 s%@@INSTALL_DATA@@%$INSTALL_DATA%g
 s%@@PACKAGE@@%$PACKAGE%g
 s%@@VERSION@@%$VERSION%g
-s%@@ACLOCAL@@%$ACLOCAL%g
-s%@@AUTOCONF@@%$AUTOCONF%g
-s%@@AUTOMAKE@@%$AUTOMAKE%g
-s%@@AUTOHEADER@@%$AUTOHEADER%g
+s%@@ACLOCAL@@%/usr/bin/true%g
+s%@@AUTOCONF@@%/usr/bin/true%g
+s%@@AUTOMAKE@@%/usr/bin/true%g
+s%@@AUTOHEADER@@%/usr/bin/true%g
 s%@@MAKEINFO@@%$MAKEINFO%g
 s%@@SET_MAKE@@%$SET_MAKE%g
 s%@@host@@%$host%g
@


1.2
log
@Update to 0.12.1.
@
text
@d4 17
a20 17
--- configure.orig	Mon Sep 17 19:13:48 2001
+++ configure	Mon Sep 17 19:14:42 2001
@@@@ -13060,10 +13060,10 @@@@
 s,@@INSTALL_DATA@@,$INSTALL_DATA,;t t
 s,@@PACKAGE@@,$PACKAGE,;t t
 s,@@VERSION@@,$VERSION,;t t
-s,@@ACLOCAL@@,$ACLOCAL,;t t
-s,@@AUTOCONF@@,$AUTOCONF,;t t
-s,@@AUTOMAKE@@,$AUTOMAKE,;t t
-s,@@AUTOHEADER@@,$AUTOHEADER,;t t
+s,@@ACLOCAL@@,/usr/bin/true,;t t
+s,@@AUTOCONF@@,/usr/bin/true,;t t
+s,@@AUTOMAKE@@,/usr/bin/true,;t t
+s,@@AUTOHEADER@@,/usr/bin/true,;t t
 s,@@MAKEINFO@@,$MAKEINFO,;t t
 s,@@SET_MAKE@@,$SET_MAKE,;t t
 s,@@build@@,$build,;t t
@


1.1
log
@Update to 0.11.1.
@
text
@d4 17
a20 17
--- configure	2001/07/04 17:52:53	1.1
+++ configure	2001/07/04 17:53:44
@@@@ -6043,10 +6043,10 @@@@
 s%@@INSTALL_DATA@@%$INSTALL_DATA%g
 s%@@PACKAGE@@%$PACKAGE%g
 s%@@VERSION@@%$VERSION%g
-s%@@ACLOCAL@@%$ACLOCAL%g
-s%@@AUTOCONF@@%$AUTOCONF%g
-s%@@AUTOMAKE@@%$AUTOMAKE%g
-s%@@AUTOHEADER@@%$AUTOHEADER%g
+s%@@ACLOCAL@@%/usr/bin/true%g
+s%@@AUTOCONF@@%/usr/bin/true%g
+s%@@AUTOMAKE@@%/usr/bin/true%g
+s%@@AUTOHEADER@@%/usr/bin/true%g
 s%@@MAKEINFO@@%$MAKEINFO%g
 s%@@SET_MAKE@@%$SET_MAKE%g
 s%@@XML_I18N_MERGE_OAF_RULE@@%$XML_I18N_MERGE_OAF_RULE%g
@

