Date: Fri, 29 Nov 2013 14:45:31 +0000 From: Steven Kreuzer <skreuzer@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: cy@FreeBSD.org Subject: ports/184372: [PATCH] sysutils/cfengine35: Add Staging Support Message-ID: <201311291445.rATEjUaR074000@scruffy.exit2shell.com> Resent-Message-ID: <201311291450.rATEo1W5075998@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184372
>Category: ports
>Synopsis: [PATCH] sysutils/cfengine35: Add Staging Support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 29 14:50:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Steven Kreuzer
>Release: FreeBSD 9.1-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD clamps.exit2shell.com 9.1-RELEASE-p5 FreeBSD 9.1-RELEASE-p5 #0: Sat Jul 27 01:01:40 UTC 2013
>Description:
Add staging support
Use descriptions for PGSQL, MYSQL and LIBVIRT defined in bsd.options.mk
Convert LIB_DEPENDS to new format
Port maintainer (cy@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- cfengine35-3.5.2.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 335182)
+++ Makefile (working copy)
@@ -37,7 +37,7 @@
--with-pcre=${LOCALBASE} \
--enable-fhs
-LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre
OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT
OPTIONS_SINGLE= DB
@@ -44,40 +44,36 @@
OPTIONS_SINGLE_DB= TOKYOCABINET QDBM
TOKYOCABINET_DESC= Enable TokyoCabinet database backend
QDBM_DESC= Enable QDBM database backend
-PGSQL_DESC= Enable PostgreSQL integration
-MYSQL_DESC= Enable MySQL integration
-LIBVIRT_DESC= Enable libvirt integration
OPTIONS_DEFAULT=TOKYOCABINET
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MTOKYOCABINET}
CONFIGURE_ARGS+= --with-tokyocabinet=${LOCALBASE}
-LIB_DEPENDS+= tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+= libtokyocabinet.so.9:${PORTSDIR}/databases/tokyocabinet
.endif
.if ${PORT_OPTIONS:MQDBM}
CONFIGURE_ARGS+= --with-qdbm=${LOCALBASE}
-LIB_DEPENDS+= qdbm.14:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+= libqdbm.so.14:${PORTSDIR}/databases/qdbm
.endif
.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE}
-LIB_DEPENDS+= pq:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
+LIB_DEPENDS+= libpq.so:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
.endif
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
-LIB_DEPENDS+= mysqlclient:${PORTSDIR}/${_MYSQL_CLIENT}
+LIB_DEPENDS+= libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
LDFLAGS+= -L${LOCALBASE}/lib/mysql
.endif
.if ${PORT_OPTIONS:MLIBVIRT}
CONFIGURE_ARGS+= --with-libvirt=${LOCALBASE}
-LIB_DEPENDS+= virt.1001:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+= libvirt.so.1001:${PORTSDIR}/devel/libvirt
.endif
.include <bsd.port.post.mk>
--- cfengine35-3.5.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311291445.rATEjUaR074000>