Date: Thu, 15 May 2014 15:58:32 +0000 (UTC) From: Erwin Lansing <erwin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354148 - head/dns/opendnssec Message-ID: <201405151558.s4FFwWXA064048@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: erwin Date: Thu May 15 15:58:32 2014 New Revision: 354148 URL: http://svnweb.freebsd.org/changeset/ports/354148 QAT: https://qat.redports.org/buildarchive/r354148/ Log: Fix some outstanding issues with staging and make it work with both pkg_install and pkgng. PR: 189823 Submitted by: erwin Prodded by: swills Approved by: Jaap Akkerhuis <jaap@NLnetLabs.nl> (maintainer) Modified: head/dns/opendnssec/Makefile head/dns/opendnssec/pkg-plist Modified: head/dns/opendnssec/Makefile ============================================================================== --- head/dns/opendnssec/Makefile Thu May 15 15:52:10 2014 (r354147) +++ head/dns/opendnssec/Makefile Thu May 15 15:58:32 2014 (r354148) @@ -3,6 +3,7 @@ PORTNAME= opendnssec PORTVERSION= 1.4.5 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://dist.opendnssec.org/source/ @@ -47,13 +48,13 @@ SQLITE_USE= yes .if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --with-database-backend=mysql USE_MYSQL= compat -PORTDATA= migrate_adapters_1.mysql migrate_keyshare_mysql.pl \ +SCRIPTDATA= migrate_adapters_1.mysql migrate_keyshare_mysql.pl \ migrate_zone_delete.mysql migrate_id_mysql.pl migrate_to_ng_mysql.pl .endif .if ${PORT_OPTIONS:MSQLITE} BUILD_DEPENDS+= sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3 -PORTDATA= database_create.sqlite3 migrate_keyshare_sqlite3.pl \ +SCRIPTDATA= database_create.sqlite3 migrate_keyshare_sqlite3.pl \ migrate_adapters_1.sqlite3 migrate_to_ng_sqlite.pl .endif @@ -77,7 +78,7 @@ post-install: .if !defined(BATCH) @${CAT} ${PKGMESSAGE} .endif - ${INSTALL_DATA} ${PORTDATA:S|^|${WRKSRC}/enforcer/utils/|} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${SCRIPTDATA:S|^|${WRKSRC}/enforcer/utils/|} ${STAGEDIR}${DATADIR} # ${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/opendnssec .include <bsd.port.mk> Modified: head/dns/opendnssec/pkg-plist ============================================================================== --- head/dns/opendnssec/pkg-plist Thu May 15 15:52:10 2014 (r354147) +++ head/dns/opendnssec/pkg-plist Thu May 15 15:58:32 2014 (r354148) @@ -3,14 +3,10 @@ bin/ods-hsmutil bin/ods-kaspcheck bin/ods-ksmutil bin/ods-kasp2html -@unexec if cmp -s %D/etc/opendnssec/addns.xml %D/etc/opendnssec/addns.xml.sample; then rm -f %D/etc/opendnssec/addns.xml; fi -%%ETCDIR%%/addns.xml.sample -@unexec if cmp -s %D/etc/opendnssec/conf.xml %D/etc/opendnssec/conf.xml.sample; then rm -f %D/etc/opendnssec/conf.xml; fi -%%ETCDIR%%/conf.xml.sample -@unexec if cmp -s %D/etc/opendnssec/kasp.xml %D/etc/opendnssec/kasp.xml.sample; then rm -f %D/etc/opendnssec/kasp.xml; fi -%%ETCDIR%%/kasp.xml.sample -@unexec if cmp -s %D/etc/opendnssec/zonelist.xml %D/etc/opendnssec/zonelist.xml.sample; then rm -f %D/etc/opendnssec/zonelist.xml; fi -%%ETCDIR%%/zonelist.xml.sample +@sample %%ETCDIR%%/addns.xml.sample +@sample %%ETCDIR%%/conf.xml.sample +@sample %%ETCDIR%%/kasp.xml.sample +@sample %%ETCDIR%%/zonelist.xml.sample sbin/ods-control sbin/ods-enforcerd sbin/ods-signer @@ -26,6 +22,14 @@ sbin/ods-signerd %%DATADIR%%/kasp.rnc %%DATADIR%%/kasp.rng %%DATADIR%%/kasp2html.xsl +%%SQLITE%%%%DATADIR%%/migrate_adapters_1.sqlite3 +%%SQLITE%%%%DATADIR%%/migrate_keyshare_sqlite3.pl +%%SQLITE%%%%DATADIR%%/migrate_to_ng_sqlite.pl +%%MYSQL%%%%DATADIR%%/migrate_adapters_1.mysql +%%MYSQL%%%%DATADIR%%/migrate_keyshare_mysql.pl +%%MYSQL%%%%DATADIR%%/migrate_zone_delete.mysql +%%MYSQL%%%%DATADIR%%/migrate_id_mysql.pl +%%MYSQL%%%%DATADIR%%/migrate_to_ng_mysql.pl %%DATADIR%%/signconf.rnc %%DATADIR%%/signconf.rng %%DATADIR%%/zonelist.rnc @@ -40,18 +44,22 @@ man/man8/ods-control.8.gz man/man8/ods-enforcerd.8.gz man/man8/ods-signer.8.gz man/man8/ods-signerd.8.gz -@exec chown opendnssec:opendnssec %D/var/opendnssec/unsigned -@exec chown opendnssec:opendnssec %D/var/opendnssec/tmp -@exec chown opendnssec:opendnssec %D/var/opendnssec/signed -@exec chown opendnssec:opendnssec %D/var/opendnssec/signconf -@dirrm var/opendnssec +@owner opendnssec +@group opendnssec +@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/unsigned +@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/tmp +@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/signed +@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/signconf @dirrm var/opendnssec/unsigned @dirrm var/opendnssec/tmp @dirrm var/opendnssec/signed @dirrm var/opendnssec/signconf @dirrm var/opendnssec +@owner root +@group wheel @dirrm %%DATADIR%% @dirrm %%ETCDIR%% +@exec mkdir -p %D/var/run/opendnssec @dirrmtry var/run/opendnssec @dirrmtry var/run @dirrmtry var
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405151558.s4FFwWXA064048>