From erwin@mail.droso.net  Thu May 15 00:25:10 2014
Return-Path: <erwin@mail.droso.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id C1A65766
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 May 2014 00:25:10 +0000 (UTC)
Received: from mail.droso.net (koala.droso.dk [213.239.220.246])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mx1.freebsd.org (Postfix) with ESMTPS id 1F6A92A99
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 May 2014 00:25:09 +0000 (UTC)
Received: by mail.droso.net (Postfix, from userid 1001)
	id 4F45213CB9; Thu, 15 May 2014 02:25:01 +0200 (CEST)
Message-Id: <20140515002501.4F45213CB9@mail.droso.net>
Date: Thu, 15 May 2014 02:25:01 +0200 (CEST)
From: Erwin Lansing <erwin@FreeBSD.org>
Reply-To: Erwin Lansing <erwin@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [dns/opendnssec]Finalize stagifying 
X-Send-Pr-Version: 3.114
X-GNATS-Notify: jaap@NLnetLabs.nl

>Number:         189823
>Category:       ports
>Synopsis:       dns/opendnssec: Finalize stagifying
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    erwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 15 00:30:00 UTC 2014
>Closed-Date:    Thu May 15 15:58:39 UTC 2014
>Last-Modified:  Thu May 15 16:00:00 UTC 2014
>Originator:     Erwin Lansing
>Release:        FreeBSD 9.2-RELEASE-p5 amd64
>Organization:
DK Hostmaster A/S 
>Environment:
System: FreeBSD koala.droso.dk 9.2-RELEASE-p5 FreeBSD 9.2-RELEASE-p5 #0: Tue Apr 29 19:09:13 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:

Fix some outstanding issues with staging and make it work with both
pkg_install and pkgng.  PORTDATA is a bit too magical for the current
use, so I moved the sqlite/mysql dependent files into a new variable
SCRIPTDATA, though the name is arbitrary.


>How-To-Repeat:
	
>Fix:

	

--- odns-stage2.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 354095)
+++ Makefile	(working copy)
@@ -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 @@
 .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 @@
 .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>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 354095)
+++ pkg-plist	(working copy)
@@ -3,14 +3,10 @@
 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 @@
 %%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-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
--- odns-stage2.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu May 15 00:30:05 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189823 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jaap@NLnetLabs.nl
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/189823: [dns/opendnssec]Finalize stagifying
Date: Thu, 15 May 2014 00:30:04 UT

 Maintainer of dns/opendnssec,
 
 Please note that PR ports/189823 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/189823
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->erwin 
Responsible-Changed-By: erwin 
Responsible-Changed-When: Thu May 15 01:42:36 UTC 2014 
Responsible-Changed-Why:  
My PR 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189823 

From: Jaap Akkerhuis <jaap@NLnetLabs.nl>
To: bug-followup@FreeBSD.org, Edwin Groothuis <edwin@FreeBSD.org>
Cc:  
Subject: Re: ports/189823: [dns/opendnssec]Finalize stagifying
Date: Thu, 15 May 2014 17:35:35 +0200

     Maintainer of dns/opendnssec,
     
     Please note that PR ports/189823 has just been submitted.
     
     If it contains a patch for an upgrade, an enhancement or a bug fix
     you agree on, reply to this email stating that you approve the patch
     and a committer will take care of it.
     
 Yeah, seems fine to me. Approved
 
 	jaap
State-Changed-From-To: feedback->closed 
State-Changed-By: erwin 
State-Changed-When: Thu May 15 15:58:35 UTC 2014 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189823 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/189823: commit references a PR
Date: Thu, 15 May 2014 15:58:37 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
