<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/98b246d4f472868068c05d64639738c562f9e031">https://github.com/macports/macports-ports/commit/98b246d4f472868068c05d64639738c562f9e031</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 98b246d openmaintainer ports: remove old base compat code
</span>98b246d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 98b246d4f472868068c05d64639738c562f9e031
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Oct 6 14:19:20 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> openmaintainer ports: remove old base compat code
</span>---
archivers/pbzip2/Portfile | 7 -------
archivers/pigz/Portfile | 6 ------
archivers/upx/Portfile | 6 ------
databases/rocksdb/Portfile | 19 -------------------
devel/afl/Portfile | 9 ---------
devel/appstream-glib/Portfile | 9 ++-------
devel/argon2/Portfile | 18 ------------------
devel/bazaar/Portfile | 9 ---------
devel/cryptlib/Portfile | 6 ------
devel/git-crypt/Portfile | 9 ---------
devel/glade/Portfile | 15 ---------------
devel/legacy-support/Portfile | 9 ---------
devel/libCUDF/Portfile | 6 ------
devel/libcryptopp/Portfile | 4 ----
devel/libpointing/Portfile | 13 -------------
devel/libtermkey/Portfile | 6 ------
devel/libvterm/Portfile | 6 ------
devel/meson/Portfile | 9 ---------
devel/shc/Portfile | 6 ------
devel/stm32flash/Portfile | 5 -----
devel/tup/Portfile | 7 -------
devel/unibilium/Portfile | 6 ------
editors/atom/Portfile | 9 ---------
emulators/spim/Portfile | 5 -----
emulators/vpcs/Portfile | 9 ---------
games/bastet/Portfile | 7 -------
games/openttd/Portfile | 7 -------
gnome/at-spi2-core/Portfile | 12 ------------
graphics/MyPaint/Portfile | 6 ------
graphics/argyll/Portfile | 6 ------
graphics/babl/Portfile | 8 --------
graphics/exiftran/Portfile | 5 -----
graphics/gphoto2/Portfile | 5 -----
graphics/graphene/Portfile | 10 ----------
graphics/ipe/Portfile | 5 -----
graphics/openni/Portfile | 4 ----
graphics/openvrml/Portfile | 4 ----
lang/chapel/Portfile | 5 -----
lang/mit-scheme/Portfile | 4 ----
lang/pypy/Portfile | 6 ------
lang/ruby186/Portfile | 4 ----
mail/signing-party/Portfile | 5 -----
math/hpddm/Portfile | 16 ----------------
math/libfaiss/Portfile | 16 ----------------
math/msieve/Portfile | 7 -------
math/octave/Portfile | 12 ------------
math/taucs/Portfile | 6 ------
multimedia/VLC/Portfile | 8 +-------
multimedia/VLC2/Portfile | 5 -----
multimedia/ffmpeg-devel/Portfile | 4 ----
multimedia/ffmpeg/Portfile | 4 ----
multimedia/mlt/Portfile | 12 +++---------
net/bittwist/Portfile | 4 ----
net/deluge/Portfile | 9 +--------
net/dnsmasq/Portfile | 5 -----
net/gpsd/Portfile | 8 --------
net/newsboat/Portfile | 5 -----
net/whois/Portfile | 8 --------
python/py-clnum/Portfile | 4 ----
python/py-networkit/Portfile | 14 --------------
python/py-numpy/Portfile | 8 --------
python/py-scipy/Portfile | 18 ------------------
science/ccfits/Portfile | 4 ----
science/dssp/Portfile | 11 +----------
science/liquid-dsp/Portfile | 7 -------
shells/mksh/Portfile | 7 -------
sysutils/amttools/Portfile | 5 -----
sysutils/cocoa-tlassemble/Portfile | 4 ----
sysutils/entr/Portfile | 12 ------------
sysutils/pidof/Portfile | 6 ------
sysutils/rw/Portfile | 7 -------
sysutils/smlr/Portfile | 7 -------
sysutils/tag/Portfile | 5 -----
sysutils/tldr-cpp-client/Portfile | 7 -------
tex/latex2rtf/Portfile | 5 -----
www/http-parser/Portfile | 5 -----
www/nghttp2/Portfile | 13 +------------
x11/herbstluftwm/Portfile | 6 ------
78 files changed, 9 insertions(+), 591 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/pbzip2/Portfile b/archivers/pbzip2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 57ee140..e8ba457 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/pbzip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/pbzip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,17 +34,10 @@ use_configure no
</span> variant universal {}
pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append \
CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
destroot.args PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/pigz/Portfile b/archivers/pigz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 667cf16..ed7d7bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/pigz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/pigz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,15 +31,9 @@ use_configure no
</span> variant universal {}
build.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 644 ${worksrcpath}/${name}.1 ${destroot}${prefix}/share/man/man1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/upx/Portfile b/archivers/upx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4822734..0054178 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/upx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/upx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,15 +52,9 @@ post-configure {
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CXX=${configure.cxx} \
"CXXFLAGS_OPTIMIZE=${configure.cxxflags} [get_canonical_archflags cxx]" \
CXXFLAGS_WERROR=
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS_OPTIMIZE="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS_WERROR=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 755 ${worksrcpath}/src/upx.out ${destroot}${prefix}/bin/upx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/rocksdb/Portfile b/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f904ba..c4b7a3f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,6 @@ patchfiles-append patch-Makefile.diff
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CC=${configure.cc} \
CXX=${configure.cxx} \
CFLAGS=[get_canonical_archflags cc] \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,21 +48,3 @@ destroot.env-append CC=${configure.cc} \
</span> DEBUG_LEVEL=0 \
OPT=${configure.optflags} \
INSTALL_PATH=${destroot}${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="[get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="[get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PORTABLE=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEBUG_LEVEL=0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPT="${configure.optflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="[get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="[get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PORTABLE=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEBUG_LEVEL=0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPT="${configure.optflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_PATH=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/afl/Portfile b/devel/afl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74d8b14..739b4a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/afl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/afl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,21 +25,12 @@ checksums rmd160 b7c1174111cfc11d14a0982359ef903d5b8d1267 \
</span> sha256 43614b4b91c014d39ef086c5cc84ff5f068010c264c2c05bf199df60898ce045
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CC=${configure.cc} \
CXX=${configure.cxx} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.env PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/appstream-glib/Portfile b/devel/appstream-glib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 97aec31..aa11e98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/appstream-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/appstream-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,17 +56,12 @@ compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 300}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {[variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_destroot_env(${arch}) CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
configure.args -Drpm=false
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/argon2/Portfile b/devel/argon2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c331819..c1d3904 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/argon2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/argon2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,33 +25,15 @@ checksums rmd160 05b78cfa2309a25b6fed447236f1f37f92732cee \
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> destroot.destdir PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> test.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bazaar/Portfile b/devel/bazaar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c81568a..94b526e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bazaar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bazaar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,21 +46,12 @@ depends_build-append bin:gnutar:gnutar
</span> configure.args-append --with-gnu-tar=gnutar
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CFLAGS=-g -O2 -Wall -fno-strict-aliasing \
-I${prefix}/include -L${prefix}/lib \
-lintl -lneon -lgpgme -lpth"
destroot.env "CFLAGS=-I${prefix}/include -L${prefix}/lib -lintl -lneon -lgpgme" \
LDFLAGS=-L${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CFLAGS="-g -O2 -Wall -fno-strict-aliasing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--I${prefix}/include -L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--lintl -lneon -lgpgme -lpth"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env CFLAGS="-I${prefix}/include -L${prefix}/lib -lintl -lneon -lgpgme" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="-L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> destroot.destdir prefix=${destroot}${prefix}
post-destroot {
file rename ${destroot}${prefix}/bin/annotate ${destroot}${prefix}/bin/annotate-baz
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cryptlib/Portfile b/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a740eb9..e44d6bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,15 +72,9 @@ build.args CC="${configure.cc}" \
</span> configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
foreach arch ${universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> lappend merger_build_env(${arch}) \
"CFLAGS=${configure.cflags} ${configure.cppflags} -arch ${arch}" \
"LDFLAGS=${configure.ldflags} -arch ${arch}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} ${configure.cppflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {![variant_isset universal] && [info exists merger_build_env(${configure.build_arch})]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-crypt/Portfile b/devel/git-crypt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4937aef..36ce32a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git-crypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-crypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,20 +37,11 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args ENABLE_MAN=yes PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/Portfile b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d79dba0..94a39e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,13 +78,8 @@ variant python35 conflicts python27 python36 python37 description {Build Python
</span> configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python3.5
set python_framework ${frameworks_dir}/Python.framework/Versions/3.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append "PYTHON_LIBS=-L${python_framework}/lib -lpython3.5" \
PYTHON_LIB_LOC=${python_framework}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_LIBS="-L${python_framework}/lib -lpython3.5" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_LIB_LOC=${python_framework}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> depends_lib-append port:py35-gobject3
configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,13 +88,8 @@ variant python36 conflicts python27 python35 python37 description {Build Python
</span> configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python3.6
set python_framework ${frameworks_dir}/Python.framework/Versions/3.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append "PYTHON_LIBS=-L${python_framework}/lib -lpython3.6" \
PYTHON_LIB_LOC=${python_framework}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_LIBS="-L${python_framework}/lib -lpython3.6" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_LIB_LOC=${python_framework}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> depends_lib-append port:py36-gobject3
configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,13 +98,8 @@ variant python37 conflicts python27 python35 python36 description {Build Python
</span> configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python3.7
set python_framework ${frameworks_dir}/Python.framework/Versions/3.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append "PYTHON_LIBS=-L${python_framework}/lib -lpython3.7" \
PYTHON_LIB_LOC=${python_framework}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_LIBS="-L${python_framework}/lib -lpython3.7" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_LIB_LOC=${python_framework}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> depends_lib-append port:py37-gobject3
configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/legacy-support/Portfile b/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b1c216f..299bd93 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,21 +40,12 @@ test.run yes
</span> test.target test
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> destroot.env PREFIX=${prefix}
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libCUDF/Portfile b/devel/libCUDF/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b064478..271b0f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libCUDF/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libCUDF/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,15 +30,9 @@ use_configure no
</span> # parallel building fails
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
post-patch {
reinplace "s#/usr/#${prefix}/#g" ${worksrcpath}/Makefile.config
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libcryptopp/Portfile b/devel/libcryptopp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 56996c5..db57c92 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libcryptopp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libcryptopp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,11 +54,7 @@ pre-patch {
</span>
build.type gnu
build.target dynamic static cryptest.exe
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CXXFLAGS=[get_canonical_archflags cxx] -DNDEBUG [_get_cryptopp_init_priority_flag ${configure.compiler}]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CXXFLAGS="[get_canonical_archflags cxx] -DNDEBUG [_get_cryptopp_init_priority_flag ${configure.compiler}]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> build.args-append CXX=${configure.cxx} PREFIX=${prefix}
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libpointing/Portfile b/devel/libpointing/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fbea03a..b51d227 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libpointing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libpointing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,17 +30,10 @@ patchfiles patch-Makefile.diff
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> destroot.env PREFIX=${prefix}
pre-fetch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,13 +44,7 @@ pre-fetch {
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> test.env CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> test.target test
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtermkey/Portfile b/devel/libtermkey/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea9217e..2bcc335 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtermkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libtermkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,14 +34,8 @@ depends_lib port:ncurses
</span> use_configure no
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args ${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libvterm/Portfile b/devel/libvterm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 681e317..2c9497f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libvterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libvterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,15 +38,9 @@ depends_build port:libtool \
</span> use_configure no
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args ${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/Portfile b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f59119d..f2aed68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,20 +71,11 @@ pre-test {
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> test.env CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> test.cmd ./run_tests.py
test.target
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/shc/Portfile b/devel/shc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba7e025..b024d762 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/shc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/shc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,15 +35,9 @@ test.run yes
</span> test.dir ${worksrcpath}
test.cmd ./test/ttest.sh
test.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> test.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# Do not grab alpha releases
livecheck.regex (\[0-9\]+\\.\[0-9\]+\\.\[0-9\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/stm32flash/Portfile b/devel/stm32flash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8dba69b..c0b9d65 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/stm32flash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/stm32flash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,13 +28,8 @@ destroot.args PREFIX=${prefix}
</span> post-patch {
reinplace "s|\$\(AR\) rc|\$\(AR\) rcs|g" ${worksrcpath}/parsers/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
build.args-append CC=${configure.cc}
build.env-append MAKE=${build.cmd} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tup/Portfile b/devel/tup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0e7fc0..6e040d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,17 +35,10 @@ patchfiles patch-build.sh.diff
</span> use_configure no
build.cmd ./build.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
TUP_LABEL=${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TUP_LABEL=${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 0755 ${worksrcpath}/build/tup ${destroot}${prefix}/bin/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/unibilium/Portfile b/devel/unibilium/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b3f013..b9c9947 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/unibilium/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/unibilium/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,14 +30,8 @@ patch.pre_args -p1
</span> use_configure no
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args ${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/atom/Portfile b/editors/atom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b15c336..fbc85ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/atom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/atom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,21 +34,12 @@ build.cmd script/build
</span> configure.cflags-append "-mmacosx-version-min=${macosx_deployment_target}"
configure.cxxflags-append "-mmacosx-version-min=${macosx_deployment_target}"
configure.ldflags-append "-mmacosx-version-min=${macosx_deployment_target}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CC=${configure.cc} [get_canonical_archflags cc]" \
"CXX=${configure.cxx} [get_canonical_archflags cxx]" \
PYTHON=${prefix}/bin/python2.7 \
CFLAGS=${configure.cflags} \
CXXFLAGS=${configure.cxxflags} \
LDFLAGS=${configure.ldflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON="${prefix}/bin/python2.7" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> build.target-delete all
build.args-append --ci
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/spim/Portfile b/emulators/spim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f98ae9..2d3c1ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/spim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/spim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,13 +41,8 @@ worksrcdir code/spim
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> build.target spim
build.args CXX=${configure.cxx} \
MYLEX=${prefix}/bin/flex \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/vpcs/Portfile b/emulators/vpcs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3788505..fd727cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/vpcs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/vpcs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,21 +45,12 @@ platform darwin powerpc {
</span> }
build.cmd ./mk.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
copy ${worksrcpath}/vpcs ${destroot}${prefix}/bin/vpcs
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/bastet/Portfile b/games/bastet/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c604f02..bc0fb00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/bastet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/bastet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,17 +38,10 @@ post-patch {
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env BOOST_PO=-lboost_program_options-mt \
CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env BOOST_PO=-lboost_program_options-mt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.keepdirs ${scoredir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/Portfile b/games/openttd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b882f60..00d5c02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openttd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,17 +51,10 @@ if {${name} eq ${subport}} {
</span> port:openttd-opensfx \
port:openttd-openmsx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
CFLAGS_BUILD=${configure.cflags} \
CXXFLAGS_BUILD=${configure.cxxflags} \
LDFLAGS_BUILD=${configure.ldflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_BUILD="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS_BUILD="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_BUILD="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> configure.args --prefix-dir=${prefix} \
--binary-dir=bin \
--icon-theme-dir=share/icons/hicolor \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/at-spi2-core/Portfile b/gnome/at-spi2-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81ec37a..86fe69c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/at-spi2-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/at-spi2-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,6 @@ patchfiles remove-spurious-gtk-doc-markers.patch
</span> configure.args -Denable-introspection=yes
# gobject-introspection uses g-ir-scanner, which uses $CC from env
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> if {[variant_isset universal]} {
foreach arch ${configure.universal_archs} {
lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,16 +53,5 @@ if {[variant_isset universal]} {
</span> build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_destroot_env(${arch}) CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
livecheck.type gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MyPaint/Portfile b/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e37ee3..65d29bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,15 +90,9 @@ build.cmd ${prefix}/bin/scons
</span> build.target
build.args python_binary=${prefix}/bin/python2.7 \
python_config=${prefix}/bin/python2.7-config
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CC=${configure.cc} [get_canonical_archflags cc]" \
"CXX=${configure.cxx} [get_canonical_archflags cxx]" \
PKG_CONFIG_PATH=${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CONFIG_PATH="${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args {*}${build.args} \
prefix=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/argyll/Portfile b/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25c9891..ca652ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,15 +50,9 @@ build.env-append HAVE_JPEG=true
</span> build.env-append HAVE_PNG=true
build.env-append HAVE_TIFF=true
build.env-append HAVE_Z=true HAVE_ZLIB=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append PREF_CCFLAGS=${configure.cflags}
build.env-append "PREF_LINKFLAGS=${configure.ldflags} \
-ljpeg -lpng -ltiff -lusb-1.0 -lz"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PREF_CCFLAGS="${configure.cflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PREF_LINKFLAGS="${configure.ldflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -ljpeg -lpng -ltiff -lusb-1.0 -lz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> destroot.env {*}${build.env}
destroot.destdir DESTDIR=${worksrcpath}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/babl/Portfile b/graphics/babl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2277ab3..a7cee3e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/babl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/babl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,18 +50,10 @@ configure.args --disable-silent-rules \
</span>
# CC_FOR_BUILD is used by config.guess to determine processor type
if {![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append "CC_FOR_BUILD=${configure.cc} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> } else {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> lappend merger_configure_env(${arch}) "CC_FOR_BUILD=${configure.cc} -arch ${arch}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_configure_env(${arch}) CC_FOR_BUILD='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/exiftran/Portfile b/graphics/exiftran/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a8bff0e..5e24a13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/exiftran/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/exiftran/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,13 +42,8 @@ build.args verbose=yes \
</span> CC="${configure.cc}" \
EXTRA_CFLAGS="${configure.cflags} [get_canonical_archflags cc] ${configure.cppflags}" \
LIB="lib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
CPPFLAGS=${configure.cppflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 0755 ${worksrcpath}/exiftran ${destroot}${prefix}/bin/exiftran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gphoto2/Portfile b/graphics/gphoto2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d63621..e5b2fdb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gphoto2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gphoto2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,13 +34,8 @@ depends_lib port:gettext \
</span> port:popt \
port:readline
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env POPT_CFLAGS=-I${prefix}/include \
"POPT_LIBS=-L${prefix}/lib -lpopt"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env POPT_CFLAGS="-I${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POPT_LIBS="-L${prefix}/lib -lpopt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> configure.args --without-aalib \
--without-cdk \
ac_cv_prog_AWK=/usr/bin/awk
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphene/Portfile b/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a5a8a6d..c536b20 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,20 +62,10 @@ if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {[variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_destroot_env(${arch}) CC='${configure.cc} -arch ${arch}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe/Portfile b/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 439f6a2..d5eabde 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,13 +67,8 @@ variant qvoronoi description {Add qvoronoi ipelet} {
</span> default_variants +qvoronoi
pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CXXFLAGS=[get_canonical_archflags cxx] \
LDFLAGS=[get_canonical_archflags ld]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env CXXFLAGS="[get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> build.args-append IPEPREFIX=${prefix} \
CXX=${configure.cxx} \
LUA_PACKAGE="lua" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openni/Portfile b/graphics/openni/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 73c6973..62aab82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openni/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openni/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,11 +68,7 @@ use_configure no
</span> variant universal {}
build.cmd ./RedistMaker
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CXX=${configure.cxx} [get_canonical_archflags cxx]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CXX="${configure.cxx} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> build.target
pre-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvrml/Portfile b/graphics/openvrml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 87db241..8c29318 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvrml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvrml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,11 +71,7 @@ variant js_spidermonkey description {Enable support for JavaScript in the Script
</span> configure.args-delete --disable-script-node-javascript
configure.args-append --enable-script-node-javascript \
--with-libjs
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append "JS_CFLAGS=-DXP_UNIX -DJS_THREADSAFE -I${prefix}/include/js"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append JS_CFLAGS="-DXP_UNIX -DJS_THREADSAFE -I${prefix}/include/js"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant opengl description {Build the OpenGL renderer} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/chapel/Portfile b/lang/chapel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 16d5902..9c25f76 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/chapel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/chapel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,12 +34,7 @@ build.env-append CHPL_HOST_COMPILER=clang \
</span> CHPL_GMP=none \
CHPL_REGEXP=none \
CHPL_LLVM=none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append LDFLAGS=[get_canonical_archflags ld]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append LDFLAGS="[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.args CXX=${configure.cxx} \
CC=${configure.cc} \
OPT_CFLAGS="${configure.optflags} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mit-scheme/Portfile b/lang/mit-scheme/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index baa2de8..2696cbf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mit-scheme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mit-scheme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,11 +71,7 @@ build.dir ${worksrcpath}/src
</span> build.cmd etc/make-liarc.sh
build.args --prefix=${prefix}
build.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CC=${configure.cc} "CFLAGS=${configure.cflags} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC=${configure.cc} CFLAGS="${configure.cflags} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
livecheck.url https://ftp.gnu.org/gnu/${name}/stable.pkg/
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pypy/Portfile b/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e7760d..6832984 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,15 +81,9 @@ long_description \
</span> PyPy is a replacement for CPython ${python.branch}. The main reason to use it \
instead of CPython is speed, as it runs generally faster.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
"CFLAGS=${configure.cc_archflags} ${configure.cppflags}" \
"LDFLAGS=${configure.ld_archflags} ${configure.ldflags}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cc_archflags} ${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ld_archflags} ${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
build.dir ${worksrcpath}/pypy/goal
build.args --batch --verbose \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby186/Portfile b/lang/ruby186/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2407c45..e99fd3d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby186/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby186/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,11 +92,7 @@ configure.args --enable-shared \
</span> --disable-ucontext
if {![variant_isset universal] && [info exists build_arch] && ${build_arch} ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append "ARCH_FLAG=-arch ${build_arch}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append ARCH_FLAG="-arch ${build_arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
destroot.target install install-doc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/signing-party/Portfile b/mail/signing-party/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd15ec4..99e8212 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/signing-party/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/signing-party/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,13 +55,8 @@ depends_run path:bin/gpg:gnupg2 \
</span> build.args DEB_VERSION_UPSTREAM=${version}
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
pre-build {
reinplace "s|/usr/bin/perl|${perl5.bin}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/hpddm/Portfile b/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6fc20c3..22ba627 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,6 @@ post-extract {
</span> copy ${worksrcpath}/Make.inc/Makefile.OSX ${worksrcpath}/Makefile.inc
}
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
MPICXX=${configure.cxx} \
MPICC=${configure.cc} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,21 +54,6 @@ pre-configure {
</span> "MUMPS_LIBS=-L${prefix}/lib -lmumps_common -lsmumps -ldmumps -lcmumps -lzmumps -lpord" \
"HYPRE_LIBS=-L${prefix}/lib -lHYPRE" \
"PYTHON_LIBS=-L${frameworks_dir}/Python.framework/Versions/2.7/lib -lpython2.7"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MPICXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MPICC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MPIF90=${configure.f90} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MPIRUN="${prefix}/bin/${mpi.exec} -np" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MUMPS_INCS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_INCS=-I${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BLAS_LIBS="-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARPACK_LIBS="-L${prefix}/lib -larpack" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SCALAPACK_LIBS="-L${prefix}/lib -lscalapack" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MUMPS_LIBS="-L${prefix}/lib -lmumps_common -lsmumps -ldmumps -lcmumps -lzmumps -lpord" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HYPRE_LIBS="-L${prefix}/lib -lHYPRE" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_LIBS="-L${frameworks_dir}/Python.framework/Versions/2.7/lib -lpython2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
configure.cmd printenv
configure.pre_args
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/libfaiss/Portfile b/math/libfaiss/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 65ec732..5d1eb1d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/libfaiss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/libfaiss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,6 @@ use_configure no
</span> pre-build {
touch ${worksrcpath}/makefile.inc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cxx}
build.env-append "CFLAGS=-fPIC -m64 -Wall -g -O3 -msse4 -mpopcnt -fopenmp \
-Wno-sign-compare -std=c++11 -I/usr/include/malloc/"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,17 +44,6 @@ build.env-append "SHAREDFLAGS=-Wl,-F. -bundle -undefined dynamic_lookup"
</span> build.env-append FAISSSHAREDFLAGS=-dynamiclib
build.env-append BLASCFLAGS=-DFINTEGER=int
build.env-append "BLASLDFLAGS=-framework Accelerate"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC="${configure.cxx}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CFLAGS="-fPIC -m64 -Wall -g -O3 -msse4 -mpopcnt -fopenmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-sign-compare -std=c++11 -I/usr/include/malloc/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append LDFLAGS="-g -fPIC -fopenmp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append SHAREDEXT="dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append SHAREDFLAGS="-Wl,-F. -bundle -undefined dynamic_lookup"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append FAISSSHAREDFLAGS="-dynamiclib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append BLASCFLAGS="-DFINTEGER=int"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append BLASLDFLAGS="-framework Accelerate"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> build.target libfaiss.a libfaiss.dylib
destroot.target
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,11 +55,7 @@ destroot.cmd mkdir -p ${destroot}${prefix}/lib && \
</span>
variant openblas description {Use OpenBLAS instead of Apple's Accelerate framework} {
depends_lib-append port:openblas
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-delete "BLASLDFLAGS=-framework Accelerate"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-delete BLASLDFLAGS="-framework Accelerate"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> build.env-append BLASLDFLAGS=${prefix}/lib/libopenblas.dylib
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/msieve/Portfile b/math/msieve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 481e97b..4ce5f61 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/msieve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/msieve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,17 +31,10 @@ post-patch {
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CFLAGS=${configure.cflags} \
CPATH=${compiler.cpath} \
LIBRARY_PATH=${compiler.library_path} \
MACHINE_FLAGS=${configure.cc_archflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CFLAGS="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPATH="${compiler.cpath}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY_PATH="${compiler.library_path}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MACHINE_FLAGS="${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 755 -d ${destroot}${prefix}/include/msieve \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a7f898b..065f628 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,19 +138,11 @@ compiler.blacklist-append {*gcc-4.6}
</span>
# see https://wiki.octave.org/Building for a list of dependencies
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> # avoid depends_build-append port:coreutils
configure.env-append "MKDIR_P=/bin/mkdir -p"
# see https://trac.macports.org/ticket/57850
configure.env-append "INSTALL_DATA=\${INSTALL} -m 644 -p"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# avoid depends_build-append port:coreutils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append MKDIR_P="/bin/mkdir -p"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/57850
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append INSTALL_DATA="\${INSTALL} -m 644 -p"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
if { ${os.major} > 10 } {
# avoid depends_build-append port:cctools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,11 +208,7 @@ depends_build-append port:flex
</span> configure.env-append LEX=${prefix}/bin/flex
depends_build-append port:bison
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append "YACC=${prefix}/bin/bison -y"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append YACC="${prefix}/bin/bison -y"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
depends_build-append port:gperf
configure.env-append GPERF=/usr/bin/gperf
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/taucs/Portfile b/math/taucs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d60822b..fef2c3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/taucs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/taucs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,15 +64,9 @@ configure.env-append PREFIX=${prefix} \
</span> OSTYPE=${os.platform}
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
LIBBLAS=${linalglib} \
LIBLAPACK=
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBBLAS="${linalglib}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBLAPACK=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/Portfile b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c7eac0e..784785a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,15 +206,9 @@ autoreconf.cmd ./bootstrap
</span> autoreconf.pre_args
autoreconf.args
depends_build-append port:libtool port:autoconf port:automake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span> "CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP="${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXCPP="${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1 -k
# gl.c:121:3: error: Platform not recognized.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/Portfile b/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ada2e2e..e3230c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,13 +192,8 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> autoreconf.args
depends_build-append port:libtool port:autoconf port:automake
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CXXCPP=${configure.cxx} -E"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXCPP="${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 057387f..001b9c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,11 +252,7 @@ if {[variant_isset universal]} {
</span> lappend merger_configure_args(x86_64) --enable-x86asm
} else {
configure.args-append --arch=${configure.build_arch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append ASFLAGS=[get_canonical_archflags]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append ASFLAGS='[get_canonical_archflags]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
depends_build-append port:nasm
configure.args-append --enable-x86asm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e9fd66..0f9a6fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,11 +251,7 @@ if {[variant_isset universal]} {
</span> lappend merger_configure_args(x86_64) --enable-x86asm
} else {
configure.args-append --arch=${configure.build_arch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append ASFLAGS=[get_canonical_archflags]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append ASFLAGS='[get_canonical_archflags]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
depends_build-append port:nasm
configure.args-append --enable-x86asm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mlt/Portfile b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1fd1dea..cff1b13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,20 +122,14 @@ build.args-append CC="${configure.cc}" CXX="${configure.cxx}" CPP="${c
</span>
if {[variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) {*}"CFLAGS='${configure.cflags} -arch ${arch}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) {*}"CXXFLAGS='${configure.cxxflags} -arch ${arch}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) {*}"LDFLAGS='${configure.ldflags} -L${worksrcpath}-${arch}/src/framework -L${prefix}/lib -arch ${arch}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CFLAGS=${configure.cflags} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CXXFLAGS=${configure.cxxflags} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "LDFLAGS=${configure.ldflags} -L${worksrcpath}-${arch}/src/framework -L${prefix}/lib -arch ${arch}"
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
build.env-append "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]"
build.env-append "LDFLAGS=${configure.ldflags} -L${worksrcpath}/src/framework -L${prefix}/lib [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append LDFLAGS="${configure.ldflags} -L${worksrcpath}/src/framework -L${prefix}/lib [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant gtk2 description {include the gtk2 module (for additional image and text producers)} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/bittwist/Portfile b/net/bittwist/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 03bbbd3..1d11151 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/bittwist/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/bittwist/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,7 @@ livecheck.regex bittwist-macosx-(.*?)${extract.suffix}
</span> configure {
reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CFLAGS=${configure.cflags} -D__BSD_VISIBLE"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CFLAGS="${configure.cflags} -D__BSD_VISIBLE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 755 -W ${worksrcpath}/src bittwist bittwistb bittwiste \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/deluge/Portfile b/net/deluge/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f449647..05c23c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/deluge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/deluge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,17 +42,10 @@ post-patch {
</span> ${worksrcpath}/deluge/i18n/util.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env "PYTHON_CFLAGS=-I${prefix}/include -I${prefix}/include/boost" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "PYTHON_CFLAGS=-I${prefix}/include -I${prefix}/include/boost" \
</span> PYTHON_LDFLAGS=-L${prefix}/lib \
"CFLAGS=-I${prefix}/include -I${prefix}/include/boost" \
CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env PYTHON_CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_LDFLAGS=-L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
variant python27 conflicts python37 description {Build for Python 2.7} {
require_active_variants libtorrent-rasterbar python27
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dnsmasq/Portfile b/net/dnsmasq/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a01114..842e8e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dnsmasq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dnsmasq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,13 +48,8 @@ post-patch {
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CC=${configure.cc} [get_canonical_archflags]"
destroot.env-append "CC=${configure.cc} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC="${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CC="${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args PREFIX=${prefix}
destroot.keepdirs ${destroot}${prefix}/var/run/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gpsd/Portfile b/net/gpsd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6efd2eb..f71fb84 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gpsd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gpsd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,19 +134,11 @@ build.args prefix=${prefix} \
</span> strip=no \
dbus_export=no \
xgps=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CC=${configure.cc} [get_canonical_archflags cc]" \
CFLAGS=${configure.cflags} \
"CXX=${configure.cxx} [get_canonical_archflags cxx] ${cxx_stdlibflags}" \
CXXFLAGS=${configure.cxxflags} \
LDFLAGS=${configure.ldflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx} [get_canonical_archflags cxx] ${cxx_stdlibflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# Allow the regression tests to be run via "port test gpsd".
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/newsboat/Portfile b/net/newsboat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a59c550..b6ff1c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/newsboat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/newsboat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -425,13 +425,8 @@ variant universal {}
</span> build.args-append prefix=${prefix} \
CXX=${configure.cxx}
build.target-append doc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args-append \
prefix=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/whois/Portfile b/net/whois/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70fb992..9402979 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/whois/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/whois/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,19 +75,11 @@ post-configure {
</span> variant universal {}
build.target-append pos
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CC=${configure.cc} [get_canonical_archflags]" \
CONFIG_FILE=${prefix}/etc/whois.conf \
HAVE_LIBIDN2=1 \
HAVE_ICONV=1 \
LOCALEDIR=${prefix}/share/locale
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG_FILE=${prefix}/etc/whois.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_LIBIDN2=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_ICONV=1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOCALEDIR=${prefix}/share/locale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> build.args prefix=${prefix} \
INCLUDES="${configure.cflags} ${configure.cppflags}" \
LIBS="${configure.ldflags}" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-clnum/Portfile b/python/py-clnum/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6bc0d9..3756090 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-clnum/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-clnum/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +28,7 @@ python.versions 26
</span> if {${subport} ne ${name}} {
depends_lib-append port:cln
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CPPFLAGS=${configure.cppflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env CPPFLAGS="${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
post-destroot {
set docdir ${destroot}${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-networkit/Portfile b/python/py-networkit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d03df0c..048d6e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-networkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-networkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,6 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-scikit-learn \
port:py${python.version}-ipython
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
CXX=${configure.cxx} \
CFLAGS=${configure.cc_archflags} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,19 +60,6 @@ if {${name} ne ${subport}} {
</span> CFLAGS=${configure.cc_archflags} \
CXXFLAGS=${configure.cxx_archflags} \
CPPFLAGS=${configure.cppflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxx_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxx_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/Portfile b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e80a7b8..511db65 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,19 +79,11 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-cython
pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append ARCHFLAGS=[get_canonical_archflags ld]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append ARCHFLAGS="[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env-append ARCHFLAGS=[get_canonical_archflags ld]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append ARCHFLAGS="[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant atlas conflicts openblas description "Use MacPorts ATLAS Libraries" {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/Portfile b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7bc9b83..909565f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,13 +59,8 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pytest
worksrcdir ${distname}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CCFLAGS=-I${prefix}/include -L${prefix}/lib"
destroot.env-append "CCFLAGS=-I${prefix}/include -L${prefix}/lib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> configure.fflags-append -fno-second-underscore
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +69,6 @@ if {${name} ne ${subport}} {
</span> build.cmd-append ${fc_options} ${config_options}
destroot.cmd-append ${fc_options} ${config_options}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
CXX=${configure.cxx} \
CFLAGS=${configure.cc_archflags} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,18 +79,6 @@ if {${name} ne ${subport}} {
</span> CFLAGS=${configure.cc_archflags} \
CXXFLAGS=${configure.cxx_archflags} \
CPPFLAGS=${configure.cppflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxx_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxx_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ccfits/Portfile b/science/ccfits/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c2fe94..44b5ee0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ccfits/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ccfits/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,7 @@ configure.args-append \
</span> --with-cfitsio=${prefix}
# avoid depends_build-append port:coreutils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append "MKDIR_P=/bin/mkdir -p"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append MKDIR_P="/bin/mkdir -p"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# avoid depends_build-append port:gmake
configure.env-append GMAKE=/usr/bin/make
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/dssp/Portfile b/science/dssp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f18afc6..53a836a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/dssp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/dssp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,21 +36,12 @@ depends_lib-append port:boost
</span> configure.cmd ./autogen.sh && ./configure
configure.args --disable-silent-rules
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span> "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
CPPFLAGS=${configure.cppflags} \
CXX=${configure.cxx} \
"CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
build.target mkdssp
destroot.target install-binPROGRAMS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/liquid-dsp/Portfile b/science/liquid-dsp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 20ee652..dd5a1b3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/liquid-dsp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/liquid-dsp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,17 +39,10 @@ pre-configure {
</span> }
# make sure MP programs are used
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
SED=${prefix}/bin/gsed \
GREP=${prefix}/bin/ggrep \
"EGREP=${prefix}/bin/ggrep -E"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SED=${prefix}/bin/gsed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GREP=${prefix}/bin/ggrep \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EGREP="${prefix}/bin/ggrep -E"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# remove top-level include path, such that internal headers are used
# instead of any already-installed ones.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/mksh/Portfile b/shells/mksh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 95df0a4..69ea2b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/mksh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/mksh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,17 +37,10 @@ build.target
</span> if {${build.jobs} > 1} {
build.args-append -j
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
CPPFLAGS=${configure.cppflags} \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -d ${destroot}${prefix}/share/doc/mksh/examples/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/Portfile b/sysutils/amttools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c94080c..cb57bd8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/amttools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,13 +59,8 @@ patchfiles patch-amttool-prepare-hashbang-for-reinplace.diff \
</span> patch-GNUmakefile-disable-gamt.diff
build.type gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CFLAGS=${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> build.args CC=${configure.cc} \
LD=${configure.cc} \
verbose=yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/cocoa-tlassemble/Portfile b/sysutils/cocoa-tlassemble/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0764dd..01bd8d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/cocoa-tlassemble/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/cocoa-tlassemble/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,11 +23,7 @@ patch {
</span> reinplace "s/clang/\$(CC)/g" ${worksrcpath}/makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CC=${configure.cc} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC="${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/entr/Portfile b/sysutils/entr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ac421ea..6928852 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/entr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/entr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,26 +28,14 @@ worksrcdir eradman-entr-f4e2cbe57708
</span> # ./configure is just a simple batch file
configure.pre_args
configure.universal_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.destdir PREFIX="${destroot}${prefix}" \
MANPREFIX="${destroot}${prefix}/share/man"
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> test.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/pidof/Portfile b/sysutils/pidof/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 32edf67..3504a8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/pidof/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/pidof/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,15 +26,9 @@ patchfiles patch-Makefile.diff \
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
CFLAGS=${configure.cflags} \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.env-append PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rw/Portfile b/sysutils/rw/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e573582..8c75133 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/rw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,17 +37,10 @@ pre-fetch {
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CC=${configure.cc} [get_canonical_archflags cc]" \
CPPFLAGS=${configure.cppflags} \
CFLAGS=${configure.cflags} \
LDFLAGS=${configure.ldflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/smlr/Portfile b/sysutils/smlr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fcd5d2e..56c218c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/smlr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/smlr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,16 +21,9 @@ patchfiles patch-Makefile.diff
</span> variant universal {}
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.env PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/tag/Portfile b/sysutils/tag/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 023d3d4..2a7be01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/tag/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/tag/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,13 +22,8 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args prefix=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/tldr-cpp-client/Portfile b/sysutils/tldr-cpp-client/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8050163..4925e47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/tldr-cpp-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/tldr-cpp-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,17 +31,10 @@ depends_build-append \
</span> depends_lib-append \
port:curl \
port:libzip
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CC=${configure.cc} \
LD=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC='${configure.cc}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD='${configure.cc}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tex/latex2rtf/Portfile b/tex/latex2rtf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 34f77a5..7e2ba23 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tex/latex2rtf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tex/latex2rtf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,13 +34,8 @@ installs_libs no
</span> destroot.target install install-info
# append to CFLAGS (instead of replacing value in Makefile)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
destroot.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
build.pre_args-append \
PREFIX=${prefix} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/http-parser/Portfile b/www/http-parser/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 45f4c82..57d728c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/http-parser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/http-parser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,8 @@ build.env CC=${configure.cc} \
</span> PREFIX=${prefix}
pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nghttp2/Portfile b/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f317777..6e5a0d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,17 +54,10 @@ configure.env JANSSON_CFLAGS=-I${prefix}/include \
</span> LIBEVENT_OPENSSL_CFLAGS=-I${prefix}/include/event2 \
OPENSSL_CFLAGS=-I${prefix}/include/openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span> "JANSSON_LIBS=-L${prefix}/lib -ljansson" \
"LIBEVENT_OPENSSL_LIBS=-L${prefix}/lib -levent -levent_openssl" \
"OPENSSL_LIBS=-L${prefix}/lib -lcrypto -lssl"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JANSSON_LIBS="-L${prefix}/lib -ljansson" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBEVENT_OPENSSL_LIBS="-L${prefix}/lib -levent -levent_openssl" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_LIBS="-L${prefix}/lib -lcrypto -lssl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
if {[variant_isset python27]} { set PythonVersion 2.7 }
if {[variant_isset python36]} { set PythonVersion 3.6 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,11 +87,7 @@ if {[variant_isset python27] || [variant_isset python36] || [variant_isset pytho
</span> }
variant python27 conflicts python36 python37 description {Build using Python 2.7} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append "PYTHON_EXTRA_LDFLAGS=-u _PyMac_Error ${frameworks_dir}/Python.framework/Versions/${PythonVersion}/Python"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_EXTRA_LDFLAGS="-u _PyMac_Error ${frameworks_dir}/Python.framework/Versions/${PythonVersion}/Python"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant python36 conflicts python27 python37 description {Build using Python 3.6} {}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/herbstluftwm/Portfile b/x11/herbstluftwm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f48a81a..4a1be01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/herbstluftwm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/herbstluftwm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,15 +44,9 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> variant universal {}
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig \
"CFLAGS=${configure.cflags} [get_canonical_archflags]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
build.args-append CC=${configure.cc} \
LD=${configure.cc} \
</pre><pre style='margin:0'>
</pre>