6 files changed, 68 insertions, 107 deletions

diff --git a/databases/firebird21-server/Makefile b/databases/firebird21-server/Makefile
index a60db54819ce..7644c3c5fed7 100644
--- a/databases/firebird21-server/Makefile
+++ b/databases/firebird21-server/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	firebird
-PORTVERSION=	2.1.4
-PORTREVISION?=	1
+PORTVERSION=	2.1.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-Release/
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.18393-0
+DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.18496-0
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
@@ -62,7 +62,7 @@ ALL_TARGET=	firebird_boot ref_databases msgs libfbembed intl otherfiles \
 		inet_server extlib embed_gfix embed_gbak embed_gdef embed_util \
 		embed_fbudf
 
-SUB_FILES=	pkg-install pkg-message aliases.conf
+SUB_FILES=	pkg-message aliases.conf
 
 UTIL_BIN=	fb_inet_server fb_lock_print fbstat gbak gdef gfix gsec nbackup
 UDF_SO=		ib_udf.so fbudf.so
@@ -111,8 +111,9 @@ CFLAGS+=	-DAMD64
 .endif
 
 .if !defined(CLIENT_ONLY)
-pre-su-install:
-	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+
+USERS=	${PORTNAME}
+GROUPS=	${USERS}
 
 post-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
@@ -122,8 +123,7 @@ post-install:
 .ifndef WITHOUT_IPC_CLEANUP
 pre-build:
 .ifndef PACKAGE_BUILDING
-	@if [ `${ID} -u` -eq 0 ]; then \
-	${ECHO_MSG} "==> Please do not build ${PORTNAME} as 'root' because this may cause conflicts with SysV semaphores of running services."; exit 1; fi
+	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 	${MAKE} -C ${WRKSRC}/extern/btyacc
 	[ -f ${WRKDIR}/ipcs.pre.build ] || ${IPCS_CMD} -s | ${TAIL} -n +3 | \
diff --git a/databases/firebird21-server/distinfo b/databases/firebird21-server/distinfo
index 54882befab6e..ee4b6add463a 100644
--- a/databases/firebird21-server/distinfo
+++ b/databases/firebird21-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firebird/Firebird-2.1.4.18393-0.tar.bz2) = 729b224d6d15115eea0e28dea5f92de80a33f175188e1ac36e771f2f6d12b3a3
-SIZE (firebird/Firebird-2.1.4.18393-0.tar.bz2) = 14016614
+SHA256 (firebird/Firebird-2.1.5.18496-0.tar.bz2) = 016c3730ae569e5f90247f77468e8daadeb4742ac3ce329e5c5883e8b58704b0
+SIZE (firebird/Firebird-2.1.5.18496-0.tar.bz2) = 14044088
diff --git a/databases/firebird21-server/files/patch-builds-posix_empty.vers b/databases/firebird21-server/files/patch-builds-posix_empty.vers
new file mode 100644
index 000000000000..204bd00acf21
--- /dev/null
+++ b/databases/firebird21-server/files/patch-builds-posix_empty.vers
@@ -0,0 +1,11 @@
+--- builds/posix/empty.vers	2013-03-23 02:37:17.000000000 -0500
++++ builds/posix/empty.vers	2013-03-23 02:37:33.000000000 -0500
+@@ -27,6 +27,8 @@
+ {
+ global:
+ 	main;
++	__progname;
++	environ;
+ 
+ local:
+ 	*;
diff --git a/databases/firebird21-server/files/patch-src-common-classes_alloc.h b/databases/firebird21-server/files/patch-src-common-classes_alloc.h
deleted file mode 100644
index 501c3b224aaa..000000000000
--- a/databases/firebird21-server/files/patch-src-common-classes_alloc.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/common/classes/alloc.h	2010-12-18 19:21:49.000000000 -0500
-+++ src/common/classes/alloc.h	2010-12-18 19:23:30.000000000 -0500
-@@ -47,6 +47,7 @@
- #include <stdlib.h> /* XPG: prototypes for malloc/free have to be in
- 					   stdlib.h (EKU) */
- #endif
-+#include <new>
- 
- #ifdef _MSC_VER
- #define THROW_BAD_ALLOC
-@@ -448,15 +449,6 @@
- 	);
- }
- 
--inline void* operator new(size_t, void* ptr) throw() 
--{
--	return ptr;
--}
--inline void* operator new[](size_t, void* ptr) throw() 
--{
--	return ptr;
--}
--
- inline void operator delete(void* mem) throw()
- {
- 	Firebird::MemoryPool::globalFree(mem);
diff --git a/databases/firebird21-server/files/pkg-install.in b/databases/firebird21-server/files/pkg-install.in
deleted file mode 100644
index ea7f4c85b705..000000000000
--- a/databases/firebird21-server/files/pkg-install.in
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD: /tmp/pcvs/ports/databases/firebird21-server/files/pkg-install.in,v 1.1 2010-12-20 09:05:05 acm 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 /usr/sbin/nologin \
-		-d /nonexistent -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
diff --git a/databases/firebird21-server/pkg-install b/databases/firebird21-server/pkg-install
new file mode 100644
index 000000000000..582b1f677808
--- /dev/null
+++ b/databases/firebird21-server/pkg-install
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# $FreeBSD: /tmp/pcvs/ports/databases/firebird21-server/files/pkg-install.in,v 1.1 2010-12-20 09:05:05 acm Exp $
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+buildwarning() {
+cat <<EOF
+###############################################################################
+
+                             ** IMPORTANT **
+
+Keep in mind that if you build firebird server as 'root', this may cause
+conflicts with SysV semaphores of running services.
+
+If you want to cancel it, press ctrl-C now if you need check some things
+before of build it.
+
+###############################################################################
+EOF
+	sleep 5
+}
+
+case $2 in
+PRE-INSTALL)
+	buildwarning
+;;
+
+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