From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 9 16:10:08 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5AB6106568E for ; Fri, 9 Apr 2010 16:10:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 95C458FC20 for ; Fri, 9 Apr 2010 16:10:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o39GA8Rf002882 for ; Fri, 9 Apr 2010 16:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o39GA8En002881; Fri, 9 Apr 2010 16:10:08 GMT (envelope-from gnats) Resent-Date: Fri, 9 Apr 2010 16:10:08 GMT Resent-Message-Id: <201004091610.o39GA8En002881@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, giacomomariani@yahoo.it Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3AC8F106564A for ; Fri, 9 Apr 2010 10:41:47 +0000 (UTC) (envelope-from jack@die191.ing.unibo.it) Received: from die191.ing.unibo.it (die191.ing.unibo.it [137.204.63.191]) by mx1.freebsd.org (Postfix) with ESMTP id 899EC8FC23 for ; Fri, 9 Apr 2010 10:41:46 +0000 (UTC) Received: from die191.ing.unibo.it (localhost [127.0.0.1]) by die191.ing.unibo.it (8.14.2/8.14.2) with ESMTP id o39ALF26054484 for ; Fri, 9 Apr 2010 12:21:15 +0200 (CEST) (envelope-from jack@die191.ing.unibo.it) Received: (from jack@localhost) by die191.ing.unibo.it (8.14.2/8.14.2/Submit) id o39ALFu4054483; Fri, 9 Apr 2010 12:21:15 +0200 (CEST) (envelope-from jack) Message-Id: <201004091021.o39ALFu4054483@die191.ing.unibo.it> Date: Fri, 9 Apr 2010 12:21:15 +0200 (CEST) From: giacomomariani@yahoo.it To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/145577: Added a patch to avoid a problem with the variable with used by python X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: giacomomariani@yahoo.it List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2010 16:10:08 -0000 >Number: 145577 >Category: ports >Synopsis: Added a patch to avoid a problem with the variable with used by python >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Apr 09 16:10:08 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Giacomo Mariani >Release: FreeBSD 6.3-RELEASE-p13 i386 >Organization: nothing >Environment: System: FreeBSD die191.ing.unibo.it 6.3-RELEASE-p13 FreeBSD 6.3-RELEASE-p13 #0: Thu Oct 1 22:14:44 UTC 2009 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Added a patch to avoid a problem with the variable with. It arose with python 2.6 because the considered variable, used by the port, is also used by python. >How-To-Repeat: >Fix: --- fvwm-crystal.diff begins here --- diff -ruN fvwm-crystal.bak/Makefile fvwm-crystal/Makefile --- fvwm-crystal.bak/Makefile 2010-03-28 08:47:40.000000000 +0200 +++ fvwm-crystal/Makefile 2010-04-09 12:01:22.000000000 +0200 @@ -76,6 +76,7 @@ post-patch: @${REINPLACE_CMD} -e 's|cp -r -d|cp -r|; s|cp -d|cp|' \ ${WRKSRC}/${MAKEFILE} + patch ./work/fvwm-crystal-3.0.6/bin/fvwm-crystal.apps < files/fvwm-crystal.apps.diff .for i in addons/* bin/* fvwm/scripts/speed_value @${REINPLACE_CMD} -e 's|/bin/bash|${PREFIX}/bin/bash|g' ${WRKSRC}/${i} @${FIND} ${WRKSRC} -name '*.bak' -delete diff -ruN fvwm-crystal.bak/files/fvwm-crystal.apps.diff fvwm-crystal/files/fvwm-crystal.apps.diff --- fvwm-crystal.bak/files/fvwm-crystal.apps.diff 1970-01-01 01:00:00.000000000 +0100 +++ fvwm-crystal/files/fvwm-crystal.apps.diff 2010-04-09 12:01:22.000000000 +0200 @@ -0,0 +1,74 @@ +--- fvwm-crystal.apps_old 2008-06-23 23:42:54.000000000 +0300 ++++ fvwm-crystal.apps_new 2010-03-22 14:07:57.000000000 +0200 +@@ -102,7 +102,7 @@ + group = OptionGroup(parser, "General creation options", "Options definig what should be generated") + # group.add_option('-g', '--generate', action = 'store', choices=['all','menus','panel','topapps'], dest='generate', default='all', metavar='WHAT', + # help = "what should be generated. aviable options are: all, menus, panel, topapps. default is all.") +- group.add_option('--with', action = 'append', type='string', dest='with', metavar='DIRECTORY', ++ group.add_option('--with', action = 'append', type='string', dest='xwith', metavar='DIRECTORY', + help = 'generate entries only for defined entries (directories or files)') + group.add_option('--without', action = 'append', type='string', dest='without', metavar='DIRECTORY', + help = 'do NOT use defined entries (directories or files) for generating output.') +@@ -206,12 +206,12 @@ + #end of parseArgv + + +-def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,with=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'): ++def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,xwith=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'): + """Read application databases from directories. + if checkExecs is True then use exec_field from file name to check access before adding it to database + if searchIconsIn is provided then use this path to check icons existence + sortOrder defines sorting order for entries +- with is a list of entries (relative to the database root) that should be read ++ xwith is a list of entries (relative to the database root) that should be read + without is a list of entries (relative to the database root or absolute targets for symlinks) that should be left out + """ + +@@ -235,7 +235,7 @@ + return True + return False + +- def get_entry(root,dir,cat,sort,check,with,without,realcat): ++ def get_entry(root,dir,cat,sort,check,xwith,without,realcat): + if not os.path.isdir(os.path.join(root,dir)) or not os.access(os.path.join(root,dir),os.R_OK): + yield None + for entry in os.listdir(os.path.join(root,dir)): +@@ -268,9 +268,9 @@ + if not checkFileAccess(test): + continue + +- if with and len(with)>0: ++ if xwith and len(xwith)>0: + cont=False +- for i,v in enumerate(with): ++ for i,v in enumerate(xwith): + if not (os.path.join(cat,name).startswith(v) or os.path.join(cat,name.replace('_',' ')).startswith(v)): + cont=True + break +@@ -305,7 +305,7 @@ + x = realcat[:] + x.extend([prio,name]) + if access: +- for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,with,without,x): ++ for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,xwith,without,x): + yield sub + elif os.path.isfile(file): + if sort=='name' or sort=='rname': +@@ -327,7 +327,7 @@ + db=os.path.abspath(os.path.expanduser(databases[i])) + if not os.path.isdir(db) or not os.access(db,os.R_OK): + continue +- for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,with,without,[0,rootName]): ++ for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,xwith,without,[0,rootName]): + if not entry: + continue + if not entry[5]: +@@ -850,7 +850,7 @@ + if params[0].database and len(params[0].database)>0: + database=params[0].database + +-apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,with=params[0].with,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault) ++apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,xwith=params[0].xwith,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault) + + ########################## DEBUG ################################ + if params[0].verbosity > 1: --- fvwm-crystal.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: