Author: pfg
Date: Sat Sep 5 03:44:08 2015
New Revision: 1701344
URL: http://svn.apache.org/r1701344
Log:
FreeBSD-10 fixes
Some old configuration scripts confuse FreeBSD-10 with FreeBSD-1.0. On
regular FreeBSD port builds these had no visible effect since it's logical
to use up-to-date external dependencies but, in the case of the buildbot,
these were likely to be the culprits behind breakage.
Huge thanks for the reporter for working these out!
Submitted by: Don Lewis
Modified:
openoffice/trunk/main/curl/curl-7.19.7.patch
openoffice/trunk/main/libtextcat/libtextcat-2.2.patch
openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.autotools
openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.autotools
openoffice/trunk/main/redland/redland/redland-1.0.8.patch.autotools
Modified: openoffice/trunk/main/curl/curl-7.19.7.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/curl/curl-7.19.7.patch?rev=1701344&r1=1701343&r2=1701344&view=diff
==============================================================================
--- openoffice/trunk/main/curl/curl-7.19.7.patch (original)
+++ openoffice/trunk/main/curl/curl-7.19.7.patch Sat Sep 5 03:44:08 2015
@@ -1,5 +1,5 @@
--- misc/curl-7.19.7/configure 2009-11-04 13:26:02.000000000 +0100
-+++ misc/build/curl-7.19.7/configure 2009-11-18 14:17:25.453125000 +0100
++++ misc/build/curl-7.19.7/configure 2015-09-04 11:58:00.331210000 +0100
@@ -2735,8 +2735,8 @@
ac_ext=c
@@ -42,6 +42,51 @@
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept
ISO C89" >&5
+@@ -11276,7 +11276,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -11292,7 +11292,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -12151,7 +12151,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -12162,7 +12162,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -12180,7 +12180,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
--- misc/curl-7.19.7/lib/setup.h 2009-10-28 21:21:58.000000000 +0100
+++ misc/build/curl-7.19.7/lib/setup.h 2009-11-18 13:30:42.375000000 +0100
@@ -193,6 +193,7 @@
Modified: openoffice/trunk/main/libtextcat/libtextcat-2.2.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libtextcat/libtextcat-2.2.patch?rev=1701344&r1=1701343&r2=1701344&view=diff
==============================================================================
--- openoffice/trunk/main/libtextcat/libtextcat-2.2.patch (original)
+++ openoffice/trunk/main/libtextcat/libtextcat-2.2.patch Sat Sep 5 03:44:08
2015
@@ -1,5 +1,5 @@
--- misc/libtextcat-2.2/configure Thu May 22 13:39:55 2003
-+++ misc/build/libtextcat-2.2/configure Mon Mar 31 11:29:14 2008
++++ misc/build/libtextcat-2.2/configure Fri Sep 4 16:42:33 2015
@@ -3451,7 +3451,7 @@
;;
@@ -28,7 +28,31 @@
# We need to add '_' to the symbols in $export_symbols first
#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
hardcode_direct=yes
-@@ -6280,7 +6281,7 @@
+@@ -5793,7 +5794,7 @@
+ whole_archive_flag_spec='-all_load $convenience'
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -5809,7 +5810,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -6275,12 +6276,12 @@
+ shlibpath_var=DYLD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
;;
freebsd*)
@@ -37,7 +61,16 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -6365,7 +6365,7 @@
+@@ -6295,7 +6296,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ *)
+@@ -6364,7 +6365,7 @@
;;
# This must be Linux ELF.
Modified: openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.autotools
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.autotools?rev=1701344&r1=1701343&r2=1701344&view=diff
==============================================================================
--- openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.autotools
(original)
+++ openoffice/trunk/main/redland/raptor/raptor-1.4.18.patch.autotools Sat Sep
5 03:44:08 2015
@@ -1,5 +1,5 @@
--- misc/raptor-1.4.18/configure Sun Jun 15 10:25:55 2008
-+++ misc/build/raptor-1.4.18/configure Wed Feb 18 13:23:12 2009
++++ misc/build/raptor-1.4.18/configure Fri Sep 4 12:57:26 2015
@@ -4321,7 +4321,7 @@
cygwin*)
@@ -18,6 +18,177 @@
lt_cv_file_magic_cmd='func_win32_libid'
else
lt_cv_deplibs_check_method='file_magic file format
pei*-i386(.*architecture: i386)?'
+@@ -7930,7 +7930,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -7946,7 +7946,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -8579,7 +8579,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -8590,7 +8590,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -8608,7 +8608,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -11018,7 +11018,7 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[12].*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+@@ -12557,7 +12557,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -12568,7 +12568,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -12586,7 +12586,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -14594,7 +14594,7 @@
+ hardcode_shlibpath_var_F77=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_F77=no
+ ;;
+
+@@ -14610,7 +14610,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags'
+ hardcode_direct_F77=yes
+ hardcode_minus_L_F77=yes
+@@ -15191,7 +15191,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -15202,7 +15202,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -15220,7 +15220,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -17228,7 +17228,7 @@
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_GCJ=no
+ ;;
+
+@@ -17244,7 +17244,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags'
+ hardcode_direct_GCJ=yes
+ hardcode_minus_L_GCJ=yes
+@@ -17825,7 +17825,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -17836,7 +17836,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -17854,7 +17854,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
--- misc/raptor-1.4.18/ltmain.sh 2008-02-02 22:28:24.000000000 +0900
+++ misc/build/raptor-1.4.18/ltmain.sh 2008-07-08 11:58:42.000000000 +0900
@@ -3262,9 +3262,9 @@
Modified: openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.autotools
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.autotools?rev=1701344&r1=1701343&r2=1701344&view=diff
==============================================================================
--- openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.autotools
(original)
+++ openoffice/trunk/main/redland/rasqal/rasqal-0.9.16.patch.autotools Sat Sep
5 03:44:08 2015
@@ -1,3 +1,176 @@
+--- misc/rasqal-0.9.16/configure Mon Jun 30 08:14:04 2008
++++ misc/build/rasqal-0.9.16/configure Fri Sep 4 12:56:46 2015
+@@ -8003,7 +8003,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -8019,7 +8019,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -8652,7 +8652,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -8663,7 +8663,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -8681,7 +8681,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -11091,7 +11091,7 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[12].*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+@@ -12630,7 +12630,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -12641,7 +12641,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -12659,7 +12659,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -14667,7 +14667,7 @@
+ hardcode_shlibpath_var_F77=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_F77=no
+ ;;
+
+@@ -14683,7 +14683,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags'
+ hardcode_direct_F77=yes
+ hardcode_minus_L_F77=yes
+@@ -15264,7 +15264,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -15275,7 +15275,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -15293,7 +15293,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -17301,7 +17301,7 @@
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_GCJ=no
+ ;;
+
+@@ -17317,7 +17317,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags'
+ hardcode_direct_GCJ=yes
+ hardcode_minus_L_GCJ=yes
+@@ -17898,7 +17898,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -17909,7 +17909,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -17927,7 +17927,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
--- misc/rasqal-0.9.16/ltmain.sh Tue Apr 29 23:33:55 2008
+++ misc/build/rasqal-0.9.16/ltmain.sh Wed Feb 18 13:25:00 2009
@@ -1565,6 +1565,11 @@
Modified: openoffice/trunk/main/redland/redland/redland-1.0.8.patch.autotools
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/redland/redland/redland-1.0.8.patch.autotools?rev=1701344&r1=1701343&r2=1701344&view=diff
==============================================================================
--- openoffice/trunk/main/redland/redland/redland-1.0.8.patch.autotools
(original)
+++ openoffice/trunk/main/redland/redland/redland-1.0.8.patch.autotools Sat Sep
5 03:44:08 2015
@@ -1,5 +1,5 @@
--- misc/redland-1.0.8/configure Fri Jul 4 18:00:39 2008
-+++ misc/build/redland-1.0.8/configure Wed Feb 18 13:27:43 2009
++++ misc/build/redland-1.0.8/configure Fri Sep 4 12:55:52 2015
@@ -4671,7 +4671,7 @@
cygwin*)
@@ -18,6 +18,177 @@
lt_cv_file_magic_cmd='func_win32_libid'
else
lt_cv_deplibs_check_method='file_magic file format
pei*-i386(.*architecture: i386)?'
+@@ -8279,7 +8279,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -8295,7 +8295,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -8928,7 +8928,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -8939,7 +8939,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -8957,7 +8957,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -11367,7 +11367,7 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[12].*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+@@ -12906,7 +12906,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -12917,7 +12917,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -12935,7 +12935,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -14943,7 +14943,7 @@
+ hardcode_shlibpath_var_F77=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_F77=no
+ ;;
+
+@@ -14959,7 +14959,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags'
+ hardcode_direct_F77=yes
+ hardcode_minus_L_F77=yes
+@@ -15540,7 +15540,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -15551,7 +15551,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -15569,7 +15569,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -17577,7 +17577,7 @@
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_GCJ=no
+ ;;
+
+@@ -17593,7 +17593,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags'
+ hardcode_direct_GCJ=yes
+ hardcode_minus_L_GCJ=yes
+@@ -18174,7 +18174,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -18185,7 +18185,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -18203,7 +18203,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
--- misc/redland-1.0.8/ltmain.sh Tue Apr 29 23:33:55 2008
+++ misc/build/redland-1.0.8/ltmain.sh Wed Feb 18 13:28:39 2009
@@ -1565,6 +1565,11 @@
