Date: Wed, 23 Jul 2014 22:36:23 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362750 - in head/databases: firebird25-client firebird25-server Message-ID: <201407232236.s6NMaNHH030264@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Wed Jul 23 22:36:23 2014 New Revision: 362750 URL: http://svnweb.freebsd.org/changeset/ports/362750 QAT: https://qat.redports.org/buildarchive/r362750/ Log: Stagify. PR: 191701, 191702 Submitted by: Dan Lukes <dan@obluda.cz> Modified: head/databases/firebird25-client/Makefile head/databases/firebird25-server/Makefile head/databases/firebird25-server/pkg-plist Modified: head/databases/firebird25-client/Makefile ============================================================================== --- head/databases/firebird25-client/Makefile Wed Jul 23 22:36:14 2014 (r362749) +++ head/databases/firebird25-client/Makefile Wed Jul 23 22:36:23 2014 (r362750) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firebird -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}-client COMMENT= Firebird-2 database client @@ -13,5 +13,4 @@ PLIST= ${PKGDIR}/pkg-plist.client CLIENT_ONLY= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/firebird25-server/Makefile ============================================================================== --- head/databases/firebird25-server/Makefile Wed Jul 23 22:36:14 2014 (r362749) +++ head/databases/firebird25-server/Makefile Wed Jul 23 22:36:23 2014 (r362750) @@ -3,14 +3,14 @@ PORTNAME= firebird PORTVERSION= 2.5.2 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES?= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/ PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.26540-0 DIST_SUBDIR= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT?= Firebird-2 relational database (server) CONFLICTS?= ${PORTNAME}20-client-* \ @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --with-system-editline \ --with-system-icu \ --prefix=${LOCALSTATEDIR} \ --exec-prefix=${PREFIX} \ - --with-fbconf=${CONFDIR} \ + --with-fbconf=${PREFIX}/${CONFDIR} \ --with-fbglock=${LOCALSTATEDIR} \ --with-fbhelp=${LOCALSTATEDIR}/help \ --with-fbintl=${LIBEXECDIR}/intl \ @@ -45,10 +45,10 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib LOCALSTATEDIR= /var/db/firebird -CONFDIR= ${PREFIX}/etc/firebird +CONFDIR= etc/firebird LIBEXECDIR= ${PREFIX}/libexec/firebird PLIST_SUB= FIREBIRD_VERSION=${PORTVERSION} \ - LOCALSTATEDIR="var/db/firebird" CONFDIR="etc/firebird" + LOCALSTATEDIR="var/db/firebird" CONFDIR="${CONFDIR}" # Don't use ld for linking, use gcc LD= ${CC} @@ -60,7 +60,7 @@ ONLY_FOR_ARCHS= i386 amd64 CONFLICTS+= firebird-client-2.0* firebird-server-2.0* \ firebird-client-2.1* firebird-server-2.1* -INSTALL_FB= ${INSTALL} ${COPY} -g firebird +INSTALL_FB= ${INSTALL} ${COPY} IPCRM_CMD= /usr/bin/ipcrm IPCS_CMD= /usr/bin/ipcs @@ -106,10 +106,10 @@ FB_DOCS_DIRS= sql.extensions license upg .endif MAKE_ENV+= FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}" +MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" OPTIONS_DEFINE= DOCS -NO_STAGE= yes post-extract: @${RM} -rf ${WRKSRC}/extern/icu @@ -127,19 +127,14 @@ CFLAGS+= -DAMD64 .endif .if !defined(CLIENT_ONLY) - USERS= ${PORTNAME} GROUPS= ${USERS} - -post-install: - @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} .endif .ifndef WITHOUT_IPC_CLEANUP pre-build: .if !defined(CLIENT_ONLY) - @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL + @${SETENV} PKG_PREFIX="${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif ${MAKE} -C ${WRKSRC}/extern/btyacc @@ -156,77 +151,66 @@ post-build: do-install: .if !defined(CLIENT_ONLY) - ${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin - ${INSTALL_PROGRAM} ${UTIL_SBIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/sbin - - @${MKDIR} ${CONFDIR} - ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/aliases.conf ${CONFDIR}/aliases.conf.sample -.if !exists(${CONFDIR}/aliases.conf) - ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/aliases.conf ${CONFDIR}/aliases.conf -.endif - ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbtrace.conf ${CONFDIR}/fbtrace.conf + ${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${UTIL_SBIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/sbin - ${MKDIR} ${LIBEXECDIR}/udf ${LOCALSTATEDIR}/help ${LIBEXECDIR}/intl \ - ${LIBEXECDIR}/plugins + @${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR} + ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/aliases.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/aliases.conf.sample + ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbtrace.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/fbtrace.conf - ${CHOWN} -R firebird:firebird ${LOCALSTATEDIR} + ${MKDIR} ${STAGEDIR}${LIBEXECDIR}/udf ${STAGEDIR}${LOCALSTATEDIR}/help ${STAGEDIR}${LIBEXECDIR}/intl \ + ${STAGEDIR}${LIBEXECDIR}/plugins - ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbintl.conf ${LIBEXECDIR}/intl/fbintl.conf - ${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${LIBEXECDIR}/udf - ${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${LIBEXECDIR}/udf - ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/plugins/libfbtrace.so ${LIBEXECDIR}/plugins + ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbintl.conf ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.conf + ${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${STAGEDIR}${LIBEXECDIR}/udf + ${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${STAGEDIR}${LIBEXECDIR}/udf + ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/plugins/libfbtrace.so ${STAGEDIR}${LIBEXECDIR}/plugins -.if !exists(${LOCALSTATEDIR}/security2.fdb) - ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb ${LOCALSTATEDIR}/security2.fdb -.endif - ${INSTALL_FB} -m 0660 -o firebird ${WRKSRC}/gen/firebird/security2.fdb ${LOCALSTATEDIR}/security2.fdb.sample + ${INSTALL_FB} -m 0660 ${WRKSRC}/gen/firebird/security2.fdb ${STAGEDIR}${LOCALSTATEDIR}/security2.fdb.sample - ${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb ${LOCALSTATEDIR}/help + ${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb ${STAGEDIR}${LOCALSTATEDIR}/help - ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${LIBEXECDIR}/intl/fbintl.so + ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.so .else # defined CLIENT_ONLY - ${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/install/misc/firebird.conf > ${WRKDIR}/firebird.conf - @${MKDIR} ${CONFDIR} -.if !exists(${CONFDIR}/firebird.conf) - ${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR} -.endif - ${INSTALL_DATA} ${WRKDIR}/firebird.conf ${CONFDIR}/firebird.conf.sample + @${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR} + ${INSTALL_DATA} ${WRKDIR}/firebird.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/firebird.conf.sample ${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \ ${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \ ${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \ - ${PREFIX}/lib + ${STAGEDIR}${PREFIX}/lib - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.2.5 - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so.2 - ${LN} -fs libfbclient.so.${PORTVERSION} ${PREFIX}/lib/libfbclient.so + ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.2.5 + ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.2 + ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2.5 - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so.2 - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libfbembed.so + ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so.2.5 + ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so.2 + ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2.5 - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so.2 - ${LN} -fs libfbembed.so.${PORTVERSION} ${PREFIX}/lib/libgds.so + ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so.2.5 + ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so.2 + ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so - @${MKDIR} ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${PREFIX}/include + @${MKDIR} ${STAGEDIR}${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${STAGEDIR}${PREFIX}/include - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" - @${MKDIR} ${FB_DOCS_DIRS:S!^!${DOCSDIR}/!} - @${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${DOCSDIR} - @${LN} -sf ${DOCSDIR}/README.user ${DOCSDIR}/README - @${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${DOCSDIR}/sql.extensions - @${INSTALL_DATA} ${WRKSRC}/doc/license/* ${DOCSDIR}/license - @${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${DOCSDIR}/upgrade + @${MKDIR} ${FB_DOCS_DIRS:S!^!${STAGEDIR}${DOCSDIR}/!} + @${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${STAGEDIR}${DOCSDIR} + @${LN} -sf ${DOCSDIR}/README.user ${STAGEDIR}${DOCSDIR}/README + @${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${STAGEDIR}${DOCSDIR}/sql.extensions + @${INSTALL_DATA} ${WRKSRC}/doc/license/* ${STAGEDIR}${DOCSDIR}/license + @${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${STAGEDIR}${DOCSDIR}/upgrade .endif .endif Modified: head/databases/firebird25-server/pkg-plist ============================================================================== --- head/databases/firebird25-server/pkg-plist Wed Jul 23 22:36:14 2014 (r362749) +++ head/databases/firebird25-server/pkg-plist Wed Jul 23 22:36:23 2014 (r362750) @@ -12,6 +12,7 @@ sbin/fb_inet_server sbin/fb_lock_print sbin/fb_smp_server sbin/fbserver +@group firebird libexec/firebird/udf/ib_udf.so libexec/firebird/udf/fbudf.so libexec/firebird/udf/ib_udf2.sql @@ -19,9 +20,8 @@ libexec/firebird/udf/fbudf.sql libexec/firebird/plugins/libfbtrace.so libexec/firebird/intl/fbintl.so libexec/firebird/intl/fbintl.conf -@unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true -%%CONFDIR%%/aliases.conf.sample -@exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf +@group +@sample %%CONFDIR%%/aliases.conf.sample %%CONFDIR%%/fbtrace.conf @dirrmtry %%CONFDIR%% @dirrm libexec/firebird/intl @@ -29,9 +29,9 @@ libexec/firebird/intl/fbintl.conf @dirrm libexec/firebird/udf @dirrm libexec/firebird @cwd / -@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security2.fdb %D/%%LOCALSTATEDIR%%/security2.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security2.fdb) || true -%%LOCALSTATEDIR%%/security2.fdb.sample -@exec [ -f %D/%%LOCALSTATEDIR%%/security2.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security2.fdb +@owner firebird +@group firebird +@sample %%LOCALSTATEDIR%%/security2.fdb.sample %%LOCALSTATEDIR%%/help/help.fdb @unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log @rmtry %%LOCALSTATEDIR%%/isc_event1.`hostname`
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407232236.s6NMaNHH030264>