Date: Thu, 15 Sep 2005 17:57:10 +0200 From: Stijn Hoop <stijn@win.tue.nl> To: Oliver Lehmann <lehmann@ans-netz.de> Cc: ports@freebsd.org, danfe@freebsd.org, parv@pair.com Subject: Re: cvs commit: ports/x11-wm/fvwm2-devel Makefile pkg-plist ports/x11-wm/fvwm2-devel/files patch-configure Message-ID: <20050915155710.GX64690@pcwin002.win.tue.nl> In-Reply-To: <20050915173655.308a168d.lehmann@ans-netz.de> References: <200509132211.j8DMBYpj090708@repoman.freebsd.org> <20050914022354.GA7740@holestein.holy.cow> <20050914061957.GA13354@FreeBSD.org> <20050914222511.GA11455@holestein.holy.cow> <20050915131224.GB94650@FreeBSD.org> <20050915144634.GA65015@dragon.NUXI.org> <20050915150330.GW64690@pcwin002.win.tue.nl> <20050915173655.308a168d.lehmann@ans-netz.de>
next in thread | previous in thread | raw e-mail | index | archive | help
--4VrXvz3cwkc87Wze Content-Type: multipart/mixed; boundary="19uQFt6ulqmgNgg1" Content-Disposition: inline --19uQFt6ulqmgNgg1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable [redirected to -ports, this is not cvs-all anymore] On Thu, Sep 15, 2005 at 05:36:55PM +0200, Oliver Lehmann wrote: > Stijn Hoop wrote: >=20 > > Add BATCH=3Dyes to /etc/make.conf along with WITH_FOO. >=20 > Which could have other sideeffects then just preventing from parsing > OPTIONS. It does? I thought it just set defaults in case of OPTIONS. > I once thought about a 2nd options which prevents OPTIONS from > caling dialog and just printing the contents of it. That would be justified then. > http://docs.freebsd.org/cgi/getmsg.cgi?fetch=3D2527952+0+archive/2004/cvs= -all/20040829.cvs-all >=20 > It needs some finetuning of course, but none picked that up again.. so I > thought I'm the only one interested in this kind of funct. No, I just used BATCH to get around OPTIONS ports. Worked for my limited selection as far as I can see. As for your patch, it partially applies (easily fixed by hand, see attached patch) but it doesn't do what I expect; %%% [stijn@tangaloor] </net/freebsd/ports/www/mozilla-devel> make -DWITHOUT_OPT= IONS=20 You may use the following build options: WITH_MAILNEWS=3Dyes Enabled: Enable Mail and News modules=20 WITH_COMPOSER=3Dyes Enabled: Enable the HTML Composer module=20 WITHOUT_DEBUG=3Dyes Disabled: Enable debugging (i.e. gdb) support= =20 WITH_LDAP=3Dyes Enabled: Enable LDAP support for Mailnews=20 WITH_CHATZILLA=3Dyes Enabled: Enable the Chatzilla IRC module=20 WITHOUT_JAVASCRIPT_DEBUGGER=3Dyes Disabled: Enable DTD and JavaScript debug= gers=20 WITHOUT_OPTIMIZED_CFLAGS=3Dyes Disabled: Enable -O2 optimizations=20 WITHOUT_CAIRO_RENDER=3Dyes Disabled: Enable SVG rendering with Cairo=20 WITHOUT_CAIRO=3Dyes Disabled: Enable Cairo-specific Canvas features= =20 WITHOUT_SMB=3Dyes Disabled: Enable smb:// URI support via gnomevf= s=20 ^C [stijn@tangaloor] </net/freebsd/ports/www/mozilla-devel> make -DWITHOUT_OPT= IONS WITH_SMB=3Dyes You may use the following build options: WITH_MAILNEWS=3Dyes Enabled: Enable Mail and News modules=20 WITH_COMPOSER=3Dyes Enabled: Enable the HTML Composer module=20 WITHOUT_DEBUG=3Dyes Disabled: Enable debugging (i.e. gdb) support= =20 WITH_LDAP=3Dyes Enabled: Enable LDAP support for Mailnews=20 WITH_CHATZILLA=3Dyes Enabled: Enable the Chatzilla IRC module=20 WITHOUT_JAVASCRIPT_DEBUGGER=3Dyes Disabled: Enable DTD and JavaScript debug= gers=20 WITHOUT_OPTIMIZED_CFLAGS=3Dyes Disabled: Enable -O2 optimizations=20 WITHOUT_CAIRO_RENDER=3Dyes Disabled: Enable SVG rendering with Cairo=20 WITHOUT_CAIRO=3Dyes Disabled: Enable Cairo-specific Canvas features= =20 WITHOUT_SMB=3Dyes Disabled: Enable smb:// URI support via gnomevf= s=20 %%% Note that it still says 'WITHOUT_SMB=3Dyes'. This might be due to changes in bsd.port.mk since your patch, I don't know. --Stijn --=20 Man had always assumed that he was more intelligent than dolphins because he had achieved so much... the wheel, New York, wars, and so on, whilst all the dolphins had ever done was muck about in the water having a good time. But conversely the dolphins believed themselves to be more intelligent than man for precisely the same reasons. -- Douglas Adams, "The Hitchhikers Guide To The Galaxy" --19uQFt6ulqmgNgg1 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-bsd.port.mk" Content-Transfer-Encoding: quoted-printable --- bsd.port.mk.orig Mon Aug 29 08:54:05 2005 +++ bsd.port.mk Thu Sep 15 17:50:57 2005 @@ -1107,7 +1107,7 @@ .endif OPTIONSFILE?=3D ${PORT_DBDIR}/${UNIQUENAME}/options _OPTIONSFILE!=3D ${ECHO_CMD} "${OPTIONSFILE}" -.if defined(OPTIONS) +.if defined(OPTIONS) && !defined(WITHOUT_OPTIONS) . if defined(PACKAGE_BUILDING) || (defined(BATCH) && !exists(${_OPTIONSFIL= E})) WITHOUT:=3D WITH:=3D @@ -2968,7 +2968,8 @@ ################################################################ .if (!defined(OPTIONS) || defined(CONFIG_DONE) || \ defined(PACKAGE_BUILDING) || defined(BATCH) || \ - exists(${_OPTIONSFILE}) || exists(${_OPTIONSFILE}.local)) + ((exists(${_OPTIONSFILE}) || exists(${_OPTIONSFILE}.local)) \ + && !defined(WITHOUT_OPTIONS))) _OPTIONS_OK=3Dyes .endif =20 @@ -3045,7 +3046,7 @@ .else @${DO_NADA} .endif -.if defined(_OPTIONS_READ) +.if defined(_OPTIONS_READ) && !defined(WITHOUT_OPTIONS) @${ECHO_MSG} "=3D=3D=3D> Found saved configuration for ${_OPTIONS_READ}" .if ${OPTIONSFILE} !=3D ${_OPTIONSFILE} @${ECHO_MSG} "=3D=3D=3D> *** CAUTION *** Using wrong configuration file = ${_OPTIONSFILE}" @@ -5083,6 +5084,23 @@ config: .if !defined(OPTIONS) @${ECHO_MSG} "=3D=3D=3D> No options to configure" +.elif defined(WITHOUT_OPTIONS)=20 + @${ECHO} "" + @${ECHO} "You may use the following build options:" + @${ECHO} "" + @set -- ${OPTIONS} ; \ + while [ "$$#" -ge 3 ] ; do \ + if [ "$$3" =3D "on" ] ; then \ + TEXT=3D"Enabled: " ; \ + VARPRE=3D"WITH_" ; \ + else \ + TEXT=3D"Disabled: " ; \ + VARPRE=3D"WITHOUT_" ; \ + fi ; \ + ${PRINTF} "%-25s %-9s%-50s\n" "$$VARPRE$$1=3Dyes" "$$TEXT""$$2" ; \ + shift 3 ; \ + done + @${ECHO} "" .else .if ${OPTIONSFILE} !=3D ${_OPTIONSFILE} @${ECHO_MSG} "=3D=3D=3D> Using wrong configuration file ${_OPTIONSFILE}" --19uQFt6ulqmgNgg1-- --4VrXvz3cwkc87Wze Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFDKZnWY3r/tLQmfWcRAhD6AJ9oicMH2hGlFsK2o5iv9L33Eh3RWQCdHI6B 1p37kqKi2zWu5h+SFsVXbNU= =GFGw -----END PGP SIGNATURE----- --4VrXvz3cwkc87Wze--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050915155710.GX64690>