[142596] trunk/dports/net/wget
ryandesign at macports.org
ryandesign at macports.org
Sat Dec 12 06:25:38 PST 2015
Revision: 142596
https://trac.macports.org/changeset/142596
Author: ryandesign at macports.org
Date: 2015-11-16 09:05:48 -0800 (Mon, 16 Nov 2015)
Log Message:
-----------
wget: fix configure failure when nawk is installed, rather than prohibiting nawk from being installed
Modified Paths:
--------------
trunk/dports/net/wget/Portfile
Added Paths:
-----------
trunk/dports/net/wget/files/nawk.patch
Modified: trunk/dports/net/wget/Portfile
===================================================================
--- trunk/dports/net/wget/Portfile 2015-11-16 16:59:43 UTC (rev 142595)
+++ trunk/dports/net/wget/Portfile 2015-11-16 17:05:48 UTC (rev 142596)
@@ -2,7 +2,6 @@
# $Id$
PortSystem 1.0
-PortGroup conflicts_build 1.0
PortGroup muniversal 1.0
name wget
@@ -29,9 +28,6 @@
checksums rmd160 23ffad97b5a92dff2596925e7a95731ee46b1b68 \
sha256 67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37
-# nawk: syntax error at source line 1 source file
-conflicts_build nawk
-
configure.args \
--without-ssl
@@ -45,6 +41,9 @@
port:nettle \
port:pcre
+patchfiles nawk.patch \
+ patch-prefix.diff
+
# Ensure libuuid doesn't get used even if the ossp-uuid port is installed.
configure.args-append ac_cv_header_uuid_uuid_h=no
@@ -69,8 +68,6 @@
default_variants +ssl
-patchfiles patch-prefix.diff
-
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/ChangeLog \
Added: trunk/dports/net/wget/files/nawk.patch
===================================================================
--- trunk/dports/net/wget/files/nawk.patch (rev 0)
+++ trunk/dports/net/wget/files/nawk.patch 2015-11-16 17:05:48 UTC (rev 142596)
@@ -0,0 +1,11 @@
+--- configure.orig 2015-11-15 08:07:06.000000000 -0600
++++ configure 2015-11-16 10:58:34.000000000 -0600
+@@ -4011,7 +4011,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
+
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in gawk mawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/aac86df1/attachment.html>
More information about the macports-changes
mailing list