svn commit: r315092 - in head/databases/firebird21-server: . files

Sun Mar 24 04:30:31 UTC 2013

Author: acm
Date: Sun Mar 24 04:30:30 2013
New Revision: 315092
URL: http://svnweb.freebsd.org/changeset/ports/315092

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

Added:
  head/databases/firebird21-server/files/patch-builds-posix_empty.vers   (contents, props changed)
  head/databases/firebird21-server/pkg-install
     - copied, changed from r315090, head/databases/firebird21-server/files/pkg-install.in
Deleted:
  head/databases/firebird21-server/files/patch-src-common-classes_alloc.h
  head/databases/firebird21-server/files/pkg-install.in
Modified:
  head/databases/firebird21-server/Makefile
  head/databases/firebird21-server/distinfo

Modified: head/databases/firebird21-server/Makefile
==============================================================================

--- head/databases/firebird21-server/Makefile	Sun Mar 24 04:29:26 2013	(r315091)
+++ head/databases/firebird21-server/Makefile	Sun Mar 24 04:30:30 2013	(r315092)
@@ -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 at FreeBSD.org
@@ -62,7 +62,7 @@ ALL_TARGET=	firebird_boot ref_databases 
 		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 | \

Modified: head/databases/firebird21-server/distinfo
==============================================================================
--- head/databases/firebird21-server/distinfo	Sun Mar 24 04:29:26 2013	(r315091)
+++ head/databases/firebird21-server/distinfo	Sun Mar 24 04:30:30 2013	(r315092)
@@ -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

Added: head/databases/firebird21-server/files/patch-builds-posix_empty.vers
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/firebird21-server/files/patch-builds-posix_empty.vers	Sun Mar 24 04:30:30 2013	(r315092)
@@ -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:
+ 	*;

Copied and modified: head/databases/firebird21-server/pkg-install (from r315090, head/databases/firebird21-server/files/pkg-install.in)
==============================================================================
--- head/databases/firebird21-server/files/pkg-install.in	Sun Mar 24 03:08:36 2013	(r315090, copy source)
+++ head/databases/firebird21-server/pkg-install	Sun Mar 24 04:30:30 2013	(r315092)
@@ -4,50 +4,26 @@
 
 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)
-
-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
+	buildwarning
 ;;
 
 POST-INSTALL)
