Date: Tue, 25 Jan 2005 01:50:19 +0100 From: Danny Pansters <danny@ricin.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sergei@FreeBSD.org Subject: ports/76638: [PATCH] devel/porttools: "port submit" has problems with py-* Message-ID: <20050125005032.0263543D2D@mx1.FreeBSD.org> Resent-Message-ID: <200501250100.j0P10ih8026419@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76638
>Category: ports
>Synopsis: [PATCH] devel/porttools: "port submit" has problems with py-*
>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: Tue Jan 25 01:00:43 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Danny Pansters
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD workstation.homenet 5.3-STABLE FreeBSD 5.3-STABLE #2: Fri Jan 21 19:51:02 CET 2005
>Description:
Many ports with python bindings and the like use a version-numbered PKGNAMEPREFIX,
e.g. py24-foo, while the ports origin is and remains py-foo. So if I go into
/usr/ports/<cat>/py-foo.new where my updated port is I run "port submit" and
it can't find the original /usr/ports/<cat>/py24-foo, which should be just
/usr/ports/<cat>/py-foo. The attached patch is really just partial because it
makes sending a PR work but doesn't change what's printed in the the synopsis
line and at the start of the quoted diff (both cosmetics though). It would be
nice if the numbered naming prefix as used with python ports would be taken
into account in porttools.
Added file(s):
- files/patch-util_diff.in
Port maintainer (sergei@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
Just one way to do it...
--- porttools-0.63_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/porttools/files/patch-util_diff.in /usr/ports/devel/porttools.new/files/patch-util_diff.in
--- /usr/ports/devel/porttools/files/patch-util_diff.in Thu Jan 1 01:00:00 1970
+++ /usr/ports/devel/porttools.new/files/patch-util_diff.in Tue Jan 25 00:36:25 2005
@@ -0,0 +1,14 @@
+--- util_diff.in.orig Tue Jan 25 00:21:19 2005
++++ util_diff.in Tue Jan 25 00:23:07 2005
+@@ -71,6 +71,11 @@
+ # it should be Ports tree location
+ CATEGORY="`make -V CATEGORIES | sed -E 's/^([^ ]+).*$/\1/'`"
+ PKGNAMEPREFIX="`make -V PKGNAMEPREFIX`"
++ # Python ports, e.g. py24-foo pkg vs py-foo origin
++ if [ "`echo ${PKGNAMEPREFIX} | sed -E 's/[0-9]//g'`" = "py-" ]
++ then
++ PKGNAMEPREFIX="py-"
++ fi
+ PKGNAMESUFFIX="`make -V PKGNAMESUFFIX`"
+ PORTNAME="`make -V PORTNAME`"
+ ORIG_DIR="${DIFF_MODE}/${CATEGORY}/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}"
--- porttools-0.63_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
ports
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050125005032.0263543D2D>