Date: Wed, 12 May 2010 09:26:39 -0700 From: "David O'Brien" <obrien@FreeBSD.org> To: Doug Barton <dougb@FreeBSD.org> Cc: Emanuel Haupt <ehaupt@critical.ch>, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/shells/bash Makefile distinfo Message-ID: <20100512162639.GB29259@dragon.NUXI.org> In-Reply-To: <4BE9A251.6040602@FreeBSD.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>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
+
.if !defined(WITHOUT_IMPLICITCD)
EXTRA_PATCHES+= ${PATCHDIR}/xpatch-implicitcd
.endif
@@ -95,8 +101,6 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
YACC="bison -y"
-.include <bsd.port.pre.mk>
-
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100512162639.GB29259>