From nobody@FreeBSD.org  Mon Mar 19 22:15:04 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D8C9216A407
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Mar 2007 22:15:04 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id C999313C48C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Mar 2007 22:15:04 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l2JMF4L0095495
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Mar 2007 22:15:04 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l2JMA3O6094381;
	Mon, 19 Mar 2007 22:10:03 GMT
	(envelope-from nobody)
Message-Id: <200703192210.l2JMA3O6094381@www.freebsd.org>
Date: Mon, 19 Mar 2007 22:10:03 GMT
From: Robert Gogolok<gogo@cs.uni-sb.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] sysutils/puppet: missing %%PORTDOCS%% prefix
X-Send-Pr-Version: www-3.0

>Number:         110543
>Category:       ports
>Synopsis:       [PATCH] sysutils/puppet: missing %%PORTDOCS%% prefix
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 19 22:20:04 GMT 2007
>Closed-Date:    Wed Mar 21 20:03:03 GMT 2007
>Last-Modified:  Fri Apr 13 13:40:07 GMT 2007
>Originator:     Robert Gogolok
>Release:        FreeBSD 6.1
>Organization:
http://www.robert-gogolok.de
>Environment:
FreeBSD desktop.gogolok.de 6.1-SECURITY FreeBSD 6.1-SECURITY #0: Wed Feb 14 15:33:28 UTC 2007     root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
puppet port doesn't use %%PORTDOCS%% prefix for all documentation files and directories in pkg-plist.

# NOPORTDOCS defined
[/usr/ports/sysutils/puppet]$ make deinstall
==>  Deinstalling for sysutils/puppet
===>   Deinstalling puppet-0.22.1
pkg_delete: file '/usr/local/share/doc/puppet/CHANGELOG' doesn't exist
pkg_delete: file '/usr/local/share/doc/puppet/TODO' doesn't exist
pkg_delete: file '/usr/local/share/doc/puppet/README' doesn't exist
pkg_delete: file '/usr/local/share/doc/puppet/LICENSE' doesn't exist
pkg_delete: file '/usr/local/share/doc/puppet/COPYING' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/bin/sleeper' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/etc/init.d/sleeper' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/etc/puppet/puppetd.conf' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/etc/puppet/fileserver.conf' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/etc/puppet/puppetmasterd.conf' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/etc/puppet/namespaceauth.conf' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/etc/puppet/tagmail.conf' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/etc/otherfile' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/etc/configfile' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/etc/debian-passwd' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/root/etc/debian-syslog.conf' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/allatonce' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/head' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/selectors' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/execs' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/nodes' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/filerecursion' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/components' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/file.bl' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/groups' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/functions' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/fileparsing' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/svncommit' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/filedefaults' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/simpletests' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/assignments' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/relationships' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/importing' doesn't exist
pkg_delete: file '/usr/local/share/examples/puppet/code/one' doesn't exist
pkg_delete: couldn't entirely delete package (perhaps the packing list is
incorrectly specified?)

>How-To-Repeat:
Use NOPORTDOS=yes and install and deinstall the port.
>Fix:
http://w5.cs.uni-sb.de/~gogo/patches/puppet-0.22.1-fix-pkg-plist.patch

Patch attached with submission follows:

Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/puppet/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	6 Mar 2007 20:13:56 -0000	1.1
+++ pkg-plist	19 Mar 2007 21:45:29 -0000
@@ -275,45 +275,45 @@
 @dirrmtry %%RUBY_SITELIBDIR%%/puppet/external
 @dirrmtry %%RUBY_SITELIBDIR%%/puppet/client
 @dirrmtry %%RUBY_SITELIBDIR%%/puppet
