From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 26 17:00:36 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 19D0916A4CE for ; Tue, 26 Apr 2005 17:00:36 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9C1E43D58 for ; Tue, 26 Apr 2005 17:00:35 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j3QH0ZIa012427 for ; Tue, 26 Apr 2005 17:00:35 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j3QH0ZUA012420; Tue, 26 Apr 2005 17:00:35 GMT (envelope-from gnats) Resent-Date: Tue, 26 Apr 2005 17:00:35 GMT Resent-Message-Id: <200504261700.j3QH0ZUA012420@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, Radim Kolar Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 964E416A4CE; Tue, 26 Apr 2005 16:55:14 +0000 (GMT) Received: from smtp3.vol.cz (smtp3.vol.cz [195.250.128.83]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9454F43D45; Tue, 26 Apr 2005 16:55:13 +0000 (GMT) (envelope-from hsn@netmag.cz) Received: from sanatana.dharma (volny-ipt-3-60.dialup.vol.cz [62.177.66.60]) by smtp3.vol.cz (8.12.9p2/8.12.9) with ESMTP id j3QGtAIV027820; Tue, 26 Apr 2005 18:55:11 +0200 (CEST) (envelope-from hsn@netmag.cz) Received: from hsn@localhost by sanatana.dharma (Exim 4.42_0 FreeBSD) id 1DQQex-0002Vp-VN ; Tue, 26 Apr 2005 16:03:32 +0200 Message-Id: Date: Tue, 26 Apr 2005 16:03:31 +0200 From: Radim Kolar To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: mich@FreeBSD.org Subject: ports/80368: [PATCH] misc/portell: merge ignoredir patch 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, 26 Apr 2005 17:00:36 -0000 >Number: 80368 >Category: ports >Synopsis: [PATCH] misc/portell: merge ignoredir patch >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: Tue Apr 26 17:00:35 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Radim Kolar >Release: FreeBSD 5.4-STABLE i386 >Organization: Sanatana Dharma >Environment: System: FreeBSD sanatana.dharma 5.4-STABLE FreeBSD 5.4-STABLE #4: Sun Apr 24 17:00:25 CEST 2005 >Description: Merge old patch for ignoring certain directories during portell -u This fix problems with packages like atari800 because portell looks for description file in ~ports/distfiles/atari800 instead. Removed pkg-plist file Added file(s): - files/patch-aa Removed file(s): - pkg-plist Port maintainer (mich@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- portell-0.2_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/misc/portell/Makefile /home/hsn/hacked/portell/Makefile --- /usr/ports/misc/portell/Makefile Sun Apr 17 18:43:47 2005 +++ /home/hsn/hacked/portell/Makefile Tue Apr 26 15:58:09 2005 @@ -7,6 +7,7 @@ PORTNAME= portell PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,6 +20,9 @@ USE_PYTHON= YES USE_REINPLACE= YES NO_BUILD= YES + +PLIST_FILES= bin/portell +PORTDOCS= README.txt post-extract: ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/portell.py diff -ruN --exclude=CVS /usr/ports/misc/portell/files/patch-aa /home/hsn/hacked/portell/files/patch-aa --- /usr/ports/misc/portell/files/patch-aa Thu Jan 1 01:00:00 1970 +++ /home/hsn/hacked/portell/files/patch-aa Tue Apr 26 15:47:47 2005 @@ -0,0 +1,23 @@ +--- portell.py.bak Tue Apr 26 15:40:41 2005 ++++ portell.py Tue Apr 26 15:46:17 2005 +@@ -14,12 +14,16 @@ + PORTELL_DB = "/var/db/portell.db" + + PORTS_DIR = "/usr/ports/" +- ++IGNORE_DIRS = { "distfiles":None, "Tools":None, "packages":None } + + def write_pathname(d, dirname, names): +- '/'.join(dirname.split('/')[:5]) # chop port path subdirs +- d[os.path.basename(dirname)] = dirname +- ++ dirs=dirname.split('/') ++ if len(dirs)==4: ++ if IGNORE_DIRS.has_key(dirs[3]): ++ del names[:] ++ elif len(dirs)==5: ++ d[dirs[4]] = dirname ++ del names[:] + + def update_db(msg): + print msg diff -ruN --exclude=CVS /usr/ports/misc/portell/pkg-plist /home/hsn/hacked/portell/pkg-plist --- /usr/ports/misc/portell/pkg-plist Mon Aug 11 16:50:31 2003 +++ /home/hsn/hacked/portell/pkg-plist Thu Jan 1 01:00:00 1970 @@ -1,3 +0,0 @@ -bin/portell -%%PORTDOCS%%%%DOCSDIR%%/README.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% --- portell-0.2_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: