From b9f73aa55013de3308796d676f9d26fe12484aa6 Mon Sep 17 00:00:00 2001
From: acm <acm@FreeBSD.org>
Date: Sat, 30 Mar 2013 04:33:48 +0000
Subject: - Fix build on all version of firebird2*-client - Rename pkg-install
 to pkg-install-server. It only must be used by firebird   server ports

Reported by:	miwiw
---
 databases/firebird20-server/Makefile           |  3 +-
 databases/firebird20-server/pkg-install        | 47 --------------------------
 databases/firebird20-server/pkg-install-server | 47 ++++++++++++++++++++++++++
 databases/firebird21-server/Makefile           |  4 ++-
 databases/firebird21-server/pkg-install        | 47 --------------------------
 databases/firebird21-server/pkg-install-server | 47 ++++++++++++++++++++++++++
 databases/firebird25-server/Makefile           |  4 ++-
 databases/firebird25-server/pkg-install        | 46 -------------------------
 databases/firebird25-server/pkg-install-server | 46 +++++++++++++++++++++++++
 9 files changed, 148 insertions(+), 143 deletions(-)
 delete mode 100644 databases/firebird20-server/pkg-install
 create mode 100644 databases/firebird20-server/pkg-install-server
 delete mode 100644 databases/firebird21-server/pkg-install
 create mode 100644 databases/firebird21-server/pkg-install-server
 delete mode 100644 databases/firebird25-server/pkg-install
 create mode 100644 databases/firebird25-server/pkg-install-server

(limited to 'databases')

diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index b57a7d5188e6..b9555cc14f56 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -64,6 +64,7 @@ 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
 UDF_SQL=	src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql
+PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 .else
 # Client part stuff
 AUTOGENARGS=	--with-editline
@@ -115,7 +116,7 @@ post-install:
 
 .ifndef WITHOUT_IPC_CLEANUP
 pre-build:
-.ifndef PACKAGE_BUILDING
+.if !defined(CLIENT_ONLY)
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 	[ -f ${WRKDIR}/ipcs.pre.build ] || /usr/bin/ipcs -s | ${TAIL} -n +3 | \
diff --git a/databases/firebird20-server/pkg-install b/databases/firebird20-server/pkg-install
deleted file mode 100644
index 3fe8ab2eb470..000000000000
--- a/databases/firebird20-server/pkg-install
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-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
diff --git a/databases/firebird20-server/pkg-install-server b/databases/firebird20-server/pkg-install-server
new file mode 100644
index 000000000000..3fe8ab2eb470
--- /dev/null
+++ b/databases/firebird20-server/pkg-install-server
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# $FreeBSD$
+
+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
diff --git a/databases/firebird21-server/Makefile b/databases/firebird21-server/Makefile
index da3e520e375c..85839217f44a 100644
--- a/databases/firebird21-server/Makefile
+++ b/databases/firebird21-server/Makefile
@@ -67,6 +67,8 @@ 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
 UDF_SQL=	src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql
+
+PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 .else
 # Client part stuff
 AUTOGENARGS=	--without-editline
@@ -122,7 +124,7 @@ post-install:
 
 .ifndef WITHOUT_IPC_CLEANUP
 pre-build:
-.ifndef PACKAGE_BUILDING
+.if !defined(CLIENT_ONLY)
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 	${MAKE} -C ${WRKSRC}/extern/btyacc
diff --git a/databases/firebird21-server/pkg-install b/databases/firebird21-server/pkg-install
deleted file mode 100644
index 582b1f677808..000000000000
--- a/databases/firebird21-server/pkg-install
+++ /dev/null
@@ -1,47 +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
-
-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
diff --git a/databases/firebird21-server/pkg-install-server b/databases/firebird21-server/pkg-install-server
new file mode 100644
index 000000000000..582b1f677808
--- /dev/null
+++ b/databases/firebird21-server/pkg-install-server
@@ -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
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index ee05f4245b51..ba24ef73cf11 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -82,6 +82,8 @@ UTIL_BIN=	fbguard fbsplit fbstat fbsvcmgr fbtracemgr gbak gdef gfix gsec \
 		nbackup
 UDF_SO=		ib_udf.so fbudf.so
 UDF_SQL=	src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql
+
+PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 .else
 # Client part stuff
 ALL_TARGET=	firebird_basic libfbembed libfbclient embed_isql embed_gpre \
@@ -128,7 +130,7 @@ post-install:
 
 .ifndef WITHOUT_IPC_CLEANUP
 pre-build:
-.ifndef PACKAGE_BUILDING
+.if !defined(CLIENT_ONLY)
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 
diff --git a/databases/firebird25-server/pkg-install b/databases/firebird25-server/pkg-install
deleted file mode 100644
index df5c2c9674fb..000000000000
--- a/databases/firebird25-server/pkg-install
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD: /tmp/pcvs/ports/databases/firebird25-server/files/pkg-install.in,v 1.2 2011-07-10 17:37:11 crees 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
diff --git a/databases/firebird25-server/pkg-install-server b/databases/firebird25-server/pkg-install-server
new file mode 100644
index 000000000000..df5c2c9674fb
--- /dev/null
+++ b/databases/firebird25-server/pkg-install-server
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# $FreeBSD: /tmp/pcvs/ports/databases/firebird25-server/files/pkg-install.in,v 1.2 2011-07-10 17:37:11 crees 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
-- 
cgit