Date: Wed, 1 Feb 2012 15:57:50 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gavin@16degrees.com.au Subject: ports/164685: [PATCH] devel/scons: remove duplicated entry of egg-info Message-ID: <20120201075750.C1A3D4065@sunpoet.net> Resent-Message-ID: <201202010800.q1180bO4054846@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 164685
>Category: ports
>Synopsis: [PATCH] devel/scons: remove duplicated entry of egg-info
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 01 08:00:35 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 9.0-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Sun Jan 29 23:36:49 CST 2012
>Description:
- Remove duplicated entry of egg-info
PYDISTUTILS_EGGINFO was added to PLIST by bsd.python.mk.
We shall not add it to pkg-plist.
Port maintainer (gavin@16degrees.com.au) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
% cd /usr/ports/devel/scons/
% make generate-plist
% grep egg-info `make -V WRKDIR`/.PLIST.mktmp
lib/scons-2.1.0/scons-2.1.0-py2.7.egg-info
lib/scons-2.1.0/scons-2.1.0-py2.7.egg-info
>Fix:
--- scons-2.1.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/scons/Makefile,v
retrieving revision 1.45
diff -u -u -r1.45 Makefile
--- Makefile 30 Jan 2012 09:08:55 -0000 1.45
+++ Makefile 1 Feb 2012 07:51:28 -0000
@@ -23,8 +23,7 @@
USE_PYDISTUTILS= yes
PYDISTUTILS_EGGINFODIR= ${PREFIX}/lib/scons-${PORTVERSION}
-PLIST_SUB+= SCONS_VER=${PORTVERSION} \
- PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO}
+PLIST_SUB+= SCONS_VER=${PORTVERSION}
.include <bsd.port.pre.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/scons/pkg-plist,v
retrieving revision 1.27
diff -u -u -r1.27 pkg-plist
--- pkg-plist 30 Jan 2012 09:08:55 -0000 1.27
+++ pkg-plist 1 Feb 2012 07:51:28 -0000
@@ -559,7 +559,6 @@
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%%/%%PYDISTUTILS_EGGINFO%%
@dirrm lib/scons-%%SCONS_VER%%/SCons/compat
@dirrm lib/scons-%%SCONS_VER%%/SCons/Variables
@dirrm lib/scons-%%SCONS_VER%%/SCons/Tool/packaging
--- scons-2.1.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120201075750.C1A3D4065>