Date: Sun, 8 Aug 2004 16:46:43 +0800 (CST) From: Cheng-Lung Sung <clsung@dragon2.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sergei@FreeBSD.org Subject: ports/70156: [PATCH] devel/porttools: fix finding original py-/ruby- ports Message-ID: <20040808084643.3FB541557A@mail.dragon2.net> Resent-Message-ID: <200408080850.i788oKjZ025087@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70156
>Category: ports
>Synopsis: [PATCH] devel/porttools: fix finding original py-/ruby- ports
>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: Sun Aug 08 08:50:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Cheng-Lung Sung
>Release: FreeBSD 4.10-RELEASE i386
>Organization:
FreeBSD @ Taiwan
>Environment:
System: FreeBSD sungsung.csie.nctu.edu.tw 4.10-RELEASE FreeBSD 4.10-RELEASE #1: Wed Jun 9 11:27:45 CST
>Description:
- without modify util_diff.in, when finding ORIG_DIR with PKGNAMESUFFIX is
"py-" or "ruby-", will fail...
- also, this fixes "p5-/py-/ruby-" prefix in Synopsis section.
- however, this patch (with 2 sed script) will cause 1~3 sec delay :(
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:
Just copy -R py-/ruby- ports and type 'port diff'.
>Fix:
--- porttools-0.63.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/porttools/files/patch-util_diff.in /home/clsung/porttools/files/patch-util_diff.in
--- /usr/ports/devel/porttools/files/patch-util_diff.in Thu Jan 1 08:00:00 1970
+++ /home/clsung/porttools/files/patch-util_diff.in Sun Aug 8 16:39:36 2004
@@ -0,0 +1,18 @@
+--- util_diff.in.orig Sat Aug 7 06:10:14 2004
++++ util_diff.in Sun Aug 8 16:26:26 2004
+@@ -70,10 +70,12 @@
+ # -d <dir> have been specified
+ # it should be Ports tree location
+ CATEGORY="`make -V CATEGORIES | sed -E 's/^([^ ]+).*$/\1/'`"
+- PKGNAMEPREFIX="`make -V PKGNAMEPREFIX`"
++ PYTHON_SUFFIX="`make -V PYTHON_SUFFIX`"
++ RUBY_SUFFIX="`make -V RUBY_SUFFIX`"
++ PKGNAMEPREFIX="`make -V PKGNAMEPREFIX | sed -E "s,py${PYTHON_SUFFIX}-,py-," | sed -E "s,ruby${RUBY_SUFFIX}-,ruby-,"`"
+ PKGNAMESUFFIX="`make -V PKGNAMESUFFIX`"
+- PORTNAME="`make -V PORTNAME`"
+- ORIG_DIR="${DIFF_MODE}/${CATEGORY}/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}"
++ PORTNAME="${PKGNAMEPREFIX}`make -V PORTNAME`${PKGNAMESUFFIX}"
++ ORIG_DIR="${DIFF_MODE}/${CATEGORY}/${PORTNAME}"
+ else
+ # -d <pattern> have been specified
+ # <pattern> is used to determine original port location
--- porttools-0.63.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?20040808084643.3FB541557A>