Date: Wed, 11 Nov 2015 08:53:08 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401229 - head/databases/firebird25-server Message-ID: <201511110853.tAB8r8rm027300@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Nov 11 08:53:08 2015 New Revision: 401229 URL: https://svnweb.freebsd.org/changeset/ports/401229 Log: databases/firebird25-(client|server): convert to USES=libedit The -server port had to be bumped because libedit was listed as a BUILD_DEPENDS but libedit is linked dynamically so it has to be a LIB_DEPENDS. The error was masked by the fact the client is usually present which ensures libedit.so is available. While here, remove obsolete CONFLICT* definitions and unmask a bunch of installation commands. Modified: head/databases/firebird25-server/Makefile Modified: head/databases/firebird25-server/Makefile ============================================================================== --- head/databases/firebird25-server/Makefile Wed Nov 11 08:32:54 2015 (r401228) +++ head/databases/firebird25-server/Makefile Wed Nov 11 08:53:08 2015 (r401229) @@ -3,7 +3,7 @@ PORTNAME= firebird PORTVERSION= 2.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= databases MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/ PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server @@ -22,14 +22,9 @@ LICENSE_FILE_IPL= ${WRKSRC}/builds/insta LICENSE_PERMS_IDPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_IPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -CONFLICTS?= ${PORTNAME}20-client-* \ - ${PORTNAME}21-client-* \ - ${PORTNAME}20-server-* \ - ${PORTNAME}21-server-* - LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu -USES= gmake pkgconfig tar:bzip2 +USES= gmake libedit pkgconfig tar:bzip2 GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes @@ -79,7 +74,6 @@ IGNORE= your system does not support sy .if !defined(CLIENT_ONLY) # Server part stuff -BUILD_DEPENDS= ${LOCALBASE}/lib/libedit.so:${PORTSDIR}/devel/libedit LIB_DEPENDS+= libfbembed.so:${PORTSDIR}/databases/firebird25-client CONFIGURE_ARGS+=--enable-superserver @@ -98,8 +92,6 @@ UDF_SQL= src/extlib/ib_udf2.sql src/extl PKGINSTALL?= ${PKGDIR}/pkg-install-server .else # Client part stuff -LIB_DEPENDS+= libedit.so.0:${PORTSDIR}/devel/libedit - ALL_TARGET= firebird_basic libfbembed libfbclient embed_isql embed_gpre \ embed_gdef embed_qli extlib @@ -211,11 +203,11 @@ do-install: post-install-DOCS-on: @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" @${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 + ${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 .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511110853.tAB8r8rm027300>