From owner-svn-ports-all@freebsd.org Tue Oct 27 15:53:50 2015 Return-Path: Delivered-To: svn-ports-all@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 A5C2EA1E44B; Tue, 27 Oct 2015 15:53:50 +0000 (UTC) (envelope-from sunpoet@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 7C5581866; Tue, 27 Oct 2015 15:53:50 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9RFrniR059336; Tue, 27 Oct 2015 15:53:49 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9RFrnCd059334; Tue, 27 Oct 2015 15:53:49 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201510271553.t9RFrnCd059334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 27 Oct 2015 15:53:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400305 - head/dns/opendnssec13 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Oct 2015 15:53:50 -0000 Author: sunpoet Date: Tue Oct 27 15:53:49 2015 New Revision: 400305 URL: https://svnweb.freebsd.org/changeset/ports/400305 Log: - Convert to new options helper - Convert to new options target helper Approved by: portmgr (blanket) Modified: head/dns/opendnssec13/Makefile head/dns/opendnssec13/pkg-plist Modified: head/dns/opendnssec13/Makefile ============================================================================== --- head/dns/opendnssec13/Makefile Tue Oct 27 15:53:44 2015 (r400304) +++ head/dns/opendnssec13/Makefile Tue Oct 27 15:53:49 2015 (r400305) @@ -35,46 +35,24 @@ OPTIONS_DEFINE= SOFTHSM AUDITOR MYSQL SOFTHSM_DESC= SoftHSM cryptographic store for PKCS \#11 interface AUDITOR_DESC= Build with Auditor OPTIONS_DEFAULT= AUDITOR +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MMYSQL} -CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} -CONFIGURE_ARGS+= --with-database-backend=mysql -USE_MYSQL= compat -PLIST_SUB+= SQLITE="@comment " -PLIST_SUB+= MYSQL="" -.else -CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} -CONFIGURE_ARGS+= --with-database-backend=sqlite3 -USE_SQLITE= yes -BUILD_DEPENDS+= sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3 -LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3 -PLIST_SUB+= SQLITE="" -PLIST_SUB+= MYSQL="@comment " -.endif - -.if ${PORT_OPTIONS:MAUDITOR} -BUILD_DEPENDS+= rubygem-soap4r>=0:${PORTSDIR}/devel/rubygem-soap4r -BUILD_DEPENDS+= rubygem-dnsruby>=1.53:${PORTSDIR}/dns/rubygem-dnsruby -USE_RUBY= yes -PLIST_SUB+= AUDITOR="" -.else -CONFIGURE_ARGS+= --disable-auditor -PLIST_SUB+= AUDITOR="@comment " -.endif - -.if ${PORT_OPTIONS:MSOFTHSM} -CONFIGURE_ARGS+= --with-softhsm -CONFIGURE_ARGS+= --with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so -RUN_DEPENDS+= softhsm>=1.2.0:${PORTSDIR}/security/softhsm -.endif +AUDITOR_BUILD_DEPENDS= rubygem-soap4r>=0:${PORTSDIR}/devel/rubygem-soap4r \ + rubygem-dnsruby>=1.53:${PORTSDIR}/dns/rubygem-dnsruby +AUDITOR_CONFIGURE_ENABLE= auditor +AUDITOR_USE= RUBY=yes +MYSQL_BUILD_DEPENDS_OFF=sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3 +MYSQL_CONFIGURE_OFF= --with-sqlite3=${LOCALBASE} --with-database-backend=sqlite3 +MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} --with-database-backend=mysql +MYSQL_LIB_DEPENDS_OFF= libsqlite3.so:${PORTSDIR}/databases/sqlite3 +MYSQL_USE= MYSQL=compat +MYSQL_USE_OFF= SQLITE=yes +SOFTHSM_CONFIGURE_ON= --with-softhsm --with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so +SOFTHSM_RUN_DEPENDS= softhsm>=1.2.0:${PORTSDIR}/security/softhsm PKGMESSAGE= ${WRKSRC}/MIGRATION -pre-install: -.if ${PORT_OPTIONS:MMYSQL} - @${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec -.endif +pre-install-MYSQL-on: + ${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' ${WRKDIR}/opendnssec .include Modified: head/dns/opendnssec13/pkg-plist ============================================================================== --- head/dns/opendnssec13/pkg-plist Tue Oct 27 15:53:44 2015 (r400304) +++ head/dns/opendnssec13/pkg-plist Tue Oct 27 15:53:49 2015 (r400305) @@ -38,7 +38,7 @@ sbin/ods-signer sbin/ods-signerd %%DATADIR%%/conf.rnc %%DATADIR%%/conf.rng -%%SQLITE%%%%DATADIR%%/database_create.sqlite3 +%%NO_MYSQL%%%%DATADIR%%/database_create.sqlite3 %%MYSQL%%%%DATADIR%%/database_create.mysql %%DATADIR%%/kasp.rnc %%DATADIR%%/kasp.rng