Minor updates from MAINTAINER.

PR:		32423
Submitted by:	chris@aims.com.au

7 files changed, 59 insertions, 15 deletions

diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index 84a159021b04..4e65f06dc7d7 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -20,6 +20,8 @@ MAINTAINER=	chris@aims.com.au
 WRKSRC=		${WRKDIR}/interbase
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
+MSG_FILE=	${PKGDIR}/pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 ONLY_FOR_ARCHS=	i386
 
@@ -28,14 +30,18 @@ ONLY_FOR_ARCHS=	i386
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@(								\
-	cd ${WRKDIR}; tar zxf ${DISTDIR}/interbase0.9-4src.tar.gz;	\
-	cd interbase; tar zxf ${DISTDIR}/firebird-boot-kit.tar.gz;	\
+	cd ${WRKDIR}; ${TAR} -xzf ${DISTDIR}/interbase0.9-4src.tar.gz;	\
+	cd interbase; ${TAR} -xzf ${DISTDIR}/firebird-boot-kit.tar.gz;	\
 	${CP} msgs/msg.gbak misc/msg.gbak				\
 	)
 
-.if ${OSVERSION} >= 500016
 post-patch:
-	${PERL} -pi -e 's,\-ldescrypt,\-lcrypt,g' ${WRKSRC}/builds/original/prefix.freebsd
+	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
+.if ${OSVERSION} >= 500016 || ${OSVERSION} >= 430001
+	@${PERL} -pi -e 's,\-ldescrypt,\-lcrypt,g' \
+		 ${WRKSRC}/builds/original/prefix.freebsd
+.else
+	@${PERL} -pi -e 's,^crypt_set_format.*,,' ${WRKSRC}/jrd/enc.c
 .endif
 
 do-configure:
@@ -49,6 +55,10 @@ do-configure:
 
 do-build:
 	@(								\
+	 ${ECHO} '#!/bin/sh'; ${ECHO}					\
+	'[ -d ${LDCONFIG_RUNLIST} ] && ${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \
+	) > ${WRKDIR}/000.${PORTNAME}.sh
+	@(								\
 	cd ${WRKDIR}/interbase;						\
 	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
 	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
@@ -62,11 +72,10 @@ do-install:
 	${RM} ${PREFIX}/firebird/install;				\
 	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
 	${LN} -fs gds.so ${PREFIX}/firebird/lib/libgds.so.1;		\
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/firebird/lib	\
-	${CHMOD} -R g-w ${PREFIX}/firebird/lib				\
 	cd ${PREFIX}/firebird/examples;					\
-	tar zxf ${DISTDIR}/interbase0.9-4-v5examples.tar.gz;		\
-	${CP} ${FILESDIR}/RELNOTES ${PREFIX}/firebird/			\
+	${TAR} -xzf ${DISTDIR}/interbase0.9-4-v5examples.tar.gz;	\
+	${CP} ${FILESDIR}/RELNOTES ${PREFIX}/firebird/;			\
+	${INSTALL_SCRIPT} ${WRKDIR}/000.${PORTNAME}.sh ${PREFIX}/etc/rc.d/ \
 	)
 
 .include <bsd.port.post.mk>
diff --git a/databases/firebird-server/files/RELNOTES b/databases/firebird-server/files/RELNOTES
index 3c4e0c62ae58..d2fd1d4fc88d 100644
--- a/databases/firebird-server/files/RELNOTES
+++ b/databases/firebird-server/files/RELNOTES
@@ -73,6 +73,7 @@ and InterBase can be found at the following:
 	http://sourceforge.net/projects/firebird/
 	http://www.ibphoenix.com/
 	http://www.interbase2000.org/
+	http://www.firebirdsql.org/
 
 Geoff Speicher
 <geoff@sea-incorporated.com>
diff --git a/databases/firebird-server/files/patch-ad b/databases/firebird-server/files/patch-ad
new file mode 100644
index 000000000000..7ce937566bc3
--- /dev/null
+++ b/databases/firebird-server/files/patch-ad
@@ -0,0 +1,13 @@
+--- jrd/enc.c.orig	Fri Aug  4 06:50:03 2000
++++ jrd/enc.c	Sun Nov 18 19:17:19 2001
+@@ -31,6 +31,10 @@
+  *
+  **************************************/
+
++#ifdef FREEBSD
++crypt_set_format("des");
++#endif
++
+ return CRYPT_FUNC( string, salt);
+ }
+ #endif
diff --git a/databases/firebird-server/pkg-descr b/databases/firebird-server/pkg-descr
index 5f05e046a387..b080060395eb 100644
--- a/databases/firebird-server/pkg-descr
+++ b/databases/firebird-server/pkg-descr
@@ -13,6 +13,7 @@ For more information on Firebird and InterBase, see:
 http://www.ibphoenix.com/
 http://www.interbase2000.org/
 http://www.interbase.com/
