Date: Sun, 24 Mar 2013 04:29:26 +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: r315091 - in head/databases/firebird20-server: . files Message-ID: <201303240429.r2O4TQJ0019218@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Sun Mar 24 04:29:26 2013 New Revision: 315091 URL: http://svnweb.freebsd.org/changeset/ports/315091 Log: - Update to 2.0.7 - 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/firebird20-server/files/patch-autogen.sh (contents, props changed) head/databases/firebird20-server/pkg-install - copied, changed from r315090, head/databases/firebird20-server/files/pkg-install.in Deleted: head/databases/firebird20-server/files/patch-libtool22 head/databases/firebird20-server/files/pkg-install.in Modified: head/databases/firebird20-server/Makefile head/databases/firebird20-server/distinfo Modified: head/databases/firebird20-server/Makefile ============================================================================== --- head/databases/firebird20-server/Makefile Sun Mar 24 03:08:36 2013 (r315090) +++ head/databases/firebird20-server/Makefile Sun Mar 24 04:29:26 2013 (r315091) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME?= firebird -PORTVERSION= 2.0.6 -PORTREVISION= 2 +PORTVERSION= 2.0.7 +PORTREVISION= 0 CATEGORIES?= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-Release/ PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.13266-0 +DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.13318-0 DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org @@ -59,7 +59,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 @@ -104,8 +104,9 @@ post-patch: .include <bsd.port.pre.mk> .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 @@ -115,8 +116,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 [ -f ${WRKDIR}/ipcs.pre.build ] || /usr/bin/ipcs -s | ${TAIL} -n +3 | \ ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build Modified: head/databases/firebird20-server/distinfo ============================================================================== --- head/databases/firebird20-server/distinfo Sun Mar 24 03:08:36 2013 (r315090) +++ head/databases/firebird20-server/distinfo Sun Mar 24 04:29:26 2013 (r315091) @@ -1,2 +1,2 @@ -SHA256 (firebird/Firebird-2.0.6.13266-0.tar.bz2) = 042a0a3f12959d68173d4a04f1b09c5cfd613d27d3341f445281d66e9a183761 -SIZE (firebird/Firebird-2.0.6.13266-0.tar.bz2) = 13134922 +SHA256 (firebird/Firebird-2.0.7.13318-0.tar.bz2) = 1fa510894a34e4882956b5d0268100732a32662bdffbf0d32955e6e222f895f1 +SIZE (firebird/Firebird-2.0.7.13318-0.tar.bz2) = 13140441 Added: head/databases/firebird20-server/files/patch-autogen.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/firebird20-server/files/patch-autogen.sh Sun Mar 24 04:29:26 2013 (r315091) @@ -0,0 +1,34 @@ +--- autogen.sh 2013-03-23 22:16:00.000000000 -0500 ++++ autogen.sh 2013-03-23 22:17:07.000000000 -0500 +@@ -19,10 +19,13 @@ + AUTOMAKE=true + export AUTOMAKE + ++ACLOCAL='aclocal -I .' ++export ACLOCAL ++ + VER=`$AUTORECONF --version|grep '^[Aa]utoreconf'|sed 's/^[^0-9]*//'` + case "$VER" in + 0* | 1\.* | 2\.[0-9] | 2\.[0-9][a-z]* | \ +- 2\.[1-4][0-9] | 2\.[1-4][0-9][a-z]* | 2\.5[0-5] | 2\.5[0-5][a-z]* ) ++ 2\.[1-4][0-9] | 2\.5[0-5][a-z]* ) + echo + echo "**Error**: You must have autoconf 2.56 or later installed." + echo "Download the appropriate package for your distribution/OS," +@@ -55,14 +58,14 @@ + + # Ensure correct utilities are called by AUTORECONF + autopath=`dirname $AUTORECONF` +-if [ "x$autopath" != "x" ]; then ++if [ "$autopath" != "x" ]; then + PATH=$autopath:$PATH + export PATH + fi + + # Generate configure from configure.in + echo "Running autoreconf ..." +-$AUTORECONF --install --force --verbose || exit 1 ++$AUTORECONF --install --force --verbose -I ./m4 || exit 1 + + # Hack to bypass bug in autoreconf - --install switch not passed to libtoolize, + # therefore missing config.sub and confg.guess files Copied and modified: head/databases/firebird20-server/pkg-install (from r315090, head/databases/firebird20-server/files/pkg-install.in) ============================================================================== --- head/databases/firebird20-server/files/pkg-install.in Sun Mar 24 03:08:36 2013 (r315090, copy source) +++ head/databases/firebird20-server/pkg-install Sun Mar 24 04:29:26 2013 (r315091) @@ -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 /bin/sh \ - -d /var/db/firebird -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303240429.r2O4TQJ0019218>