From owner-cvs-ports@FreeBSD.ORG Wed May 12 16:26:51 2010 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1ADB41065670; Wed, 12 May 2010 16:26:51 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id CEF9B8FC25; Wed, 12 May 2010 16:26:50 +0000 (UTC) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.4/8.14.4) with ESMTP id o4CGQeKe035511; Wed, 12 May 2010 09:26:40 -0700 (PDT) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.4/8.14.4/Submit) id o4CGQdhh035510; Wed, 12 May 2010 09:26:39 -0700 (PDT) (envelope-from obrien) Date: Wed, 12 May 2010 09:26:39 -0700 From: "David O'Brien" To: Doug Barton Message-ID: <20100512162639.GB29259@dragon.NUXI.org> References: <201005101825.o4AIPXGC040135@repoman.freebsd.org> <20100510221146.c70877af.ehaupt@critical.ch> <4BE8AF14.3080006@FreeBSD.org> <20100511094731.7f461540.ehaupt@critical.ch> <4BE9A251.6040602@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4BE9A251.6040602@FreeBSD.org> X-Operating-System: FreeBSD 9.0-CURRENT X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? User-Agent: Mutt/1.5.16 (2007-06-09) Cc: Emanuel Haupt , cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/shells/bash Makefile distinfo X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2010 16:26:51 -0000 On Tue, May 11, 2010 at 11:30:41AM -0700, Doug Barton wrote: > On 05/11/10 00:47, Emanuel Haupt wrote: > > > > Doug, the OPTIONS patch as you posted it on ports@ does not play so > > well with shells/bash-static. I've created shells/bash-static in order > > to have packages created by the build cluster. > > Yeah, I forgot about that port, sorry. I can rework the patch easily > enough if there is interest. An OPTIONS patch would be find - as long as it isn't the default. -- -- David (obrien@FreeBSD.org) Index: Makefile =================================================================== RCS file: /home/pcvs/ports/shells/bash/Makefile,v retrieving revision 1.120 diff -u -p -r1.120 Makefile --- Makefile 11 May 2010 09:34:44 -0000 1.120 +++ Makefile 12 May 2010 16:23:55 -0000 @@ -31,6 +31,12 @@ COMMENT= The GNU Project's Bourne Again IGNOREFILES= FAQ +.if defined(WITH_OPTIONS) || defined(WITH_BASH_OPTIONS) +.include "${.CURDIR}/../bash/options" +.endif + +.include + .if !defined(WITHOUT_IMPLICITCD) EXTRA_PATCHES+= ${PATCHDIR}/xpatch-implicitcd .endif @@ -95,8 +101,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ YACC="bison -y" -.include - post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 Index: options =================================================================== RCS file: options diff -N options --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ options 12 May 2010 16:23:55 -0000 @@ -0,0 +1,6 @@ +OPTIONS= IMPLICITCD "Use directory name alone to cd into it" on \ + COLONBREAKSWORDS "Colons break words" on \ + HELP "Install the help files" on \ + INST_READL "Use readline from base, otherwise bash's" on \ + NLS "National Language Support" on \ + STATIC_BASH "Compile without shared libs" off