From owner-freebsd-ports@FreeBSD.ORG Tue Sep 30 14:19:30 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DE2916A4B3 for ; Tue, 30 Sep 2003 14:19:30 -0700 (PDT) Received: from mx2.fillmore-labs.com (lima.fillmore-labs.com [62.138.193.83]) by mx1.FreeBSD.org (Postfix) with ESMTP id 473CE43FAF for ; Tue, 30 Sep 2003 14:19:29 -0700 (PDT) (envelope-from eikemeier@fillmore-labs.com) Received: from p5080bceb.dip.t-dialin.net ([80.128.188.235] helo=fillmore-labs.com ident=41b4ir576fjz2khs) by mx2.fillmore-labs.com with asmtp (TLSv1:AES256-SHA:256) (Exim 4.24; FreeBSD 4.9) id 1A4Ru2-000GaE-Ua; Tue, 30 Sep 2003 23:19:27 +0200 Message-ID: <3F79F35C.2090600@fillmore-labs.com> Date: Tue, 30 Sep 2003 23:19:24 +0200 From: Oliver Eikemeier MIME-Version: 1.0 To: Kris Kennaway References: <1064894027.45333.10.camel@shumai.marcuscom.com> <40C5B5F6-F37B-11D7-A7E8-003065ABFD92@mac.com> <20030930201742.GB9478@rot13.obsecurity.org> In-Reply-To: <20030930201742.GB9478@rot13.obsecurity.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: eikemeier@fillmore-labs.com User-Agent: KMail/1.5.9 Organization: Fillmore Labs GmbH X-Complaints-To: abuse@fillmore-labs.com cc: ports@freebsd.org cc: Charles Swiger Subject: Re: INDEX build failed X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Sep 2003 21:19:30 -0000 Kris Kennaway wrote: > On Tue, Sep 30, 2003 at 03:21:12PM -0400, Charles Swiger wrote: > >>On Monday, September 29, 2003, at 11:53 PM, Joe Marcus Clarke wrote: >> >>>>>Did someone add a port called 'clean' or something? >>>> >>>>*looking suspiciously at edwin* >>> >>>Good look :-). >>> >>>[ 16:23 edwin ] Original commit >>>clean 3.2 sysutils >>> New port: sysutils/clean; automatically remove unwanted files >>> >>> New port: clean searches through the filesystem for >>>"temporary >>> files" left behind by editors and the like which can be >>> deleted. The pattern of regular expressions is >>>controllable >>> via a ~/.cleanrc. >>> >>> PR: ports/52881 >>> Submitted by: Chuck Swiger >> >>/usr/ports/devel/patch doesn't seem to conflict with the existence of a >>"make patch" target; I don't believe that the ports system should >>forbid a port named "clean", or "install", if /usr/bin/install was a >>port rather than part of the base system. > > The reason is that the patch target is not used by bsd.port.subdir.mk, > but the others are, and that file also defines targets for each entry > in SUBDIR. Both of these features are in use by the ports collection, > so neither can simply be removed. > >>Should the port be renamed? > > It looks like that's the only way to handle it. How about something like: --- bsd.port.subdir.mk.patch begins here --- diff -u -r1.49 bsd.port.subdir.mk --- bsd.port.subdir.mk 6 Jul 2003 23:57:41 -0000 1.49 +++ bsd.port.subdir.mk 30 Sep 2003 20:59:38 -0000 @@ -99,7 +99,7 @@ .for __target in ${TARGETS} .if !target(${__target}) .if defined(SUBDIR) && !empty(SUBDIR) -${__target}: ${SUBDIR:S/$/.${__target}/} +${__target}: ${SUBDIR:S/^/_/:S/$/.${__target}/} .else ${__target}: .endif @@ -109,18 +109,18 @@ .if defined(SUBDIR) && !empty(SUBDIR) .for __target in ${TARGETS} checksubdirs readmes -${SUBDIR:S/$/.${__target}/}: _SUBDIRUSE +${SUBDIR:S/^/_/:S/$/.${__target}/}: _SUBDIRUSE .endfor _SUBDIRUSE: .USE - @OK=""; sub=${.TARGET:R}; \ + @OK=""; sub=${.TARGET:S/^_//:R}; \ for dud in $$DUDS; do \ if [ $${dud} = $$sub ]; then \ OK="false"; \ ${ECHO_MSG} "===> ${DIRPRFX}$$sub skipped"; \ fi; \ done; \ - if test -d ${.CURDIR}/${.TARGET:R}.${MACHINE_ARCH}; then \ + if test -d ${.CURDIR}/${sub}.${MACHINE_ARCH}; then \ edir=$${sub}.${MACHINE_ARCH}; \ elif test -d ${.CURDIR}/$${sub}; then \ edir=$${sub}; \ @@ -135,7 +135,7 @@ DIRPRFX=${DIRPRFX}$$edir/; \ fi -.for _subdir in ${SUBDIR} +.for _subdir in ${SUBDIR:S/^/_/} ${_subdir}:: ${_subdir:S/$/.all/} .endfor @@ -150,14 +150,14 @@ .endif install: afterinstall afterinstall: realinstall -realinstall: beforeinstall ${SUBDIR:S/$/.realinstall/} +realinstall: beforeinstall ${SUBDIR:S/^/_/:S/$/.realinstall/} .endif IGNOREDIR= CVS Mk Templates Tools distfiles packages pkg .if !target(checksubdirs) .if defined(PORTSTOP) -checksubdirs: checksubdir ${SUBDIR:S/$/.checksubdirs/} +checksubdirs: checksubdir ${SUBDIR:S/^/_/:S/$/.checksubdirs/} .else checksubdirs: checksubdir .endif @@ -187,7 +187,7 @@ .endif .if !target(readmes) -readmes: readme ${SUBDIR:S/$/.readmes/} +readmes: readme ${SUBDIR:S/^/_/:S/$/.readmes/} .endif .if !target(readme) --- bsd.port.subdir.mk.patch ends here --- It's a quick hack and needs review, but it is a start and build the INDEX: # awk '/^clean-[0-9._,]+\|/ { print }' INDEX clean-3.2|/usr/ports/sysutils/clean|/usr/local|Automatically remove unwanted files|/usr/ports/sysutils/clean/pkg-descr|chuck@pkix.net|sysutils|||http://sourceforge.net/projects/clean