From sunpoet@sunpoet.net  Fri Jun 25 08:43:24 2010
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A10C106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 25 Jun 2010 08:43:24 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from mail-pv0-f182.google.com (mail-pv0-f182.google.com [74.125.83.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 5AAB78FC20
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 25 Jun 2010 08:43:24 +0000 (UTC)
Received: by pvg6 with SMTP id 6so743069pvg.13
        for <FreeBSD-gnats-submit@freebsd.org>; Fri, 25 Jun 2010 01:43:23 -0700 (PDT)
Received: by 10.142.201.15 with SMTP id y15mr386654wff.247.1277455403200;
        Fri, 25 Jun 2010 01:43:23 -0700 (PDT)
Received: from sunpoet.net (sunpoet.net [220.133.12.240])
        by mx.google.com with ESMTPS id x35sm5019267wfh.18.2010.06.25.01.43.21
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Fri, 25 Jun 2010 01:43:22 -0700 (PDT)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 6AA362AEC60A; Fri, 25 Jun 2010 16:43:41 +0800 (CST)
Message-Id: <20100625084341.6AA362AEC60A@sunpoet.net>
Date: Fri, 25 Jun 2010 16:43:41 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] databases/pgsphere: fix deinstallation when NOPORTDOCS is set
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         148135
>Category:       ports
>Synopsis:       [MAINTAINER] databases/pgsphere: fix deinstallation when NOPORTDOCS is set
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sylvio
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 25 08:50:01 UTC 2010
>Closed-Date:    Wed Jun 30 11:39:57 UTC 2010
>Last-Modified:  Wed Jun 30 11:50:04 UTC 2010
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Sun Jun 20 12:49:47 CST 2010
>Description:
This PR handles @comment (%%PORTDOCS%% when NOPORTDOCS) entries in $PLIST_DIRS.
Before @comment handling in bsd.port.mk (PR/147476) being committed, This PR fixes deinstallion when NOPORTDOCS is set.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:

ports/databases/pgsphere with NOPORTDOCS=yes.

% cd /usr/ports/databases/pgsphere
% make -V PLIST_DIRS
%%DATADIR%%/contrib %%PORTDOCS%%%%DOCSDIR%%/contrib
% make NOPORTDOCS=yes install deinstall
...
===> Deinstalling for databases/pgsphere
===> Deinstalling pgsphere-1.1.1
pkg_delete: file '/usr/local/@comment share/doc/postgresql/contrib' doesn't exist
pkg_delete: unable to completely remove directory '/usr/local/@comment share/doc/postgresql/contrib'
pkg_delete: couldn't entirely delete package (perhaps the packing list is incorrectly specified?)
% cat `make -V TMPPLIST`
lib/postgresql/pg_sphere.so
share/postgresql/contrib/pg_sphere.sql
@comment share/doc/postgresql/contrib/README.pg_sphere
@comment share/doc/postgresql/contrib/COPYRIGHT.pg_sphere
@dirrm share/postgresql/contrib
@dirrm @comment share/doc/postgresql/contrib
@exec /sbin/ldconfig -m /usr/local/lib
@unexec /sbin/ldconfig -R

>Fix:

--- pgsphere-1.1.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/pgsphere/Makefile /usr/ports/sunpoet/pgsphere/Makefile
--- /usr/ports/databases/pgsphere/Makefile	2010-03-06 12:59:31.000000000 +0800
+++ /usr/ports/sunpoet/pgsphere/Makefile	2010-06-25 16:38:01.000000000 +0800
@@ -27,12 +27,14 @@
 .endif
 
 PLIST_FILES=	lib/postgresql/pg_sphere.so \
-		%%DATADIR%%/contrib/pg_sphere.sql \
-		%%PORTDOCS%%%%DOCSDIR%%/contrib/README.pg_sphere \
-		%%PORTDOCS%%%%DOCSDIR%%/contrib/COPYRIGHT.pg_sphere
+		%%DATADIR%%/contrib/pg_sphere.sql
+PLIST_DIRS=	%%DATADIR%%/contrib
 
-PLIST_DIRS=	%%DATADIR%%/contrib \
-		%%PORTDOCS%%%%DOCSDIR%%/contrib
+.if !defined(NOPORTDOCS)
+PLIST_FILES+=	%%DOCSDIR%%/contrib/README.pg_sphere \
+		%%DOCSDIR%%/contrib/COPYRIGHT.pg_sphere
+PLIST_DIRS+=	%%DOCSDIR%%/contrib
+.endif
 
 #regression-test:
 #	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} installcheck
--- pgsphere-1.1.1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Mon Jun 28 16:11:16 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148135 
State-Changed-From-To: open->closed 
State-Changed-By: sylvio 
State-Changed-When: Wed Jun 30 11:39:56 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148135: commit references a PR
Date: Wed, 30 Jun 2010 11:40:09 +0000 (UTC)

 sylvio      2010-06-30 11:39:47 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/pgsphere   Makefile 
   Log:
   - Fix deinstallation when NOPORTDOCS is set.
   
   PR:             ports/148135
   Submitted by:   Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> (maintainer)
   Feature safe:   yes
   
   Revision  Changes    Path
   1.3       +7 -5      ports/databases/pgsphere/Makefile
 _______________________________________________
 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:
