From owner-svn-ports-head@FreeBSD.ORG Wed Jul 30 20:13:59 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18498D67; Wed, 30 Jul 2014 20:13:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E04C32F9D; Wed, 30 Jul 2014 20:13:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6UKDwLZ015273; Wed, 30 Jul 2014 20:13:58 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6UKDwut015272; Wed, 30 Jul 2014 20:13:58 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201407302013.s6UKDwut015272@svn.freebsd.org> From: Cy Schubert Date: Wed, 30 Jul 2014 20:13:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363511 - head/sysutils/cfengine36 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jul 2014 20:13:59 -0000 Author: cy Date: Wed Jul 30 20:13:58 2014 New Revision: 363511 URL: http://svnweb.freebsd.org/changeset/ports/363511 QAT: https://qat.redports.org/buildarchive/r363511/ Log: Fix muitiple build issues: - missing pcre.h - broken ltmain.sh - causing libpromises shared library naming issues. - other cleanup Submitted by: bapt Modified: head/sysutils/cfengine36/Makefile Modified: head/sysutils/cfengine36/Makefile ============================================================================== --- head/sysutils/cfengine36/Makefile Wed Jul 30 20:06:24 2014 (r363510) +++ head/sysutils/cfengine36/Makefile Wed Jul 30 20:13:58 2014 (r363511) @@ -29,8 +29,10 @@ USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes USES= gmake libtool +USE_AUTOTOOLS= autoconf:env automake:env libtoolize:env CFLAGS+= -Wno-return-type CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib # EXAMPLESDIR= ${PREFIX}/share/examples/cfengine3 DOCSDIR= ${PREFIX}/share/doc/cfengine CONFIGURE_ARGS= --docdir=${DOCSDIR} \ @@ -42,34 +44,25 @@ CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --with-pcre=${LOCALBASE} \ --with-lmdb=${LOCALBASE} \ --enable-fhs +INSTALL_TARGET= install-strip LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ liblmdb.so:${PORTSDIR}/databases/lmdb OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT -.include +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE} -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} -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+= libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT} -LDFLAGS+= -L${LOCALBASE}/lib/mysql -.endif - -.if ${PORT_OPTIONS:MLIBVIRT} -CONFIGURE_ARGS+= --with-libvirt=${LOCALBASE} -LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt -.endif - -post-install: - @cd ${STAGEDIR}${PREFIX}/libexec/cfengine && \ - ${LN} -s libpromises.so.3.0.6 libpromises.so.3 +MYSQL_USE= MYSQL=yes +MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} +MYSQL_LIB_DEPENDS= libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT} +MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql -.include +LIBVIRT_CONFIGURE_ON= --with-libvirt=${LOCALBASE} +LIBVIRT_LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt + +pre-configure: + @cd ${WRKSRC}; autoreconf -Wno-portability --force --install -I m4 + +.include