Date: Fri, 2 Jul 2010 15:13:59 +0530 (IST) From: Ashish SHUKLA <ashish@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/148310: [PATCH] devel/scons doesn't respect NO_INSTALL_MANPAGES Message-ID: <20100702094359.B1AAA4AF16@chateau.d.if> Resent-Message-ID: <201007020950.o629o2u5044625@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148310 >Category: ports >Synopsis: [PATCH] devel/scons doesn't respect NO_INSTALL_MANPAGES >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jul 02 09:50:02 UTC 2010 >Closed-Date: >Last-Modified: >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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100702094359.B1AAA4AF16>