ports/80368: [PATCH] misc/portell: merge ignoredir patch

Radim Kolar hsn at netmag.cz
Tue Apr 26 17:00:36 UTC 2005


>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 at 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:



More information about the freebsd-ports-bugs mailing list