From b90ad08bc5572af2b98093b2d264325effff8c81 Mon Sep 17 00:00:00 2001 From: Jose Alonso Cardenas Marquez Date: Sat, 30 Mar 2013 04:33:48 +0000 Subject: [PATCH] - 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 ++- .../firebird20-server/{pkg-install => pkg-install-server} | 0 databases/firebird21-server/Makefile | 4 +++- .../firebird21-server/{pkg-install => pkg-install-server} | 0 databases/firebird25-server/Makefile | 4 +++- .../firebird25-server/{pkg-install => pkg-install-server} | 0 6 files changed, 8 insertions(+), 3 deletions(-) rename databases/firebird20-server/{pkg-install => pkg-install-server} (100%) rename databases/firebird21-server/{pkg-install => pkg-install-server} (100%) rename databases/firebird25-server/{pkg-install => pkg-install-server} (100%) 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 similarity index 100% rename from databases/firebird20-server/pkg-install rename to 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 similarity index 100% rename from databases/firebird21-server/pkg-install rename to 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 similarity index 100% rename from databases/firebird25-server/pkg-install rename to databases/firebird25-server/pkg-install-server