Date: Sat, 30 Mar 2013 04:33:49 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315591 - in head/databases: firebird20-server firebird21-server firebird25-server Message-ID: <201303300433.r2U4XnQ3076475@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Sat Mar 30 04:33:48 2013 New Revision: 315591 URL: http://svnweb.freebsd.org/changeset/ports/315591 Log: - 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 Added: head/databases/firebird20-server/pkg-install-server - copied unchanged from r315091, head/databases/firebird20-server/pkg-install head/databases/firebird21-server/pkg-install-server - copied unchanged from r315092, head/databases/firebird21-server/pkg-install head/databases/firebird25-server/pkg-install-server - copied unchanged from r315093, head/databases/firebird25-server/pkg-install Deleted: head/databases/firebird20-server/pkg-install head/databases/firebird21-server/pkg-install head/databases/firebird25-server/pkg-install Modified: head/databases/firebird20-server/Makefile head/databases/firebird21-server/Makefile head/databases/firebird25-server/Makefile Modified: head/databases/firebird20-server/Makefile ============================================================================== --- head/databases/firebird20-server/Makefile Sat Mar 30 04:11:33 2013 (r315590) +++ head/databases/firebird20-server/Makefile Sat Mar 30 04:33:48 2013 (r315591) @@ -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 | \ Copied: head/databases/firebird20-server/pkg-install-server (from r315091, head/databases/firebird20-server/pkg-install) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/firebird20-server/pkg-install-server Sat Mar 30 04:33:48 2013 (r315591, copy of r315091, head/databases/firebird20-server/pkg-install) @@ -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 Modified: head/databases/firebird21-server/Makefile ============================================================================== --- head/databases/firebird21-server/Makefile Sat Mar 30 04:11:33 2013 (r315590) +++ head/databases/firebird21-server/Makefile Sat Mar 30 04:33:48 2013 (r315591) @@ -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 Copied: head/databases/firebird21-server/pkg-install-server (from r315092, head/databases/firebird21-server/pkg-install) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/firebird21-server/pkg-install-server Sat Mar 30 04:33:48 2013 (r315591, copy of r315092, head/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 Modified: head/databases/firebird25-server/Makefile ============================================================================== --- head/databases/firebird25-server/Makefile Sat Mar 30 04:11:33 2013 (r315590) +++ head/databases/firebird25-server/Makefile Sat Mar 30 04:33:48 2013 (r315591) @@ -82,6 +82,8 @@ UTIL_BIN= fbguard fbsplit fbstat fbsvcmg 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 Copied: head/databases/firebird25-server/pkg-install-server (from r315093, head/databases/firebird25-server/pkg-install) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/firebird25-server/pkg-install-server Sat Mar 30 04:33:48 2013 (r315591, copy of r315093, head/databases/firebird25-server/pkg-install) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303300433.r2U4XnQ3076475>