- Update to 2.0.7

- Move files/pkg-install.in to pkg-install
- Add new warning message when it is building as root
- Remove obsolete patch files

3 files changed, 34 insertions, 82 deletions

diff --git a/databases/firebird20-server/files/patch-autogen.sh b/databases/firebird20-server/files/patch-autogen.sh
new file mode 100644
index 000000000000..cb01dd11e01d
--- /dev/null
+++ b/databases/firebird20-server/files/patch-autogen.sh
@@ -0,0 +1,34 @@
+--- autogen.sh	2013-03-23 22:16:00.000000000 -0500
++++ autogen.sh	2013-03-23 22:17:07.000000000 -0500
+@@ -19,10 +19,13 @@
+ AUTOMAKE=true
+ export AUTOMAKE
+ 
++ACLOCAL='aclocal -I .'
++export ACLOCAL
++
+ VER=`$AUTORECONF --version|grep '^[Aa]utoreconf'|sed 's/^[^0-9]*//'`
+ case "$VER" in
+  0* | 1\.* | 2\.[0-9] | 2\.[0-9][a-z]* | \
+- 2\.[1-4][0-9] | 2\.[1-4][0-9][a-z]* | 2\.5[0-5] | 2\.5[0-5][a-z]* )
++ 2\.[1-4][0-9] | 2\.5[0-5][a-z]* )
+   echo
+   echo "**Error**: You must have autoconf 2.56 or later installed."
+   echo "Download the appropriate package for your distribution/OS,"
+@@ -55,14 +58,14 @@
+ 
+ # Ensure correct utilities are called by AUTORECONF
+ autopath=`dirname $AUTORECONF`
+-if [ "x$autopath" != "x" ]; then
++if [ "$autopath" != "x" ]; then
+ 	PATH=$autopath:$PATH
+ 	export PATH
+ fi
+ 
+ # Generate configure from configure.in
+ echo "Running autoreconf ..."
+-$AUTORECONF --install --force --verbose || exit 1
++$AUTORECONF --install --force --verbose -I ./m4 || exit 1
+ 
+ # Hack to bypass bug in autoreconf - --install switch not passed to libtoolize,
+ # therefore missing config.sub and confg.guess files
diff --git a/databases/firebird20-server/files/patch-libtool22 b/databases/firebird20-server/files/patch-libtool22
deleted file mode 100644
index 47c94dafb599..000000000000
--- a/databases/firebird20-server/files/patch-libtool22
+++ /dev/null
@@ -1,11 +0,0 @@
---- autogen.sh.orig	2009-07-11 20:59:22.000000000 -0500
-+++ autogen.sh	2009-07-11 20:59:32.000000000 -0500
-@@ -73,7 +73,7 @@
-  rm -f aclocal.m4
-  cp $LIBTOOL_M4 aclocal.m4
- fi
--$LIBTOOLIZE --copy --force || exit 1
-+$LIBTOOLIZE --copy --force --install || exit 1
- 
- echo "Running autoheader ..."
- $AUTOHEADER || exit 1
diff --git a/databases/firebird20-server/files/pkg-install.in b/databases/firebird20-server/files/pkg-install.in
deleted file mode 100644
index c212863b1ca3..000000000000
--- a/databases/firebird20-server/files/pkg-install.in
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-PRE-INSTALL)
-
-if [ `id -u` -ne 0 ]; then
-	echo; echo "You must be root to run this step!"; echo; echo
-  exit 1
-fi
-
-nofbuid=0
-fbUID=`id -u firebird 2>/dev/null`
-if [ $? -ne 0 ]; then
-	fbUID=90
-	while [ ! -z `id -un $fbUID 2>/dev/null` ]
-	do
-		fbUID=$(($fbUID+1))
-	done
-	nofbuid=1
-fi
-
-fbGID=`pw groupshow firebird 2>/dev/null`
-if [ $? -ne 0 ]; then
-	fbGID=90
-	while [ ! -z `id -gn $fbGID 2>/dev/null` ]
-	do
-		fbGID=$(($fbGID+1))
-	done
-	echo "firebird:*:$fbGID:" >> /etc/group
-else
-	fbGID=`echo $fbGID | awk -F: '{print $3}'`
-fi
-
-echo "firebird user using uid $fbUID"
-echo "firebird user using gid $fbGID"
-
-if which -s pw; then
-	if [ $nofbuid -ne 0 ]; then
-		pw useradd firebird -u $fbUID -g $fbGID -h - -s /bin/sh \
-		-d /var/db/firebird -c "Firebird Database Administrator"
-	fi
-else
-	echo -n "unable to create user firebird - please create it manually,"
-	echo " before reinstalling this package."
-	exit 1
-fi
-;;
-
-POST-INSTALL)
-cd /var/db/firebird
-
-# Lock files
-
-for i in isc_init1 isc_lock1 isc_event1
-do
-	FileName=$i.`hostname`
-	touch $FileName
-	chmod uga=rw $FileName
-	chown firebird:firebird $FileName
-done
-
-touch firebird.log
-chown firebird:firebird firebird.log security2.fdb
-
-;;
-
-esac