ports/148135: [MAINTAINER] databases/pgsphere: fix deinstallation when NOPORTDOCS is set

Sunpoet Po-Chuan Hsieh sunpoet at sunpoet.net
Fri Jun 25 08:50:02 UTC 2010


>Number:         148135
>Category:       ports
>Synopsis:       [MAINTAINER] databases/pgsphere: fix deinstallation when NOPORTDOCS is set
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 25 08:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



More information about the freebsd-ports-bugs mailing list