Date: Sat, 23 Nov 2002 20:44:43 -0800 From: Kris Kennaway <kris@obsecurity.org> To: ports@FreeBSD.org Subject: Updated 'make index' target Message-ID: <20021124044443.GA57130@rot13.obsecurity.org>
next in thread | raw e-mail | index | archive | help
--wac7ysb48OaltWcw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
One of the problems with 'make index' is that port builds pick up
packages installed on the local system and change their naming and
dependency lists. For example, the freeciv and freeciv-gtk ports will
detect an installed imlib, and both change their package name to
freeciv-imlib.
To work around this for the official indexes I commit to the repo I
use the Tools/portbuild/scripts/makeindex script. I have merged the
bulk of this into 'make index' with the following patch.
This lets me generate a consistent INDEX on my system with just 'make
index' now, although there are a lot of "duplicate target" messages
from various makefiles that I don't understand the cause of (they are
harmless).
I'd like to commit this in a few days if it works well for others.
Kris
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: /xor/mnt/ncvs/ports/Makefile,v
retrieving revision 1.68
diff -u -r1.68 Makefile
--- Makefile 18 Nov 2002 09:22:59 -0000 1.68
+++ Makefile 24 Nov 2002 04:40:26 -0000
@@ -65,14 +65,17 @@
@cd ${.CURDIR} && make ${.CURDIR}/INDEX
=20
${.CURDIR}/INDEX:
- @echo -n "Generating INDEX - please wait.."
- @cd ${.CURDIR} && make describe ECHO_MSG=3D"echo > /dev/null" | \
- perl ${.CURDIR}/Tools/make_index > ${.CURDIR}/INDEX
+ @echo -n "Generating INDEX - please wait.."; \
+ export LOCALBASE=3D/nonexistentlocal; \
+ export X11BASE=3D/nonexistentx; \
+ cd ${.CURDIR} && make describe ECHO_MSG=3D"echo > /dev/null" | \
+ perl ${.CURDIR}/Tools/make_index | \
+ sed -e 's/ */ /g' -e 's/| */|/g' -e 's/ *|/|/g' -e "s,${LOCALBASE},/us=
r/local," -e "s,${X11BASE},/usr/X11R6," > INDEX
.if !defined(INDEX_NOSORT)
@sed -e 's./.=01.g' ${.CURDIR}/INDEX | \
sort -t '|' +1 -2 | \
- sed -e 's.=01./.g' > ${.CURDIR}/INDEX.tmp
- @mv -f ${.CURDIR}/INDEX.tmp ${.CURDIR}/INDEX
+ sed -e 's.=01./.g' > ${.CURDIR}/INDEX.tmp; \
+ mv -f ${.CURDIR}/INDEX.tmp ${.CURDIR}/INDEX
.endif
@echo " Done."
=20
--wac7ysb48OaltWcw
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE94Fk5Wry0BWjoQKURArOgAJ0Qw0HPYEehnw8Lz1M/gp4vJ9c8TQCfYRDA
REPvqxpeFbmQXkC+V5ebkN8=
=u5bQ
-----END PGP SIGNATURE-----
--wac7ysb48OaltWcw--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021124044443.GA57130>