Date: Wed, 12 May 2010 21:02:41 +0200 From: Erwin Lansing <erwin@FreeBSD.org> To: David O'Brien <obrien@FreeBSD.org> Cc: Emanuel Haupt <ehaupt@critical.ch>, cvs-ports@FreeBSD.org, Doug Barton <dougb@FreeBSD.org>, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/shells/bash Makefile distinfo Message-ID: <20100512190241.GW15040@droso.net> In-Reply-To: <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> <20100512162639.GB29259@dragon.NUXI.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--HbrDUOEqlDe4KvYA
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Wed, May 12, 2010 at 09:26:39AM -0700, David O'Brien wrote:
> 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.
> >=20
> > Yeah, I forgot about that port, sorry. I can rework the patch easily
> > enough if there is interest.
>=20
> An OPTIONS patch would be find - as long as it isn't the default.
The OPTIONS framework should be default, the below patch is just clutter
that diverges this port even further from best common practice. Which
of the individual options are turned on by default can of course be
discussed.
-erwin
>=20
> --=20
> -- David (obrien@FreeBSD.org)
>=20
> Index: Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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=3D The GNU Project's Bourne Again
> =20
> IGNOREFILES=3D FAQ
> =20
> +.if defined(WITH_OPTIONS) || defined(WITH_BASH_OPTIONS)
> +.include "${.CURDIR}/../bash/options"
> +.endif
> +
> +.include <bsd.port.pre.mk>
> +
> .if !defined(WITHOUT_IMPLICITCD)
> EXTRA_PATCHES+=3D ${PATCHDIR}/xpatch-implicitcd
> .endif
> @@ -95,8 +101,6 @@ CONFIGURE_ENV=3D CPPFLAGS=3D"${CPPFLAGS}" \
> LDFLAGS=3D"${LDFLAGS}" \
> YACC=3D"bison -y"
> =20
> -.include <bsd.port.pre.mk>
> -
> post-patch:
> @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
> =20
> Index: options
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> 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=3D 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
>=20
--=20
Erwin Lansing http://droso.org
Prediction is very difficult
especially about the future erwin@FreeBSD.org
--HbrDUOEqlDe4KvYA
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (FreeBSD)
iD8DBQFL6vtRqy9aWxUlaZARAlNbAJ9p11mbgfVcBx+M3YjXfirtoNfkNQCg1dNd
iPyoeQ8q9VkzsCMb8XdfYQA=
=jcay
-----END PGP SIGNATURE-----
--HbrDUOEqlDe4KvYA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100512190241.GW15040>