+http://www.firebirdsql.org/
 
 and of course the firebird page itself:
 WWW: http://sourceforge.net/projects/firebird/
diff --git a/databases/firebird-server/pkg-install b/databases/firebird-server/pkg-install
index 61c651df083e..c6b00320cd7e 100644
--- a/databases/firebird-server/pkg-install
+++ b/databases/firebird-server/pkg-install
@@ -73,10 +73,6 @@ EOF
 elif [ "$2" = "POST-INSTALL" ]; then
 chown -R firebird:firebird $PKG_PREFIX/firebird
 
-# make lib ldconfig-compatible
-chown -R root:wheel $PKG_PREFIX/firebird/lib
-chmod -R g-w $PKG_PREFIX/firebird/lib
-
 # Turn everybody to read only.
 chmod -R o=r $PKG_PREFIX/firebird
 
@@ -92,7 +88,13 @@ for i in `find $PKG_PREFIX/firebird -print`
      fi
   done
 
+# make lib ldconfig-compatible
+chown -R root:wheel $PKG_PREFIX/firebird/lib
+chmod -R g-w $PKG_PREFIX/firebird/lib
 
+# Fix UDF load problem
+cd $PKG_PREFIX/firebird/lib
+ln -sf ib_util.so libib_util.so
 
 cd $PKG_PREFIX/firebird/bin
 
@@ -143,7 +145,15 @@ EOF
 cat >>/etc/inetd.conf <<EOF
 gds_db	stream	tcp	nowait	firebird	/usr/interbase/bin/gds_inet_server  gds_inet_server
 EOF
-kill -HUP `cat /var/run/inetd.pid`
-kill -HUP `cat /var/run/inetd.pid`
+if [ -f /var/run/inetd.pid ]; then
+	kill -HUP `cat /var/run/inetd.pid`
+fi
+
+# shared lib startup script
+if [ -d $PKG_PREFIX/etc/rc.d ]; then
+	(
+	echo "#!/bin/sh"; echo "[ -d $PKG_PREFIX/firebird/lib ] && /sbin/ldconfig -m $PKG_PREFIX/firebird/lib"
+	) > $PKG_PREFIX/etc/rc.d/000.firebird.sh
+fi
 
 fi
diff --git a/databases/firebird-server/pkg-plist b/databases/firebird-server/pkg-plist
index 66150c5bde26..10f152fcbc82 100644
--- a/databases/firebird-server/pkg-plist
+++ b/databases/firebird-server/pkg-plist
@@ -1,3 +1,4 @@
+etc/rc.d/000.firebird.sh
 firebird/intl/gdsintl
 firebird/examples/v5/ib_udf.sql
 firebird/examples/v5/README
@@ -65,6 +66,7 @@ firebird/lib/libgds.so
 firebird/lib/libgds.so.1
 firebird/lib/libgds_pyxis.a
 firebird/lib/libgds.a
+firebird/lib/libib_util.so
 firebird/lib/gds_pyxis.a
 firebird/help/help.gbak
 firebird/help/help.gdb
diff --git a/databases/firebird-server/scripts/post-install b/databases/firebird-server/scripts/post-install
index e4d2d3a9cd07..c2515fde278c 100644
--- a/databases/firebird-server/scripts/post-install
+++ b/databases/firebird-server/scripts/post-install
@@ -17,7 +17,13 @@ for i in `find $PREFIX/firebird -print`
      fi
   done
 
+# make lib ldconfig-compatible
+chown -R root:wheel $PREFIX/firebird/lib
+chmod -R g-w $PREFIX/firebird/lib
 
+# Fix UDF load problem
+cd $PREFIX/firebird/lib
+ln -sf ib_util.so libib_util.so
 
 cd $PREFIX/firebird/bin
 
@@ -58,7 +64,9 @@ sh $SCRIPTDIR/rmservice
 
 # add the gds service and restart inetd
 sh $SCRIPTDIR/addservice
-kill -HUP `cat /var/run/inetd.pid`
+if [ -f /var/run/inetd.pid ]; then
+	kill -HUP `cat /var/run/inetd.pid`
+fi
 
 sed "s|%%PREFIX%%|$PREFIX|" $SCRIPTDIR/../pkg-message