aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authoracm <acm@FreeBSD.org>2013-03-30 12:33:48 +0800
committeracm <acm@FreeBSD.org>2013-03-30 12:33:48 +0800
commitb9f73aa55013de3308796d676f9d26fe12484aa6 (patch)
tree4a41c3fd41ac34db6c379d384da440b39b419a14 /databases
parent18977ee2b041aab7d30aa0d06d7ec60891f1491e (diff)
downloadfreebsd-ports-gnome-b9f73aa55013de3308796d676f9d26fe12484aa6.tar.gz
freebsd-ports-gnome-b9f73aa55013de3308796d676f9d26fe12484aa6.tar.zst
freebsd-ports-gnome-b9f73aa55013de3308796d676f9d26fe12484aa6.zip
- 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
Diffstat (limited to 'databases')
-rw-r--r--databases/firebird20-server/Makefile3
-rw-r--r--databases/firebird20-server/pkg-install-server (renamed from databases/firebird20-server/pkg-install)0
-rw-r--r--databases/firebird21-server/Makefile4
-rw-r--r--databases/firebird21-server/pkg-install-server (renamed from databases/firebird21-server/pkg-install)0
-rw-r--r--databases/firebird25-server/Makefile4
-rw-r--r--databases/firebird25-server/pkg-install-server (renamed from databases/firebird25-server/pkg-install)0
6 files changed, 8 insertions, 3 deletions
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-server
index 3fe8ab2eb470..3fe8ab2eb470 100644
--- a/databases/firebird20-server/pkg-install
+++ b/databases/firebird20-server/pkg-install-server
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-server
index 582b1f677808..582b1f677808 100644
--- a/databases/firebird21-server/pkg-install
+++ b/databases/firebird21-server/pkg-install-server
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-server
index df5c2c9674fb..df5c2c9674fb 100644
--- a/databases/firebird25-server/pkg-install
+++ b/databases/firebird25-server/pkg-install-server