-%%DOCSDIR%%/CHANGELOG
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/README
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/root/bin/sleeper
-%%EXAMPLESDIR%%/root/etc/init.d/sleeper
-%%EXAMPLESDIR%%/root/etc/puppet/puppetd.conf
-%%EXAMPLESDIR%%/root/etc/puppet/fileserver.conf
-%%EXAMPLESDIR%%/root/etc/puppet/puppetmasterd.conf
-%%EXAMPLESDIR%%/root/etc/puppet/namespaceauth.conf
-%%EXAMPLESDIR%%/root/etc/puppet/tagmail.conf
-%%EXAMPLESDIR%%/root/etc/otherfile
-%%EXAMPLESDIR%%/root/etc/configfile
-%%EXAMPLESDIR%%/root/etc/debian-passwd
-%%EXAMPLESDIR%%/root/etc/debian-syslog.conf
-%%EXAMPLESDIR%%/code/allatonce
-%%EXAMPLESDIR%%/code/head
-%%EXAMPLESDIR%%/code/selectors
-%%EXAMPLESDIR%%/code/execs
-%%EXAMPLESDIR%%/code/nodes
-%%EXAMPLESDIR%%/code/filerecursion
-%%EXAMPLESDIR%%/code/components
-%%EXAMPLESDIR%%/code/file.bl
-%%EXAMPLESDIR%%/code/groups
-%%EXAMPLESDIR%%/code/functions
-%%EXAMPLESDIR%%/code/fileparsing
-%%EXAMPLESDIR%%/code/svncommit
-%%EXAMPLESDIR%%/code/filedefaults
-%%EXAMPLESDIR%%/code/simpletests
-%%EXAMPLESDIR%%/code/assignments
-%%EXAMPLESDIR%%/code/relationships
-%%EXAMPLESDIR%%/code/importing
-%%EXAMPLESDIR%%/code/one
-@dirrmtry %%EXAMPLESDIR%%/root/bin
-@dirrmtry %%EXAMPLESDIR%%/root/etc/init.d
-@dirrmtry %%EXAMPLESDIR%%/root/etc/puppet
-@dirrmtry %%EXAMPLESDIR%%/root/etc
-@dirrmtry %%EXAMPLESDIR%%/root
-@dirrmtry %%EXAMPLESDIR%%/code
-@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/bin/sleeper
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/init.d/sleeper
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/puppetd.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/fileserver.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/puppetmasterd.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/namespaceauth.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/puppet/tagmail.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/otherfile
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/configfile
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/debian-passwd
+%%PORTDOCS%%%%EXAMPLESDIR%%/root/etc/debian-syslog.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/allatonce
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/head
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/selectors
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/execs
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/nodes
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/filerecursion
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/components
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/file.bl
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/groups
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/functions
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/fileparsing
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/svncommit
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/filedefaults
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/simpletests
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/assignments
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/relationships
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/importing
+%%PORTDOCS%%%%EXAMPLESDIR%%/code/one
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/bin
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc/init.d
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc/puppet
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root/etc
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/root
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/code
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Mar 19 22:20:10 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

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

From: Tomoyuki Sakurai <cherry@trombik.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110543: [PATCH] sysutils/puppet: missing %%PORTDOCS%%
	prefix
Date: Thu, 22 Mar 2007 01:14:15 +0900

 On Mon, Mar 19, 2007 at 10:20:08PM +0000, Edwin Groothuis wrote:
 | Maintainer of sysutils/puppet,
 | 
 | Please note that PR ports/110543 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/110543
 
 The patch has been included in the updated version of the port in
 ports/110618.
 -- 
 Tomoyuki Sakurai - Tomi -
State-Changed-From-To: feedback->closed 
State-Changed-By: linimon 
State-Changed-When: Wed Mar 21 20:02:35 UTC 2007 
State-Changed-Why:  
Superseded by maintainer's patch in ports/110618. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110543: commit references a PR
Date: Fri, 13 Apr 2007 13:37:17 +0000 (UTC)

 lwhsu       2007-04-13 13:37:08 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/puppet      Makefile pkg-plist 
   Added files:
     sysutils/puppet/files puppetd.in puppetmasterd.in 
   Log:
   - Install rc.d scripts [1]
   - Install default config file [1]
   - Add PORTDOCS in pkg-plist [2]
   
   PR:             110618 [1], 110543 [2]
   Submitted by:   Tomoyuki Sakurai <cherry AT trombik.org> (maintainer) [1]
                   Robert Gogolok <gogo AT cs.uni-sb.de> [2]
   Approved by:    clsung (mentor)
   
   Revision  Changes    Path
   1.2       +14 -1     ports/sysutils/puppet/Makefile
   1.1       +27 -0     ports/sysutils/puppet/files/puppetd.in (new)
   1.1       +27 -0     ports/sysutils/puppet/files/puppetmasterd.in (new)
   1.2       +46 -42    ports/sysutils/puppet/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
