From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 25 Feb 2011 14:18:23 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.2.5~1^2~6
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=ca8b3cda221cc811e704acf68cc04e17003d67e5;hp=e5bd284f943dac898f7f455680441e74a63622bd;p=metaproxy-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
---

diff --git a/buildconf.sh b/buildconf.sh
index fc07d69..8d12ad9 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -14,11 +14,11 @@ fi
 if [ "`uname -s`" = FreeBSD ]; then
     # FreeBSD intalls the various auto* tools with version numbers
     echo "Using special configuration for FreeBSD ..."
-    automake=automake19
-    aclocal="aclocal19 -I /usr/local/share/aclocal"
-    autoconf=autoconf259
-    libtoolize=libtoolize15
-    autoheader=autoheader259
+    automake=automake
+    aclocal="aclocal -I /usr/local/share/aclocal"
+    autoconf=autoconf
+    libtoolize=libtoolize
+    autoheader=autoheader
 fi
 
 if [ "`uname -s`" = Darwin ]; then
@@ -118,9 +118,9 @@ EOF
     fi
     if [ "`uname -s`" = FreeBSD ]; then
         cat <<EOF
-When building from a Git, you need these FreeBSD Ports:
-  autoconf259, automake19, libtool15, bison, tcl84,
-  docbook-xsl, libxml2, libxslt, g++-4.0, make
+  pkg_add -r autoconf262 automake110 libtool bison tcl84 \\
+             docbook-xsl libxml2 libxslt boost-all
+  pkg_add -r icu4
 EOF
     fi
 fi