From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 25 01:00:44 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AECB16A4D4 for ; Tue, 25 Jan 2005 01:00:44 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5568C43D3F for ; Tue, 25 Jan 2005 01:00:44 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j0P10iNm026421 for ; Tue, 25 Jan 2005 01:00:44 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j0P10ih8026419; Tue, 25 Jan 2005 01:00:44 GMT (envelope-from gnats) Resent-Date: Tue, 25 Jan 2005 01:00:44 GMT Resent-Message-Id: <200501250100.j0P10ih8026419@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Danny Pansters Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59A5516A4D1; Tue, 25 Jan 2005 00:50:33 +0000 (GMT) Received: from smtpq1.home.nl (smtpq1.home.nl [213.51.128.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0263543D2D; Tue, 25 Jan 2005 00:50:32 +0000 (GMT) (envelope-from danny@ricin.com) Received: from [213.51.128.136] (port=41476 helo=smtp5.home.nl) by smtpq1.home.nl with esmtp (Exim 4.30) id 1CtEuc-0006N2-St; Tue, 25 Jan 2005 01:50:30 +0100 Received: from cp464173-a.dbsch1.nb.home.nl ([84.27.215.228]:64624) by smtp5.home.nl with smtp (Exim 4.30) id 1CtEub-0001Yc-LY; Tue, 25 Jan 2005 01:50:29 +0100 Received: by cp464173-a.dbsch1.nb.home.nl (sSMTP sendmail emulation); Tue, 25 Jan 2005 01:50:19 +0100 Message-Id: <20050125005032.0263543D2D@mx1.FreeBSD.org> Date: Tue, 25 Jan 2005 01:50:19 +0100 From: Danny Pansters To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: danny@ricin.com cc: sergei@FreeBSD.org Subject: ports/76638: [PATCH] devel/porttools: "port submit" has problems with py-* X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jan 2005 01:00:44 -0000 >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//py-foo.new where my updated port is I run "port submit" and it can't find the original /usr/ports//py24-foo, which should be just /usr/ports//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