Date: Sat, 8 Oct 2011 09:33:18 +0200 From: Ed Schouten <ed@80386.nl> To: Stanislav Sedov <stas@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226122 - head/share/mk Message-ID: <20111008073318.GB91943@hoeg.nl> In-Reply-To: <201110072343.p97NhpFK032806@svn.freebsd.org> References: <201110072343.p97NhpFK032806@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--2CdKnS9fCwQYmJzs
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi,
* Stanislav Sedov <stas@FreeBSD.org>, 20111008 01:43:
> - ${WRKSRC} might be missing when the autotools fixup is running.
> Account for this.
Maybe we should simplify this a bit?
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
--- bsd.port.mk (revision 226141)
+++ bsd.port.mk (working copy)
@@ -18,14 +18,14 @@
.if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK)
# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x.
run-autotools-fixup:
- test -d ${WRKSRC} && find ${WRKSRC} -type f \( -name config.libpath -o \
+ -find ${WRKSRC} -type f \( -name config.libpath -o \
-name config.rpath -o -name configure -o -name libtool.m4 \) \
-exec sed -i '' -e 's|freebsd1\*)|freebsd1.\*)|g' \
-e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \
-e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \
-e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \
-e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \
- {} + || /usr/bin/true
+ {} +
=20
.ORDER: run-autotools run-autotools-fixup do-configure
do-configure: run-autotools-fixup
--=20
Ed Schouten <ed@80386.nl>
WWW: http://80386.nl/
--2CdKnS9fCwQYmJzs
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (FreeBSD)
iQIcBAEBAgAGBQJOj/y+AAoJEG5e2P40kaK7y6kP/36kWN+6T1c1gY+Ggdo6d1gL
QSxUhhX6GUV6MtVl8611lyJLGV2kj4x0OkDMQDtoCpeQwR66XlwYsm4RAiWH+o4e
jmcYOlm/dLjLUzx4pSItG7fuzEkCVLD3MOENsskvyJdWsp+Rbm753IrQgVYI1Ad7
7h1BibVyEpB/c2HNMuKNR4D+C9VormFF03Ki9gYgaS1f6jIM/dhRl8SaQjhxEct5
smHFUfz8MkuxZ+XG7oCTNVKDwxYbDH7tsxgF2RE4bF0sfgKdKXxfWh0I9UndUEqN
Nw5P1aE+VK0FNyAGVTfOPmQhhvYHuO/FQyA6xTQxVlzBAcsScK9+fTZyrQ+1aQ54
xUvGpOZjxmQHLgorq0lsN9k/+AsfbBsACDG/55KfIXSXvHTPACclDQ83M3Cgsbq5
PoTNx/IPe9W2wVoA6AQtf4C/+Z9EwI74wSAypxAsq5tLgMRx7Tf92PvdnWG5irvo
3y5M6D5opL4wZRPb2sIZKey7LlY+1tnNjD5IIEHPJVI2IivXFCnOUgIQltXatEpI
PYpL2Ly9aFPbaKrw60fzy9tSIarGhR+r4389YXHWTQFO4oY5USfy8c9WPbxcshxY
lM5Du/p0IsrZY5leacamRDg0YPjhHOtq4heMDE1S9HzU9SFYtVZNLfaxUU5LY4z2
KlK9I//ZECQxq/lZAnuF
=i8H7
-----END PGP SIGNATURE-----
--2CdKnS9fCwQYmJzs--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111008073318.GB91943>