From owner-svn-ports-head@freebsd.org Mon Aug 8 03:17:25 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D593BB110D; Mon, 8 Aug 2016 03:17:25 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 61C7718A4; Mon, 8 Aug 2016 03:17:25 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u783HOAO051612; Mon, 8 Aug 2016 03:17:24 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u783HO99051608; Mon, 8 Aug 2016 03:17:24 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201608080317.u783HO99051608@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 8 Aug 2016 03:17:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419794 - in head/sysutils: cfengine36 cfengine37 cfengine38 cfengine39 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.22 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: Mon, 08 Aug 2016 03:17:25 -0000 Author: cy Date: Mon Aug 8 03:17:24 2016 New Revision: 419794 URL: https://svnweb.freebsd.org/changeset/ports/419794 Log: For sysutils/cfengine3[6-9], replace *_CONFIGURE_{ON,OFF} with *CONFIGURE_WITH, as it is more approriate here. Reminded by: mat@ Modified: head/sysutils/cfengine36/Makefile head/sysutils/cfengine37/Makefile head/sysutils/cfengine38/Makefile head/sysutils/cfengine39/Makefile Modified: head/sysutils/cfengine36/Makefile ============================================================================== --- head/sysutils/cfengine36/Makefile Mon Aug 8 01:30:23 2016 (r419793) +++ head/sysutils/cfengine36/Makefile Mon Aug 8 03:17:24 2016 (r419794) @@ -28,9 +28,8 @@ USE_RC_SUBR= cf-execd cf-serverd cf-moni MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes -USE_OPENSSL= yes GNU_CONFIGURE= yes -USES= autoreconf cpe gmake libtool shebangfix +USES= autoreconf cpe gmake libtool shebangfix ssl SHEBANG_FILES= examples/remake_outputs.pl CFLAGS+= -Wno-return-type CPPFLAGS+= -I${LOCALBASE}/include @@ -54,14 +53,14 @@ LIB_DEPENDS+= libpcre.so:devel/pcre \ OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT PGSQL_USES= pgsql -PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE} +PGSQL_CONFIGURE_WITH= --with-postgresql=${LOCALBASE} -MYSQL_USE= MYSQL=yes -MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} +MYSQL_USES= mysql +MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE} MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT} MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql -LIBVIRT_CONFIGURE_ON= --with-libvirt=${LOCALBASE} +LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt .include Modified: head/sysutils/cfengine37/Makefile ============================================================================== --- head/sysutils/cfengine37/Makefile Mon Aug 8 01:30:23 2016 (r419793) +++ head/sysutils/cfengine37/Makefile Mon Aug 8 03:17:24 2016 (r419794) @@ -54,16 +54,14 @@ LIB_DEPENDS+= libpcre.so:devel/pcre \ OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT PGSQL_USES= pgsql -PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE} -PGSQL_CONFIGURE_OFF= --without-postgresql +PGSQL_CONFIGURE_WITH= --with-postgresql=${LOCALBASE} MYSQL_USE= MYSQL=yes -MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} +MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE} MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT} MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql -LIBVIRT_CONFIGURE_ON= --with-libvirt=${LOCALBASE} -LIBVIRT_CONFIGURE_OFF= --without-libvirt +LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS= libvirt.so:devel/libvirt .include Modified: head/sysutils/cfengine38/Makefile ============================================================================== --- head/sysutils/cfengine38/Makefile Mon Aug 8 01:30:23 2016 (r419793) +++ head/sysutils/cfengine38/Makefile Mon Aug 8 03:17:24 2016 (r419794) @@ -56,16 +56,14 @@ LIB_DEPENDS+= libpcre.so:devel/pcre \ OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT PGSQL_USES= pgsql -PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE} -PGSQL_CONFIGURE_OFF= --without-postgresql +PGSQL_CONFIGURE_WITH= --with-postgresql=${LOCALBASE} MYSQL_USE= MYSQL=yes -MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} +MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE} MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT} MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql -LIBVIRT_CONFIGURE_ON= --with-libvirt=${LOCALBASE} -LIBVIRT_CONFIGURE_OFF= --without-libvirt +LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS= libvirt.so:devel/libvirt .include Modified: head/sysutils/cfengine39/Makefile ============================================================================== --- head/sysutils/cfengine39/Makefile Mon Aug 8 01:30:23 2016 (r419793) +++ head/sysutils/cfengine39/Makefile Mon Aug 8 03:17:24 2016 (r419794) @@ -59,14 +59,14 @@ LIB_DEPENDS+= libpcre.so:devel/pcre \ OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT PGSQL_USES= pgsql -PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE} +PGSQL_CONFIGURE_WITH= --with-postgresql=${LOCALBASE} MYSQL_USES= mysql -MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} +MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE} MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT} MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql -LIBVIRT_CONFIGURE_ON= --with-libvirt=${LOCALBASE} +LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS+= libvirt.so:devel/libvirt .include