[Bug 191701] New: [ staging ] databases/firebird25-server
bugzilla-noreply at freebsd.org
bugzilla-noreply at freebsd.org
Mon Jul 7 14:53:58 UTC 2014
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191701
Bug ID: 191701
Summary: [ staging ] databases/firebird25-server
Product: Ports Tree
Version: Latest
Hardware: Any
OS: Any
Status: Needs Triage
Severity: Affects Many People
Priority: Normal
Component: Individual Port(s)
Assignee: freebsd-ports-bugs at FreeBSD.org
Reporter: dan at obluda.cz
databases/firebird25-server require staging or will be removed
Fix:
Patch is attached.
--- databases/firebird25-server/Makefile.orig 2014-07-07 15:23:25.000000000
+0200
+++ databases/firebird25-server/Makefile 2014-07-07 16:45:21.000000000 +0200
@@ -28,7 +28,7 @@
--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 @@
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"
+PLIST_SUB= FIREBIRD_VERSION=${PORTVERSION} ETCDIR=${ETCDIR_REL} \
+ LOCALSTATEDIR="var/db/firebird" CONFDIR="${CONFDIR}"
# Don't use ld for linking, use gcc
LD= ${CC}
@@ -106,10 +106,10 @@
.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
@@ -132,14 +132,14 @@
GROUPS= ${USERS}
post-install:
- @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME}
POST-INSTALL
+ @${SETENV} PKG_PREFIX="${STAGEDIR}${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 +156,68 @@
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
+ ${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} ${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
+ @${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
- ${MKDIR} ${LIBEXECDIR}/udf ${LOCALSTATEDIR}/help ${LIBEXECDIR}/intl \
- ${LIBEXECDIR}/plugins
+ ${MKDIR} ${STAGEDIR}${LIBEXECDIR}/udf ${STAGEDIR}${LOCALSTATEDIR}/help
${STAGEDIR}${LIBEXECDIR}/intl \
+ ${STAGEDIR}${LIBEXECDIR}/plugins
- ${CHOWN} -R firebird:firebird ${LOCALSTATEDIR}
+ ${CHOWN} -R firebird:firebird ${STAGEDIR}${LOCALSTATEDIR}
- ${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 -o firebird ${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
--
You are receiving this mail because:
You are the assignee for the bug.
More information about the freebsd-ports-bugs
mailing list