From wahjava@gmail.com  Fri Jul  2 09:44:13 2010
Return-Path: <wahjava@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 373BF106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  2 Jul 2010 09:44:13 +0000 (UTC)
	(envelope-from wahjava@gmail.com)
Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54])
	by mx1.freebsd.org (Postfix) with ESMTP id BB3FA8FC15
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  2 Jul 2010 09:44:12 +0000 (UTC)
Received: by fxm13 with SMTP id 13so2326125fxm.13
        for <FreeBSD-gnats-submit@freebsd.org>; Fri, 02 Jul 2010 02:44:10 -0700 (PDT)
Received: by 10.223.112.84 with SMTP id v20mr370916fap.68.1278063849788;
        Fri, 02 Jul 2010 02:44:09 -0700 (PDT)
Received: from chateau.d.if ([122.161.226.200])
        by mx.google.com with ESMTPS id y4sm1066834fag.37.2010.07.02.02.44.06
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Fri, 02 Jul 2010 02:44:08 -0700 (PDT)
Received: by chateau.d.if (Postfix, from userid 1001)
	id B1AAA4AF16; Fri,  2 Jul 2010 15:13:59 +0530 (IST)
Message-Id: <20100702094359.B1AAA4AF16@chateau.d.if>
Date: Fri,  2 Jul 2010 15:13:59 +0530 (IST)
From: Ashish SHUKLA <ashish@FreeBSD.org>
Sender: Ashish SHUKLA <wahjava@gmail.com>
Reply-To: Ashish SHUKLA <ashish@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] devel/scons doesn't respect NO_INSTALL_MANPAGES
X-Send-Pr-Version: 3.113
X-GNATS-Notify: paul@querna.org

>Number:         148310
>Category:       ports
>Synopsis:       [PATCH] devel/scons doesn't respect NO_INSTALL_MANPAGES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ashish
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 02 09:50:02 UTC 2010
>Closed-Date:    Sat Sep 11 17:36:49 UTC 2010
>Last-Modified:  Sat Sep 11 17:40:01 UTC 2010
>Originator:     Ashish SHUKLA
>Release:        FreeBSD 8.0-RELEASE-p3 amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD chateau.d.if 8.0-RELEASE-p3 FreeBSD 8.0-RELEASE-p3 #4: Thu May 27 19:12:08 IST 2010 root@chateau.d.if:/usr/obj/usr/src/sys/CHATEAU amd64


>Description:

When tried to install devel/scons with NOPORTDOCS and
NO_INSTALL_MANPAGES defined, I noticed it has installed man pages and
haven't recorded them in the pkg-plist.

--------8<------------8<-----------------
Creating bzip'd tar ball in '/tmp/packages/All/scons-1.3.0.tbz'
Deleting scons-1.3.0
pkg_delete: file '/usr/local/lib/scons-1.3.0/scons-1.3.0-py2.6.egg-info' doesn't exist
pkg_delete: couldn't entirely delete package (perhaps the packing list is
incorrectly specified?)
================================================================

=== Checking filesystem state
list of extra files and directories in / (not present before this port was installed but present after it was deinstalled)
429333        1 -rw-r--r--    1 root             wheel               24768 Mar 24 02:14 usr/local/man/man1/scons-time.1
429331        1 -rw-r--r--    1 root             wheel              395900 Mar 24 02:14 usr/local/man/man1/scons.1
429332        1 -rw-r--r--    1 root             wheel                4711 Mar 24 02:14 usr/local/man/man1/sconsign.1
Deleting python26-2.6.5
--------8<------------8<-----------------

The complete build log is available from the URL:
http://people.freebsd.org/~ashish/logs/scons-1.3.0.log

The attached diff fixes this issue and also removes an entry for the
'egg-info' file from the pkg-plist since its being implicitly recorded
already.

>How-To-Repeat:

% mkdir /var/tmp/$(make -C /usr/ports/devel/scons -V PORTNAME)
% sudo mtree -U -f $(make -C /usr/ports/devel/scons -V MTREE_FILE) -d -e -p /var/tmp/$(make -C /usr/ports/devel/scons -V PORTNAME)
% sudo make -C /usr/ports/devel/scons -DNOPORTDOCS -DNO_INSTALL_MANPAGES install PREFIX=/var/tmp/$(make -C /usr/ports/devel/scons -V PORTNAME)
% sudo make -C /usr/ports/devel/scons -DNOPORTDOCS -DNO_INSTALL_MANPAGES deinstall PREFIX=/var/tmp/$(make -C /usr/ports/devel/scons -V PORTNAME)
% find /var/tmp/$(make -C /usr/ports/devel/scons -V PORTNAME) -type f

