Date: Fri, 17 May 2002 18:24:23 +0300 From: Ruslan Ermilov <ru@FreeBSD.ORG> To: "Andrey A. Chernov" <ache@nagual.pp.ru> Cc: walt <wsheets@sbcglobal.net>, freebsd-ports@FreeBSD.ORG, Bill Fenner <fenner@FreeBSD.ORG> Subject: Re: Png-1.2.2_1 broken on -CURRENT? Message-ID: <20020517152423.GB46931@sunbay.com> In-Reply-To: <20020517150508.GA23564@nagual.pp.ru> References: <3CE1B2EA.1000900@sbcglobal.net> <20020516235508.GA9554@nagual.pp.ru> <20020517072428.GA75925@sunbay.com> <20020517080609.GA12895@nagual.pp.ru> <20020517142220.GA37843@sunbay.com> <20020517144552.GB23235@nagual.pp.ru> <20020517150106.GA44484@sunbay.com> <20020517150508.GA23564@nagual.pp.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
--GRPZ8SYKNexpdSJ7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Fri, May 17, 2002 at 07:05:08PM +0400, Andrey A. Chernov wrote:
> On Fri, May 17, 2002 at 18:01:06 +0300, Ruslan Ermilov wrote:
>=20
> > Then the logical thing would be to add INSTALL_INCLUDES (or something
> > like that) to bsd.port.mk, and use that. It's generally much easier
>=20
> I agree. Could you do it, please? I doubt I can find proper way to do=20
> it by myself due to all that bsd.*.mk restructurization changes.
>=20
I'm not sure if the last one is needed; the next to last is indeed
useful. Note that it has a nicety of -C comparing includes before
overwriting them. I'm planning to merge my share/mk work into
RELENG_4 soon after 4.6-RELEASE is out because keeping them too
different against HEAD would otherwise provide too much ache (not
to confuse with your login :-) and hassle to the src/ developers.
%%%
Index: bsd.port.mk
=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/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.411
diff -u -p -r1.411 bsd.port.mk
--- bsd.port.mk 27 Apr 2002 11:22:59 -0000 1.411
+++ bsd.port.mk 17 May 2002 15:19:06 -0000
@@ -301,6 +301,7 @@ FreeBSD_MAINTAINER=3D portmgr@FreeBSD.org
# INSTALL_PROGRAM - A command to install binary executables.
# INSTALL_SCRIPT - A command to install executable scripts.
# INSTALL_DATA - A command to install sharable data.
+# INSTALL_INCS - A command to install includes.
# INSTALL_MAN - A command to install manpages (doesn't compress).
#
# Set the following to specify all manpages that your port installs.
@@ -1199,12 +1200,15 @@ INSTALL_SCRIPT=3D \
${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE}
INSTALL_DATA=3D \
${INSTALL} ${COPY} ${_SHROWNGRP} -m ${SHAREMODE}
+INSTALL_INCS=3D \
+ ${INSTALL} -C ${_BINOWNGRP} -m ${NOBINMODE}
INSTALL_MAN=3D \
${INSTALL} ${COPY} ${_MANOWNGRP} -m ${MANMODE}
=20
INSTALL_MACROS=3D BSD_INSTALL_PROGRAM=3D"${INSTALL_PROGRAM}" \
BSD_INSTALL_SCRIPT=3D"${INSTALL_SCRIPT}" \
BSD_INSTALL_DATA=3D"${INSTALL_DATA}" \
+ BSD_INSTALL_INCS=3D"${INSTALL_INCS}" \
BSD_INSTALL_MAN=3D"${INSTALL_MAN}"
MAKE_ENV+=3D ${INSTALL_MACROS}
SCRIPTS_ENV+=3D ${INSTALL_MACROS}
@@ -2251,6 +2255,7 @@ do-configure:
CFLAGS=3D"${CFLAGS}" CXXFLAGS=3D"${CXXFLAGS}" \
INSTALL=3D"/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
INSTALL_DATA=3D"${INSTALL_DATA}" \
+ INSTALL_INCS=3D"${INSTALL_INCS}" \
INSTALL_PROGRAM=3D"${INSTALL_PROGRAM}" \
INSTALL_SCRIPT=3D"${INSTALL_SCRIPT}" \
${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
%%%
Cheers,
--=20
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software AG,
ru@FreeBSD.org FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
--GRPZ8SYKNexpdSJ7
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)
iD8DBQE85SCnUkv4P6juNwoRApoaAJsEYWs/c6GCGiq+pzvdBuO2jYf4JwCfTE82
wkLLLxADa8Fn7uGDW/DLt1Q=
=ki7x
-----END PGP SIGNATURE-----
--GRPZ8SYKNexpdSJ7--
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?20020517152423.GB46931>