svn commit: r226122 - head/share/mk

[Ed Schouten]

Hi,

* Stanislav Sedov <stas at 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
===================================================================
--- 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
+		{} +
 
 .ORDER: run-autotools run-autotools-fixup do-configure
 do-configure: run-autotools-fixup

-- 
 Ed Schouten <ed at 80386.nl>
 WWW: http://80386.nl/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 834 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/svn-src-head/attachments/20111008/ff01c837/attachment.pgp