From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 2 09:20:18 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 3609416A419 for ; Tue, 2 May 2006 09:20:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28AAA43D49 for ; Tue, 2 May 2006 09:20:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k429KGVG043378 for ; Tue, 2 May 2006 09:20:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k429KGf5043377; Tue, 2 May 2006 09:20:16 GMT (envelope-from gnats) Resent-Date: Tue, 2 May 2006 09:20:16 GMT Resent-Message-Id: <200605020920.k429KGf5043377@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, Cheng-Lung Sung Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8A52216A401; Tue, 2 May 2006 09:19:54 +0000 (UTC) (envelope-from clsung@FreeBSD.csie.nctu.edu.tw) Received: from FreeBSD.csie.nctu.edu.tw (freebsd.csie.nctu.edu.tw [140.113.17.209]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DB2743D53; Tue, 2 May 2006 09:19:54 +0000 (GMT) (envelope-from clsung@FreeBSD.csie.nctu.edu.tw) Received: from localhost (localhost.csie.nctu.edu.tw [127.0.0.1]) by FreeBSD.csie.nctu.edu.tw (Postfix) with ESMTP id 99A297EA4A; Tue, 2 May 2006 17:20:28 +0800 (CST) Received: from FreeBSD.csie.nctu.edu.tw ([127.0.0.1]) by localhost (FreeBSD.csie.nctu.edu.tw [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nsKM74UWaed3; Tue, 2 May 2006 17:20:27 +0800 (CST) Received: by FreeBSD.csie.nctu.edu.tw (Postfix, from userid 1038) id CC89B7EA4E; Tue, 2 May 2006 17:20:27 +0800 (CST) Message-Id: <20060502092027.CC89B7EA4E@FreeBSD.csie.nctu.edu.tw> Date: Tue, 2 May 2006 17:20:27 +0800 (CST) From: Cheng-Lung Sung To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: vd@FreeBSD.org Subject: ports/96649: [patch] Tools/scripts/rmport: rmport can not execute under category/ X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Cheng-Lung Sung List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2006 09:20:18 -0000 >Number: 96649 >Category: ports >Synopsis: [patch] Tools/scripts/rmport: rmport can not execute under category/ >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 May 02 09:20:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Cheng-Lung Sung >Release: FreeBSD 6.1-PRERELEASE i386 >Organization: FreeBSD @ Taiwan >Environment: System: FreeBSD FreeBSD.csie.nctu.edu.tw 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #7: Thu Apr 13 03:20:20 CST 2006 root@FreeBSD.csie.nctu.edu.tw:/home/usr.obj/usr/src/sys/FREEBSD i386 >Description: when execute rmport under ports category, it will failed with "No such file or direcotyr", unlike common usage in addport So I suggest a patch that will not affect original behaivor, but will help us when running the command under ports category. maintainer is cc'ed. >How-To-Repeat: % cd ports/textproc; rmport -d p5-Template-Magic/ make: chdir /usr/ports/p5-Template-Magic/: No such file or directory >Fix: --- /usr/ports/Tools/scripts/rmport Tue Apr 18 03:32:12 2006 +++ ./rmport Tue May 2 17:05:53 2006 @@ -54,6 +54,18 @@ make -C ${PORTSDIR}/${1} -V PKGNAME } +# if execute under some category +find_category() +{ + catport=${1} + if [ -d "${PORTSDIR}/${catport}" ] ; then + echo ${catport} + else + cat=`pwd | xargs basename` + echo ${cat}/${catport} + fi +} + find_expired() { EXPVAR=EXPIRATION_DATE @@ -273,7 +285,7 @@ if [ ${#} -ne 2 ] ; then usage fi - catport=${2} + catport=`find_category ${2}` check_dep ${catport} 0 ${catport} exit fi @@ -292,6 +304,7 @@ co_common for catport in $* ; do + catport=`find_category ${catport}` cat=`dirname ${catport}` port=`basename ${catport}` # remove any trailing slashes >Release-Note: >Audit-Trail: >Unformatted: