Index: head/databases/firebird-devel/pkg-install
===================================================================
--- head/databases/firebird-devel/pkg-install	(revision 134811)
+++ head/databases/firebird-devel/pkg-install	(nonexistent)
@@ -1,145 +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 $PKG_PREFIX/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)
-chown -R firebird:firebird $PKG_PREFIX/firebird
-chmod -R o= $PKG_PREFIX/firebird
-
-# Now fix up the mess.
-
-# fix up directories
-for i in `find $PKG_PREFIX/firebird -print`
-do
-	FileName=$i
-	if [ -d $FileName ]; then
-		chmod u=rwx,go=rx $FileName
-	fi
-done
-
-# make lib ldconfig-compatible
-chown -R root:wheel $PKG_PREFIX/firebird/lib
-
-# make the following read-only
-chmod -R a=r $PKG_PREFIX/firebird/WhatsNew
-for i in `find $PKG_PREFIX/firebird/doc -type f -print`
-do
-	chmod a=r $i
-done
-#chmod -R a=r $PKG_PREFIX/firebird/examples/*
-chmod -R a=r $PKG_PREFIX/firebird/include/*
-chmod -R a=r $PKG_PREFIX/firebird/intl/*
-#chmod -R a=r $PKG_PREFIX/firebird/misc/*
-
-chmod -R ug=rx,o= $PKG_PREFIX/firebird/UDF/*
-chmod -R ug=rx,o= $PKG_PREFIX/firebird/intl/fbintl
-chmod -R a=rx $PKG_PREFIX/firebird/lib/*
-
-#cd $PKG_PREFIX/firebird/lib
-#ln -sf libfbembed.so libgds.so
-#ln -sf libfbembed.so.2 libgds.so.2
-
-cd $PKG_PREFIX/firebird/bin
-for i in `ls`
-do
-	chmod ug=rx,o= $i
-done
-
-chmod a=rx isql qli
-
-# SUID is needed for running server programs.
-for i in fb_lock_mgr gds_drop fb_inet_server
-do
-	if [ -f $i ]; then
-		chmod ug=rx,o= $i
-		chmod ug+s $i
-	fi
-done
-
-
-cd $PKG_PREFIX/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
-chmod ug=rw,o= firebird.log
-chmod a=r firebird.msg README
-chown root:wheel *.sample
-chmod ug=r,o= *.sample
-
-# make databases writable by firebird only
-# local database connections are not a good idea
-#chmod ug=rw,o= examples/*.fdb
-chmod ug=rw,o= help/*.fdb
-chmod ug=rw,o= security2.fdb
-
-chmod 444 aliases.conf firebird.conf
-chmod 660 security2.fdb
-
-# 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
-  chmod a=rx $PKG_PREFIX/etc/rc.d/000.firebird.sh
-fi
-;;
-
-esac

Property changes on: head/databases/firebird-devel/pkg-install
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.8
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/databases/firebird-devel/Makefile
===================================================================
--- head/databases/firebird-devel/Makefile	(revision 134811)
+++ head/databases/firebird-devel/Makefile	(revision 134812)
@@ -1,72 +1,76 @@
 # New ports collection makefile for:	Firebird-devel
 # Date created:		03 December 2001
 # Whom:			Chris Knight <chris@e-easy.com.au>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	firebird
-PORTVERSION=	2.0.a1
+PORTVERSION=	2.0.a2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.ramenzoni.com.br/~garga/firebird/ \
 		http://www.galle.com.br/~renato/firebird/ \
 		http://www.brainsoft.com.br/~garga/firebird/
 MASTER_SITE_SUBDIR=	firebird
 PKGNAMESUFFIX=	-devel
-DISTNAME=	firebird2-20050327
+DISTNAME=	firebird2-20050505
 
 MAINTAINER=	freebsd@galle.com.br
 COMMENT=	The open-source InterBase(tm) 6.0 spin-off (Classic version)
 
 USE_BZIP2=		yes
 USE_GMAKE=		yes
 WANT_LIBTOOL_VER=	15
 WANT_AUTOCONF_VER=	259
 GNU_CONFIGURE=		yes
 USE_GCC=		3.4
+USE_REINPLACE=		yes
 
 CONFLICTS=	firebird-1.*
 
 WRKSRC=		${WRKDIR}/firebird2
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib
-SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message pkg-install
 
 ONLY_FOR_ARCHS=	i386
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
 BROKEN=	"Does not build on FreeBSD-4.x"
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "NOTE: If the work directory is on an NFS mount, you will"
 	@${ECHO_MSG} "require NFS client locking support for the build to"
 	@${ECHO_MSG} "succeed. Currently this is only available on FreeBSD 5.0"
 	@${ECHO_MSG} "or greater."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "WARNING: The on-disk structure of the databases has"
 	@${ECHO_MSG} "changed since version 1.0.x."
 	@${ECHO_MSG} "Cancel this installation now and backup your databases"
 	@${ECHO_MSG} "if you have not already done so."
 .if !defined(BATCH)
 	@sleep 10
 .endif
+
+post-patch:
+	@${REINPLACE_CMD} 's,InstallPrefix/etc,${LOCALBASE}/etc,g' \
+		${WRKSRC}/builds/install/arch-specific/freebsd/install.sh.in
 
 do-configure:
 	@(cd ${WRKSRC} && ${ENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE}	\
 	${AUTOTOOLS_VARS} ./autogen.sh --prefix=${PREFIX}/firebird	\
 	--with-lock-manager --with-editline)
 
 do-build:
 	@(								\
 	cd ${WRKSRC};							\
 	${ENV} CC=${CC} CXX=${CXX} ${GMAKE} all;			\
 	)
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/databases/firebird-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property
Index: head/databases/firebird-devel/distinfo
===================================================================
--- head/databases/firebird-devel/distinfo	(revision 134811)
+++ head/databases/firebird-devel/distinfo	(revision 134812)
@@ -1,2 +1,2 @@
-MD5 (firebird2-20050327.tar.bz2) = 93996c74033f0efa180527e69f45196a
-SIZE (firebird2-20050327.tar.bz2) = 4321529
+MD5 (firebird2-20050505.tar.bz2) = 26a666ffb3a0499e6bd8e1a87ebc4ad5
+SIZE (firebird2-20050505.tar.bz2) = 4341875

Property changes on: head/databases/firebird-devel/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/databases/firebird-devel/files/pkg-install.in
===================================================================
--- head/databases/firebird-devel/files/pkg-install.in	(nonexistent)
+++ head/databases/firebird-devel/files/pkg-install.in	(revision 134812)
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# $FreeBSD: /tmp/pcvs/ports/databases/firebird-devel/files/Attic/pkg-install.in,v 1.1 2005-05-07 21:41:51 jylefort Exp $
+
+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 $PKG_PREFIX/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)
+chown -R firebird:firebird $PKG_PREFIX/firebird
+chmod -R o= $PKG_PREFIX/firebird
+
+# Now fix up the mess.
+
+# fix up directories
+for i in `find $PKG_PREFIX/firebird -print`
+do
+	FileName=$i
+	if [ -d $FileName ]; then
+		chmod u=rwx,go=rx $FileName
+	fi
+done
+
+# make lib ldconfig-compatible
+chown -R root:wheel $PKG_PREFIX/firebird/lib
+
+# make the following read-only
+chmod -R a=r $PKG_PREFIX/firebird/WhatsNew
+for i in `find $PKG_PREFIX/firebird/doc -type f -print`
+do
+	chmod a=r $i
+done
+#chmod -R a=r $PKG_PREFIX/firebird/examples/*
+chmod -R a=r $PKG_PREFIX/firebird/include/*
+chmod -R a=r $PKG_PREFIX/firebird/intl/*
+#chmod -R a=r $PKG_PREFIX/firebird/misc/*
+
+chmod -R ug=rx,o= $PKG_PREFIX/firebird/UDF/*
+chmod -R ug=rx,o= $PKG_PREFIX/firebird/intl/fbintl
+chmod -R a=rx $PKG_PREFIX/firebird/lib/*
+
+#cd $PKG_PREFIX/firebird/lib
+#ln -sf libfbembed.so libgds.so
+#ln -sf libfbembed.so.2 libgds.so.2
+
+cd $PKG_PREFIX/firebird/bin
+for i in `ls`
+do
+	chmod ug=rx,o= $i
+done
+
+chmod a=rx isql qli
+
+# SUID is needed for running server programs.
+for i in fb_lock_mgr gds_drop fb_inet_server
+do
+	if [ -f $i ]; then
+		chmod ug=rx,o= $i
+		chmod ug+s $i
+	fi
+done
+
+
+cd $PKG_PREFIX/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
+chmod ug=rw,o= firebird.log
+chmod a=r firebird.msg README
+chown root:wheel *.sample
+chmod ug=r,o= *.sample
+
+# make databases writable by firebird only
+# local database connections are not a good idea
+#chmod ug=rw,o= examples/*.fdb
+chmod ug=rw,o= help/*.fdb
+chmod ug=rw,o= security2.fdb
+
+chmod 444 aliases.conf firebird.conf
+chmod 660 security2.fdb
+
+# 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"
+	) > %%LOCALBASE%%/etc/rc.d/000.firebird.sh
+  chmod a=rx %%LOCALBASE%%/etc/rc.d/000.firebird.sh
+fi
+;;
+
+esac

Property changes on: head/databases/firebird-devel/files/pkg-install.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property