Date: Thu, 30 Dec 2004 13:35:19 -0800 From: Kris Kennaway <kris@obsecurity.org> To: Kirill Ponomarew <krion@voodoo.oberon.net> Cc: ports@FreeBSD.org Subject: Patch to fix installing with nonstandard PREFIXes (Re: cvs commit: ports/Mk bsd.port.mk) Message-ID: <20041230213519.GB28560@xor.obsecurity.org> In-Reply-To: <20041230141447.GB25720@voodoo.oberon.net> References: <200412300714.iBU7ERhn089159@repoman.freebsd.org> <20041230141447.GB25720@voodoo.oberon.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--oC1+HKm2/end4ao3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Thu, Dec 30, 2004 at 03:14:48PM +0100, Kirill Ponomarew wrote:
> On Thu, Dec 30, 2004 at 07:14:27AM +0000, Kris Kennaway wrote:
> > * Overhaul the mtree spec file selection code: instead of deciding ba=
sed
> > on the value of USE_X_PREFIX, compare PREFIX to X11BASE and LOCALBA=
SE
> > directly. This fixes the MTREE_FILE for ports that set PREFIX=3D${=
X11BASE}
> > but don't set USE_X_PREFIX for some reason. If PREFIX is a
> > nonstandard value, set NO_MTREE=3Dyes.
>=20
> It seems it broke MANPREFIX, you can try to build misc/nut or
> net/icpld with 'make install PREFIX=3D$out_of_${LOCALBASE}
Oops, I didn't think about that. Here's the patch I hope to commit
later today after some further validation:
Kris
Index: Mk/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.503
diff -u -u -r1.503 bsd.port.mk
--- Mk/bsd.port.mk 30 Dec 2004 07:14:27 -0000 1.503
+++ Mk/bsd.port.mk 30 Dec 2004 20:59:51 -0000
@@ -1884,20 +1891,18 @@
=20
# Figure out where the local mtree file is
.if !defined(MTREE_FILE) && !defined(NO_MTREE)
-.if ${PREFIX} =3D=3D ${X11BASE}
+.if ${PREFIX} =3D=3D ${X11BASE} || defined(USE_X_PREFIX)
+# User may have specified non-standard PREFIX for installing a port that
+# uses X
.if ${X_WINDOW_SYSTEM:L} =3D=3D xfree86-3
MTREE_FILE=3D /etc/mtree/BSD.x11.dist
.else
MTREE_FILE=3D /etc/mtree/BSD.x11-4.dist
.endif
-.else
-.if ${PREFIX} =3D=3D ${LOCALBASE}
-MTREE_FILE=3D /etc/mtree/BSD.local.dist
.elif ${PREFIX} =3D=3D /usr
MTREE_FILE=3D /etc/mtree/BSD.usr.dist
.else
-NO_MTREE=3D yes # Can't figure out prefix, assume nonstandard
-.endif
+MTREE_FILE=3D /etc/mtree/BSD.local.dist
.endif
.endif
MTREE_CMD?=3D /usr/sbin/mtree
Index: textproc/docbook-to-man/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/ncvs/ports/textproc/docbook-to-man/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- textproc/docbook-to-man/Makefile 21 Feb 2003 13:42:34 -0000 1.5
+++ textproc/docbook-to-man/Makefile 30 Dec 2004 20:47:42 -0000
@@ -38,7 +38,7 @@
=20
USE_REINPLACE=3D yes
USE_IMAKE=3D yes
-USE_X_PREFIX=3D no
+PREFIX?=3D ${LOCALBASE}
USE_XLIB=3D yes
XFREE86_HTML_MAN=3D no
=20
--oC1+HKm2/end4ao3
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (FreeBSD)
iD8DBQFB1HSXWry0BWjoQKURAkF1AJ9VzJO1yE7/BwG5Cs0p0XxhoRMY5wCeNOLv
nlg6eb2fNKgIjMKkUfuXGEU=
=hoZW
-----END PGP SIGNATURE-----
--oC1+HKm2/end4ao3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041230213519.GB28560>