>Fix:
diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index 5c4bd70..4b333cd 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -25,4 +25,10 @@ PYDISTUTILS_EGGINFODIR=	${PREFIX}/lib/scons-${PORTVERSION}
 
 PLIST_SUB+=	SCONS_VER=${PORTVERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined (NO_INSTALL_MANPAGES)
+PYDISTUTILS_INSTALLARGS+=	--no-install-man
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/scons/pkg-plist b/devel/scons/pkg-plist
index 2639982..20f7a6d 100644
--- a/devel/scons/pkg-plist
+++ b/devel/scons/pkg-plist
@@ -565,7 +565,6 @@ lib/scons-%%SCONS_VER%%/SCons/dblite.pyo
 lib/scons-%%SCONS_VER%%/SCons/exitfuncs.py
 lib/scons-%%SCONS_VER%%/SCons/exitfuncs.pyc
 lib/scons-%%SCONS_VER%%/SCons/exitfuncs.pyo
-lib/scons-%%SCONS_VER%%/scons-%%SCONS_VER%%-py2.6.egg-info
 @dirrm lib/scons-%%SCONS_VER%%/SCons/compat
 @dirrm lib/scons-%%SCONS_VER%%/SCons/Variables
 @dirrm lib/scons-%%SCONS_VER%%/SCons/Tool/packaging
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ashish 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jul 2 09:50:12 UTC 2010 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148310 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Jul 2 09:50:15 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: paul@querna.org
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148310: [PATCH] devel/scons doesn't respect NO_INSTALL_MANPAGES
Date: Fri, 2 Jul 2010 09:50:14 UT

 Maintainer of devel/scons,
 
 Please note that PR ports/148310 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/148310
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: "Gav..." <gavin@16degrees.com.au>
To: <bug-followup@FreeBSD.org>,
	<ashish@FreeBSD.org>
Cc:  
Subject: Re: ports/148310: [PATCH] devel/scons doesn't respect NO_INSTALL_MANPAGES
Date: Wed, 4 Aug 2010 16:24:08 +1000

 Hi,
 
 I'm looking into this currently. The patch isn't what I'd have expected it
 to look like
 so will test it out.
 
 Gav...
 
 
 

From: "Gav..." <gavin@16degrees.com.au>
To: <bug-followup@FreeBSD.org>,
	<ashish@FreeBSD.org>
Cc:  
Subject: Re: ports/148310: [PATCH] devel/scons doesn't respect NO_INSTALL_MANPAGES
Date: Sun, 5 Sep 2010 18:10:41 +1000

 Hi,
 
 Seems ok to do it this way, there are alternatives but in the interests of
 moving on, carry on with this method.
 
 Thanks
 
 Gav...
 
 

From: ashish@FreeBSD.org (Ashish SHUKLA)
To: "Gav..." <gavin@16degrees.com.au>
Cc: <bug-followup@FreeBSD.org>
Subject: Re: ports/148310: [PATCH] devel/scons doesn't respect NO_INSTALL_MANPAGES
Date: Sun, 05 Sep 2010 14:03:21 +0530

 =2D----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
 Gav  writes:
 > Hi,
 
 > Seems ok to do it this way, there are alternatives but in the interests of
 > moving on, carry on with this method.
 
 Thanks for the reply. I'll get it committed in a day or two.
 
 > Thanks
 
 > Gav...
 
 
 
 =2D --=20
 Ashish SHUKLA      | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
 freebsd.org!ashish | http://people.freebsd.org/~ashish/
 
 Avoid Success At All Costs !!
 =2D----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
 iQIcBAEBCgAGBQJMg1XVAAoJEMdGz6nnT6SwczgP/1+X7ZwklWBPqW3WWA9saGYu
 P0xi0y/xSOfEm1EVGeCAqQESBeZ6gKrXZFlOZqTZ4QkFImlzas0iVh2Q+ps1K1Il
 3WV2f/+kE7OMATSuL9BNS2eGTxwBIL26Usj7o6TkQ/sWqXWGb8EZbMPfpOgO6jSD
 60jEIrcJDHeP8BxXvrmQSWtmTCyosVZn7PJTTZ7Ud8gCVvvxOTLfpGsBYAaUAxAp
 uJkUYc1uXtf+IijWWZJEGruFStNgs4qNM8JcY8Waz+IGMtUYjTNEf8Li1Gd7x0st
 uXUnBaPLouKfjS4kqJjLgnVzstaSuF0R6RXIrwXz2EB/S7tK1pAxPtMqrXArRk+e
 Q4W6wb3bvTdRTkOaHUMFUmTdq9PqZjCr5ex6WawXAwkyFC5QJTIs3MsvCvVcshbx
 GoavxrdcJCPffKTdWlwIt/mEwGZO0FDLDevc6P32nrFoQS7EUrVgK4TOI6vT95Ba
 VR9s+GBfBd0m8X6zAAp4rP10w0Tn1PLUxxZWjIrwPQCFJSzlFXerWE/wKyRSUA/0
 Qy/XOCSGQF5ThqKED+cNvVHgi6Zhdu40/Q8gUjpyS/UdPuQzckUECBROWk8ZzetC
 O5r9jC7dr0gtb4E+urx2u8xGn0E0H2X099T9IDZ6GO4cVfZpUxV9KdQ/hg96qx8s
 LAuq/TVdBMCBWnAP+AkN
 =3Dp8Rp
 =2D----END PGP SIGNATURE-----
State-Changed-From-To: feedback->closed 
State-Changed-By: ashish 
State-Changed-When: Sat Sep 11 17:36:48 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148310: commit references a PR
Date: Sat, 11 Sep 2010 17:36:13 +0000 (UTC)

 ashish      2010-09-11 17:36:08 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/scons          Makefile pkg-plist 
   Log:
   - Fix the port to avoid installing manpages when NO_INSTALL_MANPAGES is defined.
   - Remove the egg-info from the pkg-plist, as it's recorded implicitly.
   
   PR:             ports/148310
   Submitted by:   ashish
   Approved by:    pgj (mentor), gavin at 16degrees.com.au (maintainer)
   
   Revision  Changes    Path
   1.43      +7 -1      ports/devel/scons/Makefile
   1.25      +0 -1      ports/devel/scons/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:
