<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/88ea58499404818b508cb19e6064716e2d2c9317">https://github.com/macports/macports-ports/commit/88ea58499404818b508cb19e6064716e2d2c9317</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 88ea584 nomaintainer ports: remove old base compat code
</span>88ea584 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 88ea58499404818b508cb19e6064716e2d2c9317
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Oct 6 13:22:59 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> nomaintainer ports: remove old base compat code
</span>---
archivers/deco-archive/Portfile | 10 ----------
archivers/zstd/Portfile | 9 ---------
audio/mp3_check/Portfile | 5 -----
benchmarks/forkbomb/Portfile | 6 ------
benchmarks/nbench-byte/Portfile | 4 ----
databases/leveldb/Portfile | 16 ----------------
databases/tokyocabinet-java/Portfile | 11 -----------
devel/PIDA/Portfile | 9 +--------
devel/bsdiff/Portfile | 6 ------
devel/csu/Portfile | 8 --------
devel/cvsps/Portfile | 8 --------
devel/darwinbuild-legacy/Portfile | 5 -----
devel/dub/Portfile | 15 ---------------
devel/libast/Portfile | 6 +-----
devel/libghash/Portfile | 7 -------
devel/libmaxminddb/Portfile | 6 ------
devel/lua-luasec/Portfile | 8 --------
devel/lua-md5/Portfile | 5 -----
devel/lua-rings/Portfile | 5 -----
devel/nuweb/Portfile | 5 -----
devel/qqwing/Portfile | 9 ---------
devel/tradcpp/Portfile | 7 +------
editors/TECO/Portfile | 6 ------
editors/dhex/Portfile | 9 ---------
emulators/atari800/Portfile | 4 ----
fuse/ext4fuse/Portfile | 6 ------
games/blobwars/Portfile | 6 ------
games/defendguin/Portfile | 7 -------
games/fife/Portfile | 5 -----
games/fortune/Portfile | 5 -----
games/gtkevemon/Portfile | 6 ------
games/larn/Portfile | 4 ----
games/svinepalsen/Portfile | 4 ----
games/vectoroids/Portfile | 4 ----
gnome/gcab/Portfile | 12 ------------
gnome/libdazzle/Portfile | 12 ------------
graphics/antigraingeometry/Portfile | 4 ----
graphics/feh/Portfile | 7 -------
graphics/gpick/Portfile | 8 --------
graphics/makeicns/Portfile | 8 --------
graphics/mftrace/Portfile | 4 ----
graphics/mscgen/Portfile | 4 ----
graphics/pngquant/Portfile | 8 --------
graphics/povray/Portfile | 4 ----
irc/bitlbee/Portfile | 4 ----
java/zeroc-ice35-java/Portfile | 8 --------
lang/bf2c/Portfile | 6 ------
lang/cbmbasic/Portfile | 6 ------
lang/gcc10/Portfile | 9 ---------
lang/gcc43/Portfile | 9 ---------
lang/gcc44/Portfile | 9 ---------
lang/gcc45/Portfile | 9 ---------
lang/gcc46/Portfile | 9 ---------
lang/gcc47/Portfile | 9 ---------
lang/gcc48/Portfile | 9 ---------
lang/gcc49/Portfile | 9 ---------
lang/gcc5/Portfile | 9 ---------
lang/gcc6/Portfile | 9 ---------
lang/gcc7/Portfile | 9 ---------
lang/gcc8/Portfile | 9 ---------
lang/gcc9/Portfile | 9 ---------
lang/javascript-lint/Portfile | 4 ----
lang/jlint/Portfile | 5 -----
lang/mozart/Portfile | 4 ----
lang/pcc/Portfile | 4 ----
lang/v8/Portfile | 13 -------------
mail/altermime/Portfile | 5 -----
mail/notmuch-addrlookup/Portfile | 4 ----
mail/procmail/Portfile | 4 ----
math/DSDP/Portfile | 12 ------------
math/SuiteSparse/Portfile | 28 ----------------------------
math/mumps/Portfile | 4 ----
math/pdc/Portfile | 6 ------
net/csup/Portfile | 4 ----
net/fetch/Portfile | 6 ------
net/honeyd/Portfile | 6 ------
net/libfetch/Portfile | 6 ------
net/logjam/Portfile | 4 ----
net/ngrep/Portfile | 6 ------
ocaml/camlimages/Portfile | 9 ++-------
ocaml/ocaml-zip/Portfile | 4 ----
perl/p5-dbd-pg/Portfile | 36 ------------------------------------
python/py-ffc/Portfile | 8 --------
python/py-hcluster/Portfile | 4 ----
python/py-pcapy/Portfile | 6 ------
python/py-pymc/Portfile | 17 -----------------
python/py-pynifti/Portfile | 4 ----
python/py-qutip/Portfile | 10 ----------
python/py-scientific/Portfile | 5 -----
ruby/rb-postgres/Portfile | 24 ------------------------
science/h4h5tools/Portfile | 5 -----
science/nMOLDYN/Portfile | 4 ----
science/ocaml-mpi/Portfile | 4 ----
security/aesutil/Portfile | 5 -----
security/libewf/Portfile | 5 -----
security/libtomcrypt/Portfile | 4 ----
security/nasty/Portfile | 6 ------
security/sancp/Portfile | 6 ------
security/sign/Portfile | 5 -----
sysutils/brightness/Portfile | 6 ------
sysutils/disktype/Portfile | 6 ------
sysutils/dvdrtools/Portfile | 5 -----
sysutils/gkrellm/Portfile | 7 -------
sysutils/john/Portfile | 6 ------
sysutils/libfaketime/Portfile | 6 ------
sysutils/maxwell/Portfile | 4 ----
sysutils/rpm54/Portfile | 5 -----
sysutils/uif2iso/Portfile | 4 ----
sysutils/watchman/Portfile | 4 ----
textproc/opensp/Portfile | 4 ----
textproc/texinfo/Portfile | 6 ------
www/cgit/Portfile | 5 -----
www/webkit-gtk-2.0/Portfile | 4 ----
www/webkit-gtk/Portfile | 4 ----
x11/gkrellm-gtodo/Portfile | 6 ------
x11/openmotif/Portfile | 4 ----
x11/windowmaker/Portfile | 6 ------
xfce/xfce4-settings/Portfile | 8 --------
118 files changed, 5 insertions(+), 839 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/deco-archive/Portfile b/archivers/deco-archive/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6821b1e..bcbc9ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/deco-archive/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/deco-archive/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,16 +18,6 @@ master_sites ${homepage}download/
</span> checksums rmd160 09482ab28c92e09161160f5240d0c967435074cd \
sha256 128253a1b232ac10993d7a20b6cb31dfc1f4ad9d9015b0483a33fb6ea558844d
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info command macports_version] ne "macports_version" || [vercmp [macports_version] "2.3.3"] <= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Due to a bug in MacPorts, this port only works in MacPorts\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- versions later then 2.3.3, once they are released. See\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #47283 (https://trac.macports.org/ticket/47283) for more\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- information."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "incompatible macports version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
build {}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/Portfile b/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 525bc31..b8c41d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,21 +39,12 @@ variant universal {}
</span>
build.target allmost
<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]" \
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-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;'>- 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>
test.run yes
test.env-append {*}${build.env}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/mp3_check/Portfile b/audio/mp3_check/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f198659..55e1cf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/mp3_check/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/mp3_check/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,8 @@ configure.cflags-append -std=gnu89
</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} \
"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 {
xinstall -m 755 ${worksrcpath}/mp3_check \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/benchmarks/forkbomb/Portfile b/benchmarks/forkbomb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a675126..5bf7e5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/benchmarks/forkbomb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/benchmarks/forkbomb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,14 +28,8 @@ 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} [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-append PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/benchmarks/nbench-byte/Portfile b/benchmarks/nbench-byte/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a926fc4..f81b30b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/benchmarks/nbench-byte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/benchmarks/nbench-byte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,11 +44,7 @@ post-install {
</span> }
if {${build_arch} ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append 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-append CFLAGS="${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/leveldb/Portfile b/databases/leveldb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8168bf0..eb19da8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/leveldb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/leveldb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,6 @@ if {[string match *clang* ${configure.cxx}]} {
</span> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
<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}) \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,21 +61,6 @@ if { [variant_isset universal] } {
</span> "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;'>-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}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} -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><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;'>- 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;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
build.env-append \
INSTALL_PATH=${prefix}/lib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/tokyocabinet-java/Portfile b/databases/tokyocabinet-java/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52edfb1..ced9f1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/tokyocabinet-java/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/tokyocabinet-java/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,6 @@ set javahome /System/Library/Frameworks/JavaVM.framework
</span> patch.args -p1
patchfiles patch-Makefile.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> ## configure ##
configure.env MYJAVAHOME=${javahome} \
"CFLAGS=-I${prefix}/include -I${javahome}/Headers" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,16 +33,6 @@ configure.env MYJAVAHOME=${javahome} \
</span> ## build ##
build.env "CFLAGS=-I${prefix}/include -I${javahome}/Headers" \
LDFLAGS=-L${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## configure ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env MYJAVAHOME=${javahome} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="-I${prefix}/include -I${javahome}/Headers" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=-L${prefix}/lib INCLUDEDIR=${javahome}/Headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## build ##
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CFLAGS="-I${prefix}/include -I${javahome}/Headers" \
</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>
post-destroot {
set jarfile tokyocabinet.jar
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/PIDA/Portfile b/devel/PIDA/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 723cd23..28361c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/PIDA/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/PIDA/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,18 +30,11 @@ depends_lib port:py${python.version}-bpython \
</span> port:py${python.version}-py \
port:libmagic \
port:dbus-python${python.version}
<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:#e0ffe0;'>+
</span> build.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
PATH=${python.prefix}/bin:$env(PATH)
destroot.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
PATH=${python.prefix}/bin:$env(PATH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH="${python.prefix}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env PKG_CONFIG_PATH="${python.prefix}/lib/pkgconfig" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH="${python.prefix}/bin:$env(PATH)"
</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/devel/bsdiff/Portfile b/devel/bsdiff/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7032709..5c2102d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bsdiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bsdiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,15 +32,9 @@ patchfiles patch-bspatch.c.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} [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;color:#808080;'>diff --git a/devel/csu/Portfile b/devel/csu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4805a37..46434e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/csu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/csu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,22 +17,14 @@ checksums rmd160 5196472e25fbe87566646d3cfba55f8c20c6d482 \
</span>
use_configure no
default_variants +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} -Wl,-new_linker"
<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} -Wl,-new_linker'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> destroot.env-append DSTROOT=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk
variant universal {
if {${os.major} == 9} {
configure.universal_archs ppc ppc64 i386 x86_64
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append RC_ARCHS=${configure.universal_archs}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append RC_ARCHS='${configure.universal_archs}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
platform darwin 9 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cvsps/Portfile b/devel/cvsps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d8eee17..84c3048 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cvsps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cvsps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,18 +29,10 @@ depends_lib port:zlib
</span> patchfiles cvsps_2.1-4.diff Makefile.diff
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} \
CPPFLAGS=${configure.cppflags} \
"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;'>- CPPFLAGS="${configure.cppflags}" \
</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}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/darwinbuild-legacy/Portfile b/devel/darwinbuild-legacy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9612bff..6dce0f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/darwinbuild-legacy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/darwinbuild-legacy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,13 +47,8 @@ revision 656
</span> build.post_args-append \
PREFIX=${prefix}
if {[info exists build_arch]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append \
"RC_CFLAGS=-arch ${build_arch}"
<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;'>- RC_CFLAGS="-arch ${build_arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
destroot.post_args-append \
PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/dub/Portfile b/devel/dub/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 75c4979..779f17f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/dub/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/dub/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,6 @@ patchfiles-append patch-dub.d.diff
</span> post-patch {
reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" source/dub/dub.d
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> if { ![variant_isset universal] } {
if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
build.env-append "DMD=${prefix}/bin/dmd -m64"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,19 +57,5 @@ if { ![variant_isset universal] } {
</span> lappend merger_build_env(ppc64) "DMD=${prefix}/bin/dmd -m64"
lappend merger_build_env(ppc) "DMD=${prefix}/bin/dmd -m32"
}
<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;'>- if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append DMD="${prefix}/bin/dmd -m64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append DMD="${prefix}/bin/dmd -m32"
</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;'>- lappend merger_build_env(x86_64) DMD='${prefix}/bin/dmd -m64'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(i386) DMD='${prefix}/bin/dmd -m32'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(ppc64) DMD='${prefix}/bin/dmd -m64'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(ppc) DMD='${prefix}/bin/dmd -m32'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
github.livecheck.regex {([^"rba]+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libast/Portfile b/devel/libast/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ab3da3a..6bc926b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libast/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libast/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,4 @@ patchfiles patch-configure.ac.diff
</span>
use_autoreconf yes
autoreconf.args -fvi
<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;'>- autoreconf.env "ACLOCAL=aclocal -I ${prefix}/share/aclocal -I ."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoreconf.env ACLOCAL="aclocal -I ${prefix}/share/aclocal -I ."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.env "ACLOCAL=aclocal -I ${prefix}/share/aclocal -I ."
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libghash/Portfile b/devel/libghash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef4fec4..acf118e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libghash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libghash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,17 +23,10 @@ patchfiles patch-Makefile
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env PREFIX=${prefix} \
CC=${configure.cc} \
"CFLAGS=${configure.cflags} ${configure.cc_archflags}" \
LDFLAGS=${configure.ld_archflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env PREFIX="${prefix}" \
</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} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ld_archflags}"
</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/libmaxminddb/Portfile b/devel/libmaxminddb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b122d4..7bfb297 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libmaxminddb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libmaxminddb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,15 +32,9 @@ github.tarball_from releases
</span> depends_build port:automake port:autoconf port:libtool
# For the t/libtap subdirectory.
<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>
test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/lua-luasec/Portfile b/devel/lua-luasec/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e23076..d5b6db7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/lua-luasec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/lua-luasec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,19 +37,11 @@ set lua_path ${prefix}/share/lua/${lua_version}
</span> set lua_cpath ${prefix}/lib/lua/${lua_version}
build.target macosx
<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]" \
INC_PATH=-I${prefix}/include \
LIB_PATH=-L${prefix}/lib \
LUAPATH=${lua_path} \
LUACPATH=${lua_cpath}
<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;'>- INC_PATH=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB_PATH=-L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUAPATH=${lua_path} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUACPATH=${lua_cpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.env LUAPATH=${lua_path} \
LUACPATH=${lua_cpath}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/lua-md5/Portfile b/devel/lua-md5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c1ae8c4..8cc9958 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/lua-md5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/lua-md5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,13 +42,8 @@ build.args CC=${configure.cc} \
</span>
# configure script is not from autotools, it only searches for lua binary prefix
# it is needed to manually set flags env variable in build phase
<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] -llua -lm"
<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] -llua -lm"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
post-build {
# fdemo example is broken, it's using libcrypt
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/lua-rings/Portfile b/devel/lua-rings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 40681ed..e7bd08e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/lua-rings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/lua-rings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,13 +30,8 @@ post-patch {
</span> variant universal {}
# it is needed to manually set flags env variable as well
<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] -llua -lm"
<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] -llua -lm"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
post-destroot {
xinstall -d ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nuweb/Portfile b/devel/nuweb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 48126f4..b7c13f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nuweb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nuweb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,13 +23,8 @@ checksums rmd160 0c32ae064d742ff32bde14ab4a6a269c52772b84 \
</span> use_configure no
build.target nuweb
<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] -std=gnu89 -Wno-return-type"
<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] -std=gnu89 -Wno-return-type'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 0755 ${build.dir}/nuweb ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qqwing/Portfile b/devel/qqwing/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a8c4b2..272775a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qqwing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qqwing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,20 +32,11 @@ 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 CC=${configure.cc} \
"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 tgz
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tradcpp/Portfile b/devel/tradcpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index afff9b4..5d56461 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tradcpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tradcpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ installs_libs no
</span> maintainers nomaintainer
description a traditional (K&R-style) C preprocessor
long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${name} is a ${description}. It has the particular property that it \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name} is ${description}. It has the particular property that it \
</span> doesn't (for the most part) trash whitespace, so it can be used on \
makefiles.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,12 +25,7 @@ checksums rmd160 e1ec74bc8623587ec26a8c7c8292e96935037144 \
</span>
use_configure no
build.type bsd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CFLAGS=${configure.cflags} ${configure.cc_archflags}" \
CC=${configure.cc} NO_WERROR=1
<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} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc}" NO_WERROR=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.env BINDIR=${prefix}/bin MANDIR=${prefix}/share/man/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/TECO/Portfile b/editors/TECO/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index be3ae95..399c8df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/TECO/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/TECO/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,15 +23,9 @@ extract.mkdir yes
</span> patchfiles patch-te_subs.c Makefile.patch
use_configure no
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}" \
"LDFLAGS=${configure.ldflags} ${configure.ld_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}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} ${configure.ld_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 755 -W ${worksrcpath} te ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/dhex/Portfile b/editors/dhex/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a86dc7a..5e99928 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/dhex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/dhex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,20 +27,11 @@ depends_lib-append port:ncurses
</span> patchfiles patch-dhex-makefile.diff
use_configure no
<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} \
"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}" \
</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.destdir DESTDIR=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/atari800/Portfile b/emulators/atari800/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ee34d5..a71b862 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/atari800/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/atari800/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,11 +61,7 @@ configure.args --mandir='\${prefix}/share/man' \
</span> --sysconfdir='\${prefix}/etc/${name}' \
--disable-sdltest
configure.cxxflags-append "-I${prefix}/include"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append "CFLAGS=-O2 -I${prefix}/include -I${prefix}/include/SDL -D_GNU_SOURCE=1 -D_THREAD_SAFE"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append CFLAGS="-O2 -I${prefix}/include -I${prefix}/include/SDL -D_GNU_SOURCE=1 -D_THREAD_SAFE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
worksrcdir ${name}-${version}/src
use_parallel_build yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/fuse/ext4fuse/Portfile b/fuse/ext4fuse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d6da37a..d73fec6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/fuse/ext4fuse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/fuse/ext4fuse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,15 +25,9 @@ use_configure no
</span>
# osxfuse is not universal
universal_variant 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]"
<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;'>-}
</span>
build.target
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/blobwars/Portfile b/games/blobwars/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 046739a..cce2543 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/blobwars/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/blobwars/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,15 +52,9 @@ variant universal {}
</span>
use_parallel_build yes
build.args PREFIX=${prefix}
<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]" \
CFLAGS=${configure.cppflags} \
USEPAK=1
<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;'>- CFLAGS="${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USEPAK=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.destdir PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/defendguin/Portfile b/games/defendguin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2774dc5..6b61745 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/defendguin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/defendguin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,17 +37,10 @@ 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 "CFLAGS=${configure.cflags} [get_canonical_archflags]" \
CC=${configure.cc} \
PREFIX=${prefix} \
JOY=NO
<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} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JOY=NO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args PREFIX=${destroot}${prefix} \
MAN_PREFIX=${destroot}${prefix}/share
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/fife/Portfile b/games/fife/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b2fd5f..0158864 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/fife/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/fife/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,13 +49,8 @@ build.cmd ${prefix}/bin/scons
</span> build.target fife
build.args --prefix=${prefix} \
--python-prefix=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages/
<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]" \
SWIG=${prefix}/bin/swig
<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;'>- SWIG=${prefix}/bin/swig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# Check if this is still needed in 0.3.6
# http://fife.trac.cvsdude.com/engine/ticket/575
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/fortune/Portfile b/games/fortune/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bee04fb..bb45108 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/fortune/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/fortune/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,13 +43,8 @@ use_configure no
</span> variant universal {}
build.type bsd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CFLAGS=[get_canonical_archflags] \
CC=${configure.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="[get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 755 -W ${worksrcpath} fortune/fortune strfile/strfile \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/gtkevemon/Portfile b/games/gtkevemon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5350d77..05643af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/gtkevemon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/gtkevemon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,15 +39,9 @@ use_configure no
</span> variant universal {}
use_parallel_build yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CXX=${configure.cxx} \
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 CXX=${configure.cxx} \
</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;'>- LDFLAGS="[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.destdir INSTALL_BIN=${destroot}${prefix}/bin \
INSTALL_DIR_DESK=${destroot}${prefix}/share/applications/ \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/larn/Portfile b/games/larn/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b93996..19d28a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/larn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/larn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,11 +16,7 @@ distname ${name}-4.6.2-RELEASE
</span> checksums md5 cea96f48caa057793f6bcaf3394ca388
build.type bsd
build.args CC=${configure.cc}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append "CFLAGS=-I${prefix}/include -I${prefix}/include/ncurses -Wno-implicit-function-declaration -Wno-return-type"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CFLAGS="-I${prefix}/include -I${prefix}/include/ncurses -Wno-implicit-function-declaration -Wno-return-type"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
depends_lib-append port:ncurses
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/svinepalsen/Portfile b/games/svinepalsen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e90d072..d71784d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/svinepalsen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/svinepalsen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,11 +52,7 @@ post-configure {
</span> ${configure.dir}/src/svinepalsen.cc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CPPFLAGS=-I${prefix}/include -I${prefix}/include/smpeg" 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 CPPFLAGS="-I${prefix}/include -I${prefix}/include/smpeg" LDFLAGS="-L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
post-destroot {
xinstall -d ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/vectoroids/Portfile b/games/vectoroids/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 57cea01..46c6226 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/vectoroids/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/vectoroids/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +28,7 @@ depends_lib port:libsdl \
</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} [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 CC="${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
build.args JOY=NO \
PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gcab/Portfile b/gnome/gcab/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e9a5c91..a5774a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gcab/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gcab/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,6 @@ patchfiles dont-use-version-script.patch
</span> compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 300}
# 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;'>@@ -49,16 +48,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-with-unstable
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libdazzle/Portfile b/gnome/libdazzle/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9463318..029e48b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libdazzle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libdazzle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,6 @@ depends_lib-append port:gtk3
</span> compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 212}
# 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;'>@@ -47,16 +46,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/antigraingeometry/Portfile b/graphics/antigraingeometry/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00f214e..7f47936 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/antigraingeometry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/antigraingeometry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,11 +47,7 @@ if {![variant_isset sdl]} {
</span>
use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> autoreconf.env "AUTOMAKE=automake --foreign --add-missing --ignore-deps"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.env AUTOMAKE="automake --foreign --add-missing --ignore-deps"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
configure.args --disable-ctrl \
--disable-examples \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/feh/Portfile b/graphics/feh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ec302c..da85d79 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/feh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/feh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,17 +35,10 @@ variant universal {}
</span>
build.args PREFIX=${prefix}
<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.args PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gpick/Portfile b/graphics/gpick/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0273c8f..a70b737 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gpick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gpick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,19 +43,11 @@ configure.ldflags-append -lexpat
</span>
build.cmd ${prefix}/bin/scons
build.target build
<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]"
<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;'>-}
</span>
destroot.env {*}${build.env}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/makeicns/Portfile b/graphics/makeicns/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7bbb50a..1ab4b6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/makeicns/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/makeicns/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,19 +41,11 @@ if {[string match *clang* ${configure.cxx}]} {
</span> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
<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.cflags} [get_canonical_archflags cc]" \
"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 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="[join ${configure.ldflags}] [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# https://trac.macports.org/ticket/50678
# if {${configure.sdkroot} != ""} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mftrace/Portfile b/graphics/mftrace/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bfcce8a..3dcb78d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mftrace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mftrace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +26,7 @@ depends_lib port:python27 port:potrace bin:kpsewhich:texlive
</span> configure.args --mandir=${prefix}/share/man
configure.env PYTHON=${prefix}/bin/python2.7
<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]"
<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;'>-}
</span>
variant autotrace {
depends_lib-delete bin:potrace:potrace
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mscgen/Portfile b/graphics/mscgen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61a823e..4c156da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mscgen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mscgen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,11 +29,7 @@ depends_lib port:gd2
</span>
worksrcdir ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env GDLIB_CFLAGS=${configure.cflags} GDLIB_LIBS=-lgd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env GDLIB_CFLAGS='${configure.cflags}' GDLIB_LIBS='-lgd'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> use_configure yes
configure.args --prefix=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pngquant/Portfile b/graphics/pngquant/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a93a50f..a79441e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pngquant/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pngquant/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,19 +31,11 @@ depends_lib-append port:libpng \
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append PREFIX=${prefix} \
CC=${configure.cc} \
CFLAGSADD=[get_canonical_archflags cc] \
LDFLAGSADD=[get_canonical_archflags ld] \
ARFLAGS=rsv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGSADD="[get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGSADD="[get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARFLAGS=rsv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.env-append {*}${build.env}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/povray/Portfile b/graphics/povray/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d56643..e7182b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/povray/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/povray/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,11 +49,7 @@ pre-configure {
</span> system -W ${worksrcpath}/unix "./prebuild.sh"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env "COMPILED_BY=MacPorts <https://www.macports.org/>"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env COMPILED_BY="MacPorts <https://www.macports.org/>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> configure.libs -lboost_system-mt -lboost_thread-mt
configure.args --with-boost=${prefix} \
--with-boost-thread \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/bitlbee/Portfile b/irc/bitlbee/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 88795bf..7fd62e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/bitlbee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/bitlbee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,11 +34,7 @@ patchfiles patch-configure.diff \
</span>
# Calls ld directly which makes universal hard
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env 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;'>-configure.env ARCHFLAGS="[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> configure.args --config=${prefix}/var/lib/bitlbee/ \
--ssl=gnutls \
--otr=0 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/zeroc-ice35-java/Portfile b/java/zeroc-ice35-java/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a30bb5..82b4eab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/zeroc-ice35-java/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/zeroc-ice35-java/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,20 +59,12 @@ use_configure no
</span> set classpath ${prefix}/lib/db46/db.jar:${prefix}/share/java/jgoodies-common.jar:${prefix}/share/java/jgoodies-forms.jar:${prefix}/share/java/jgoodies-looks.jar:${prefix}/share/java/proguard.jar
build.dir ${worksrcpath}/java
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home CLASSPATH=${classpath} "ANT_OPTS=-Djava.awt.headless=true -Xmx512m" ICE_HOME=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home CLASSPATH=${classpath} ANT_OPTS="-Djava.awt.headless=true -Xmx512m" ICE_HOME=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> build.cmd ant
build.target clean all
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> test.env JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home CLASSPATH=${classpath} "ANT_OPTS=-Xmx512m -Djava.awt.headless=true" ICE_HOME=${prefix} DYLD_LIBRARY_PATH=${prefix}/lib/db46 USE_BIN_DIST=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home CLASSPATH=${classpath} ANT_OPTS="-Xmx512m -Djava.awt.headless=true" ICE_HOME=${prefix} DYLD_LIBRARY_PATH=${prefix}/lib/db46 USE_BIN_DIST=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> test.cmd python
test.target allTests.py --debug --env
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/bf2c/Portfile b/lang/bf2c/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dcfddce..3ed10a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/bf2c/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/bf2c/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,15 +20,9 @@ patchfiles Makefile.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 CC=${configure.cc} CXX=${configure.cxx} \
"CFLAGS=${configure.cflags} ${configure.cc_archflags}" \
"CXXFLAGS=${configure.cxxflags} ${configure.cxx_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} CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags} ${configure.cxx_archflags}"
</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/lang/cbmbasic/Portfile b/lang/cbmbasic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 311eeaa..2e8dc84 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/cbmbasic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/cbmbasic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,15 +33,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 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 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 755 ${worksrcpath}/cbmbasic ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/Portfile b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c9f7666..996e942 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,21 +307,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx-append ${configure.cxx_archflags}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc43/Portfile b/lang/gcc43/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf94b4e..c20cec6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc43/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc43/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,21 +241,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx_archflags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc44/Portfile b/lang/gcc44/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8971184..d333af4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc44/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc44/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,21 +236,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx_archflags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc45/Portfile b/lang/gcc45/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ef41b1..f7ea171 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc45/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc45/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,21 +339,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx_archflags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc46/Portfile b/lang/gcc46/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a018870..06ab43b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc46/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc46/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,21 +242,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx_archflags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc47/Portfile b/lang/gcc47/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19dbcdb..5e08e6d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc47/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc47/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,21 +234,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx_archflags
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc48/Portfile b/lang/gcc48/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 654565d..68a088c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc48/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc48/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,21 +224,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx-append ${configure.cxx_archflags}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc49/Portfile b/lang/gcc49/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2d3231..8af10db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc49/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc49/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,21 +219,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx-append ${configure.cxx_archflags}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc5/Portfile b/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 055ce35..5558ffd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,21 +239,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx-append ${configure.cxx_archflags}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc6/Portfile b/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ddad73d..b98076a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -292,21 +292,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx-append ${configure.cxx_archflags}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc7/Portfile b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 48fa1f6..ef299d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -348,21 +348,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx-append ${configure.cxx_archflags}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc8/Portfile b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f5b442..f20d55a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -335,21 +335,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx-append ${configure.cxx_archflags}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/Portfile b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 467c890..52f5131 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -322,21 +322,12 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"CPP=${configure.cc} -E" \
"CXXCPP=${configure.cxx} -E"
build.env-append \
"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;'>-build.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> configure.cc-append [get_canonical_archflags]
configure.cc_archflags
configure.cxx-append ${configure.cxx_archflags}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/javascript-lint/Portfile b/lang/javascript-lint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8399b4c..3b93a00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/javascript-lint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/javascript-lint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +28,7 @@ use_parallel_build no
</span> build.pre_args -f Makefile.ref
build.target
build.args CC=${configure.cc}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "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 CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
file copy ${worksrcpath}/Darwin_DBG.OBJ/jsl ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/jlint/Portfile b/lang/jlint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd16385..84b5aa8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/jlint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/jlint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,12 +30,7 @@ use_configure no
</span> variant universal {}
build.args CC=${configure.cxx}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LFLAGS=${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.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.destdir INSTALL_DIR=${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mozart/Portfile b/lang/mozart/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd2ea4d..9022e7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mozart/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mozart/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,11 +54,7 @@ if {[variant_isset universal]} {
</span> } else {
set archflags ${configure.cxx_archflags}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append CPU_FLAGS=${archflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append CPU_FLAGS="${archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> configure.cxx ${configure.cxx} {*}${archflags}
configure.args-append --with-cxx="${configure.cxx}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pcc/Portfile b/lang/pcc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dad85b3..ba66afd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +37,7 @@ if {${subport} eq ${name}} {
</span> patchfiles-append patch-typo.diff \
patch-string.diff \
patch-no_empty.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env "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 YACC="${prefix}/bin/bison -y"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
configure.args-append --host=${build_arch}-apple-${os.platform}${os.major}.0.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/v8/Portfile b/lang/v8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3539e9f..85e9059 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/v8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/v8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,6 @@ configure.args dependencies
</span> configure.universal_args-delete \
--disable-dependency-tracking
<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} \
LINK=${configure.cxx} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,18 +49,6 @@ build.env-append CC=${configure.cc} \
</span> LINK.host=${configure.cxx} \
LDFLAGS.host=${configure.ldflags} \
"GYPFLAGS=-Duse_system_icu=1 -Dwerror="
<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;'>- LINK="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC.host="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS.host="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX.host="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS.host="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LINK.host="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS.host="${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GYPFLAGS="-Duse_system_icu=1 -Dwerror="
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {[string match *clang* ${configure.compiler}]} {
build.env-append GYP_DEFINES=clang=1
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/altermime/Portfile b/mail/altermime/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 29d311a..5ee716a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/altermime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/altermime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,13 +22,8 @@ patchfiles patch-Makefile.diff
</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} \
CFLAGS=${configure.cflags}
<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}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/notmuch-addrlookup/Portfile b/mail/notmuch-addrlookup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81f9b90..67f5479 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/notmuch-addrlookup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/notmuch-addrlookup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,11 +21,7 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:notmuch
use_configure 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]"
<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>
destroot {
copy ${worksrcpath}/${name} ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/procmail/Portfile b/mail/procmail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ac077cb..f7c55e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/procmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/procmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,11 +85,7 @@ 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} [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} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
build.args BASENAME=${prefix} LOCKINGTEST=/tmp
destroot.args BASENAME=${destroot}${prefix} LOCKINGTEST=/tmp install-suid
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/DSDP/Portfile b/math/DSDP/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 87ae4df..513abbe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/DSDP/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/DSDP/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,26 +34,14 @@ use_configure no
</span>
build.target dsdpapi
if { ![variant_isset universal] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append \
DSDPROOT=${worksrcpath} \
MP_ARCHFLAGS=${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 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DSDPROOT=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MP_ARCHFLAGS="${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_build_env(${arch}) \
DSDPROOT=${worksrcpath}-${arch} \
"MP_ARCHFLAGS=-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;'>- DSDPROOT=${worksrcpath}-${arch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MP_ARCHFLAGS='-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/math/SuiteSparse/Portfile b/math/SuiteSparse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4427959..31d2bae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/SuiteSparse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/SuiteSparse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,25 +99,13 @@ subport SuiteSparse_CHOLMOD {
</span> version 3.0.12
depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_CAMD port:SuiteSparse_COLAMD port:SuiteSparse_CCOLAMD
depends_lib-append port:metis
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"MY_METIS_LIB=-L${prefix}/lib -lmetis" \
MY_METIS_INC=${prefix}/include
<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;'>- MY_METIS_LIB='-L${prefix}/lib -lmetis' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MY_METIS_INC='${prefix}/include'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"BLAS=-L${prefix}/lib ${linalglib}" \
"LAPACK=-L${prefix}/lib ${linalglib}"
<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;'>- BLAS='-L${prefix}/lib ${linalglib}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LAPACK='-L${prefix}/lib ${linalglib}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
license LGPL-2.1+
long_description-append ${subport}: sparse Cholesky factorization.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,15 +146,9 @@ subport SuiteSparse_UMFPACK {
</span> version 5.7.7
depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_CHOLMOD
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"BLAS=-L${prefix}/lib ${linalglib}" \
"LAPACK=-L${prefix}/lib ${linalglib}"
<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;'>- BLAS='-L${prefix}/lib ${linalglib}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LAPACK='-L${prefix}/lib ${linalglib}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
license GPL-2+
long_description-append ${subport}: sparse LU factorization.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,15 +168,9 @@ subport SuiteSparse_SPQR {
</span> version 2.0.8
depends_lib-append port:SuiteSparse_config port:SuiteSparse_AMD port:SuiteSparse_CHOLMOD port:SuiteSparse_COLAMD
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"BLAS=-L${prefix}/lib ${linalglib}" \
"LAPACK=-L${prefix}/lib ${linalglib}"
<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;'>- BLAS='-L${prefix}/lib ${linalglib}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LAPACK='-L${prefix}/lib ${linalglib}'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
license GPL-2+
long_description-append ${subport}: sparse QR factorization.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,11 +247,7 @@ if {${subport} eq ${name}} {
</span> configure.universal_cxxflags
configure.cxx_archflags
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append TARGET_ARCH=[get_canonical_archflags ld]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append TARGET_ARCH='[get_canonical_archflags ld]'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
configure.cmd printenv
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/mumps/Portfile b/math/mumps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b2e5b9..d344eec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/mumps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/mumps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,11 +52,7 @@ configure.fflags-append -fPIC
</span>
configure.env-append MACPORTS_PREFIX=${prefix}
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append MACPORTS_BLAS=${linalglib}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MACPORTS_BLAS="${linalglib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {![variant_isset universal]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/pdc/Portfile b/math/pdc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bc0f297..8e97944 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/pdc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/pdc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,15 +23,9 @@ checksums md5 03dadb29fd517a2b23e2cb3018cf5753
</span> depends_lib port:readline port:ncurses
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CFLAGS=${configure.cppflags} \
LDFLAGS=${configure.ldflags} \
CC=${configure.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.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -s -m 755 ${worksrcpath}/pdc ${destroot}${prefix}/bin/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/csup/Portfile b/net/csup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 80baf74..c189e0b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/csup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/csup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,7 @@ use_configure no
</span>
build.args -f GNUmakefile PREFIX=${prefix} \
CC=${configure.cc}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env 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 CFLAGS="${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args -f GNUmakefile GROUP=`id -g` OWNER=`id -u`
destroot.destdir PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/fetch/Portfile b/net/fetch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 228f6ab..27e25e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/fetch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/fetch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,15 +18,9 @@ checksums md5 3788e294fbcf146495983a7dd6578ea3 \
</span> rmd160 58de08f399a04b20eef4f810077c37d6566f72b9
variant universal {}
build.type bsd
<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.cppflags} ${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 CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cppflags} ${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 -DMK_OPENSSL
worksrcdir ${name}
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/honeyd/Portfile b/net/honeyd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ff6426..7d42d0b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/honeyd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/honeyd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,15 +36,9 @@ post-patch {
</span> }
configure.args --with-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env PATH_PYTHON=${prefix}/bin/python2.7 \
EVENTINC=-I${prefix}/include/libevent1 \
"EVENTLIB=-L${prefix}/lib/libevent1 -levent"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PATH_PYTHON=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EVENTINC="-I${prefix}/include/libevent1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EVENTLIB="-L${prefix}/lib/libevent1 -levent"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
variant rrdtool {
depends_lib-append port:rrdtool
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libfetch/Portfile b/net/libfetch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b60ef40..36818d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/libfetch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/libfetch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,15 +18,9 @@ checksums md5 93032be6c3d61a5629deab5e5660801e \
</span> rmd160 27190ff9b524992e7eb8f0e96f79c3153d92d1eb
variant universal {}
build.type bsd
<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.cppflags} ${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 CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cppflags} ${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 -DMK_INET6_SUPPORT -DMK_OPENSSL
worksrcdir ${name}
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/logjam/Portfile b/net/logjam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e8dd54ca..2a24d9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/logjam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/logjam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,11 +18,7 @@ depends_build port:pkgconfig
</span> depends_lib lib:libgtk.2:gtk2 lib:libcurl.2:curl \
path:lib/libxml2.2.dylib:libxml2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env "LIBS=-L${prefix}/lib -lX11"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env LIBS="-L${prefix}/lib -lX11"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> configure.ldflags-append -L${prefix}/lib -bind_at_load
configure.args --without-gtkspell --without-xmms --without-gtkhtml \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ngrep/Portfile b/net/ngrep/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f97ccb..0de3813 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ngrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ngrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,12 +45,6 @@ configure.args --with-pcap-includes=${prefix}/include \
</span> # above line required to avoid segfaults
# see https://github.com/jpr5/ngrep/commit/e29fc29
# https://github.com/Homebrew/homebrew/issues/27171
<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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/camlimages/Portfile b/ocaml/camlimages/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81dfb0e..29fac90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/camlimages/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/camlimages/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,13 +58,8 @@ destroot.args ${build.args}
</span> pre-destroot {
set ocaml_destdir "${destroot}[exec ocamlfind printconf destdir]"
xinstall -d ${ocaml_destdir}
<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;'>- destroot.env OCAMLFIND_DESTDIR=${ocaml_destdir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCAMLFIND_LDCONF=ignore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env OCAMLFIND_DESTDIR="${ocaml_destdir}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCAMLFIND_LDCONF=ignore
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env OCAMLFIND_DESTDIR=${ocaml_destdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCAMLFIND_LDCONF=ignore
</span> }
variant lablgtk2 description {add support for GTK 2} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-zip/Portfile b/ocaml/ocaml-zip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0998726..16de1ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-zip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-zip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,11 +36,7 @@ build.env PREFIX=${prefix}
</span> build.target all allopt
set ocamlfind_destdir ${destroot}${prefix}/lib/ocaml/site-lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env "OCAMLFIND_INSTFLAGS=-destdir $ocamlfind_destdir -ldconf ignore" OCAMLFIND_STUBLIBS=${ocamlfind_destdir}/stublibs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env OCAMLFIND_INSTFLAGS="-destdir $ocamlfind_destdir -ldconf ignore" OCAMLFIND_STUBLIBS=${ocamlfind_destdir}/stublibs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> destroot.target ocamlfind-install
pre-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-dbd-pg/Portfile b/perl/p5-dbd-pg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d03a151..cd27a78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-dbd-pg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-dbd-pg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,85 +30,49 @@ if {${perl5.major} ne ""} {
</span> variant postgresql94 conflicts postgresql95 postgresql96 postgresql10 postgresql11 postgresql12 description {Build with postgresql94 port} {
depends_lib-append port:postgresql94
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env PATH=${prefix}/lib/postgresql94/bin:$env(PATH) \
POSTGRES_INCLUDE=${prefix}/include/postgresql94 \
"POSTGRES_LIB=${prefix}/lib/postgresql94 -lssl"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=${prefix}/lib/postgresql94/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_INCLUDE="${prefix}/include/postgresql94" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_LIB="${prefix}/lib/postgresql94 -lssl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant postgresql95 conflicts postgresql94 postgresql96 postgresql10 postgresql11 postgresql12 description {Build with postgresql95 port} {
depends_lib-append port:postgresql95
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env PATH=${prefix}/lib/postgresql95/bin:$env(PATH) \
POSTGRES_INCLUDE=${prefix}/include/postgresql95 \
"POSTGRES_LIB=${prefix}/lib/postgresql95 -lssl"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=${prefix}/lib/postgresql95/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_INCLUDE="${prefix}/include/postgresql95" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_LIB="${prefix}/lib/postgresql95 -lssl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant postgresql96 conflicts postgresql94 postgresql95 postgresql10 postgresql11 postgresql12 description {Build with postgresql96 port} {
depends_lib-append port:postgresql96
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env PATH=${prefix}/lib/postgresql96/bin:$env(PATH) \
POSTGRES_INCLUDE=${prefix}/include/postgresql96 \
"POSTGRES_LIB=${prefix}/lib/postgresql96 -lssl"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=${prefix}/lib/postgresql96/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_INCLUDE="${prefix}/include/postgresql96" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_LIB="${prefix}/lib/postgresql96 -lssl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant postgresql10 conflicts postgresql94 postgresql95 postgresql96 postgresql11 postgresql12 description {Build with postgresql10 port} {
depends_lib-append port:postgresql10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env PATH=${prefix}/lib/postgresql10/bin:$env(PATH) \
POSTGRES_INCLUDE=${prefix}/include/postgresql10 \
"POSTGRES_LIB=${prefix}/lib/postgresql10 -lssl"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=${prefix}/lib/postgresql10/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_INCLUDE="${prefix}/include/postgresql10" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_LIB="${prefix}/lib/postgresql10 -lssl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant postgresql11 conflicts postgresql94 postgresql95 postgresql10 postgresql12 description {Build with postgresql11 port} {
depends_lib-append port:postgresql11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env PATH=${prefix}/lib/postgresql11/bin:$env(PATH) \
POSTGRES_INCLUDE=${prefix}/include/postgresql11 \
"POSTGRES_LIB=${prefix}/lib/postgresql11 -lssl"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=${prefix}/lib/postgresql11/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_INCLUDE="${prefix}/include/postgresql11" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_LIB="${prefix}/lib/postgresql11 -lssl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant postgresql12 conflicts postgresql94 postgresql95 postgresql10 postgresql11 escription {Build with postgresql12 port} {
depends_lib-append port:postgresql12
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env PATH=${prefix}/lib/postgresql2/bin:$env(PATH) \
POSTGRES_INCLUDE=${prefix}/include/postgresql2 \
"POSTGRES_LIB=${prefix}/lib/postgresql2 -lssl"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=${prefix}/lib/postgresql2/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_INCLUDE="${prefix}/include/postgresql2" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_LIB="${prefix}/lib/postgresql2 -lssl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {![variant_isset postgresql94] && \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-ffc/Portfile b/python/py-ffc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 17cf950..2d82398 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-ffc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-ffc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,19 +39,11 @@ if {${subport} ne ${name}} {
</span> port:boost
pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CXXFLAGS=${configure.cxxflags}
<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}"
</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 CXXFLAGS=${configure.cxxflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CXXFLAGS="${configure.cxxflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
post-fetch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-hcluster/Portfile b/python/py-hcluster/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1aacda3..2c826cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-hcluster/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-hcluster/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +28,5 @@ python.versions 27
</span>
if {${name} ne ${subport}} {
depends_lib-append port:py${python.version}-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "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 CCFLAGS="-I${prefix}/include -L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pcapy/Portfile b/python/py-pcapy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d792e10..9d7c187 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pcapy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pcapy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,15 +45,9 @@ if {${name} ne ${subport}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CPPFLAGS=-I${prefix}/include -L${prefix}/lib" \
CFLAGS=-I${prefix}/include \
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 CPPFLAGS="-I${prefix}/include -L${prefix}/lib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=-I${prefix}/include \
</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>
post-destroot {
set docdir ${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pymc/Portfile b/python/py-pymc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c5266f..fe671c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pymc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pymc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,6 @@ if {${name} ne ${subport}} {
</span>
# Insert my own archflags, so I can edit LDFLAGS
python.add_archflags no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> if {[variant_exists universal] && [variant_isset universal]} {
build.env-append CFLAGS=${configure.universal_cflags} \
OBJCFLAGS=${configure.universal_cflags} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,22 +58,6 @@ if {${name} ne ${subport}} {
</span> FCFLAGS=${configure.fc_archflags} \
"LDFLAGS=-undefined dynamic_lookup -bundle ${configure.ld_archflags}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CFLAGS="${configure.universal_cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS="${configure.universal_cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.universal_cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="-undefined dynamic_lookup -bundle ${configure.universal_ldflags}"
</span><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.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS="${configure.objc_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;'>- FFLAGS="${configure.f77_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- F90FLAGS="${configure.f90_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FCFLAGS="${configure.fc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="-undefined dynamic_lookup -bundle ${configure.ld_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
livecheck.type none
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pynifti/Portfile b/python/py-pynifti/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b4b241..bda1d59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pynifti/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pynifti/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +26,7 @@ if {${name} ne ${subport}} {
</span> port:nifticlib \
port:swig-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CCFLAGS=-I${prefix}/include -L${prefix}/lib -I${prefix}/include/nifti"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env CCFLAGS="-I${prefix}/include -L${prefix}/lib -I${prefix}/include/nifti"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
distname pynifti_${version}
worksrcdir pynifti-${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-qutip/Portfile b/python/py-qutip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e16fc4..8efddca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-qutip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-qutip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,6 @@ if {${name} ne ${subport}} {
</span> build.args
# why only archflags?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env-append CFLAGS=${configure.cc_archflags} \
OBJCFLAGS=${configure.objc_archflags} \
CXXFLAGS=${configure.cxx_archflags} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,15 +55,6 @@ if {${name} ne ${subport}} {
</span> F90FLAGS=${configure.f90_archflags} \
FCFLAGS=${configure.fc_archflags} \
"LDFLAGS=-undefined dynamic_lookup -bundle ${configure.ld_archflags}"
<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.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS="${configure.objc_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;'>- FFLAGS="${configure.f77_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- F90FLAGS="${configure.f90_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FCFLAGS="${configure.fc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="-undefined dynamic_lookup -bundle ${configure.ld_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
livecheck.type none
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scientific/Portfile b/python/py-scientific/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4b879b..303f2e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scientific/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scientific/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,13 +28,8 @@ mpi.setup
</span> if {${name} ne ${subport}} {
depends_lib port:netcdf \
port:py${python.version}-numpy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CPPFLAGS=-I${python.include} -I${worksrcpath}/Include" \
NETCDF_PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env CPPFLAGS="-I${python.include} -I${worksrcpath}/Include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NETCDF_PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
platform macosx {
post-extract {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-postgres/Portfile b/ruby/rb-postgres/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 455d5d5..105006c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ruby/rb-postgres/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb-postgres/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,15 +24,9 @@ variant postgresql83 conflicts postgresql80 postgresql81 postgresql82 \
</span> depends_lib-append port:postgresql83
configure.args-append --with-pgsql-include-dir=${prefix}/include/postgresql83 \
--with-pgsql-lib-dir=${prefix}/lib/postgresql83
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env \
"POSTGRES_LIB=${prefix}/lib/postgresql83 -L${prefix}/lib -lssl -lcrypto" \
"POSTGRES_INCLUDE=${prefix}/include/postgresql83 -I${prefix}/include"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_LIB="${prefix}/lib/postgresql83 -L${prefix}/lib -lssl -lcrypto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_INCLUDE="${prefix}/include/postgresql83 -I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant postgresql82 conflicts postgresql80 postgresql81 postgresql83 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,15 +34,9 @@ variant postgresql82 conflicts postgresql80 postgresql81 postgresql83 \
</span> depends_lib-append port:postgresql82
configure.args-append --with-pgsql-include-dir=${prefix}/include/postgresql82 \
--with-pgsql-lib-dir=${prefix}/lib/postgresql82
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env \
"POSTGRES_LIB=${prefix}/lib/postgresql82 -L${prefix}/lib -lssl -lcrypto" \
"POSTGRES_INCLUDE=${prefix}/include/postgresql82 -I${prefix}/include"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_LIB="${prefix}/lib/postgresql82 -L${prefix}/lib -lssl -lcrypto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_INCLUDE="${prefix}/include/postgresql82 -I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant postgresql81 conflicts postgresql80 postgresql82 postgresql83 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,15 +44,9 @@ variant postgresql81 conflicts postgresql80 postgresql82 postgresql83 \
</span> depends_lib-append port:postgresql81
configure.args-append --with-pgsql-include-dir=${prefix}/include/postgresql81 \
--with-pgsql-lib-dir=${prefix}/lib/postgresql81
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env \
"POSTGRES_LIB=${prefix}/lib/postgresql81 -L${prefix}/lib -lssl -lcrypto" \
"POSTGRES_INCLUDE=${prefix}/include/postgresql81 -I${prefix}/include"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_LIB="${prefix}/lib/postgresql81 -L${prefix}/lib -lssl -lcrypto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_INCLUDE="${prefix}/include/postgresql81 -I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant postgresql80 conflicts postgresql81 postgresql82 postgresql83 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,13 +54,7 @@ variant postgresql80 conflicts postgresql81 postgresql82 postgresql83 \
</span> depends_lib-append port:postgresql80
configure.args-append --with-pgsql-include-dir=${prefix}/include/postgresql80 \
--with-pgsql-lib-dir=${prefix}/lib/postgresql80
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env \
"POSTGRES_LIB=${prefix}/lib/postgresql80 -L${prefix}/lib -lssl -lcrypto" \
"POSTGRES_INCLUDE=${prefix}/include/postgresql80 -I${prefix}/include"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_LIB="${prefix}/lib/postgresql80 -L${prefix}/lib -lssl -lcrypto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTGRES_INCLUDE="${prefix}/include/postgresql80 -I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/h4h5tools/Portfile b/science/h4h5tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c7f4e93..e39ced8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/h4h5tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/h4h5tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,8 @@ configure.cppflags \
</span> -I${prefix}/include
configure.ldflags \
-L${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"LIBS=-ldf -lmfhdf"
<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;'>- LIBS="-ldf -lmfhdf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/nMOLDYN/Portfile b/science/nMOLDYN/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79653ba..5f5fbf4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/nMOLDYN/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/nMOLDYN/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,10 +29,6 @@ depends_lib port:py${python.version}-tkinter \
</span> port:py${python.version}-pyro \
port:py${python.version}-matplotlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CPPFLAGS=-I${prefix}/include -I${python.include}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CPPFLAGS="-I${prefix}/include -I${python.include}"
</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/science/ocaml-mpi/Portfile b/science/ocaml-mpi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 62b0faa..d4526c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ocaml-mpi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ocaml-mpi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,11 +39,7 @@ if {[file exists ${prefix}/lib/mpich-mp-devel]} then {
</span> build.target all
set ocamlfind_destdir ${destroot}${prefix}/lib/ocaml/site-lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> destroot.env "OCAMLFIND_INSTFLAGS=-destdir $ocamlfind_destdir -ldconf ignore" OCAMLFIND_STUBLIBS=${ocamlfind_destdir}/stublibs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env OCAMLFIND_INSTFLAGS="-destdir $ocamlfind_destdir -ldconf ignore" OCAMLFIND_STUBLIBS=${ocamlfind_destdir}/stublibs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> destroot.target ocamlfind-install
pre-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aesutil/Portfile b/security/aesutil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f084826..feae0ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aesutil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/aesutil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,13 +28,8 @@ configure.universal_args
</span> variant universal {}
build.args CC=${configure.cc}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "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 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 755 ${worksrcpath}/aes ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libewf/Portfile b/security/libewf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 550f0f4..abd9e22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/libewf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libewf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,13 +39,8 @@ depends_lib port:bzip2 \
</span> universal_variant no
platform linux {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"LIBS=-L${prefix}/lib -lintl"
<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;'>- LIBS="-L${prefix}/lib -lintl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
configure.args --with-bzip2=${prefix} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/libtomcrypt/Portfile b/security/libtomcrypt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c8ab408..f90b9ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/libtomcrypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/libtomcrypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,7 @@ worksrcdir ${name}-${version}
</span> use_configure no
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.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.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.args LIBPATH=${prefix}/lib INCPATH=${prefix}/include \
USER=`id -u` GROUP=`id -g` NODOCS=1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/nasty/Portfile b/security/nasty/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b126816..d6e56a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/nasty/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/nasty/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,14 +37,8 @@ if {[variant_isset universal]} {
</span> } else {
set archflags ${configure.cc_archflags}
}
<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.cppflags} ${archflags}" \
"LDFLAGS=${configure.ldflags} ${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}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} ${configure.cppflags} ${archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags} ${archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.destdir prefix=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/sancp/Portfile b/security/sancp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c7607e..e94cbf7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/sancp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/sancp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,15 +26,9 @@ patch.pre_args -p1
</span> depends_build port:libpcap
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CPPFLAGS=-I${prefix}/include \
"CFLAGS=-O3 -s -I${prefix}/include" \
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 CPPFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="-O3 -s -I${prefix}/include" \
</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>
post-patch {
# Hack to comment out CFLAGS line in Makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/sign/Portfile b/security/sign/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 955f462..c0b4e14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/sign/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/sign/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,13 +18,8 @@ checksums rmd160 f145829ef6f47ce96b8fe8bafddc7cf9d02c8aa4 \
</span> depends_lib path:lib/libssl.dylib:openssl
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]"
<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 {
xinstall ${worksrcpath}/sign ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/brightness/Portfile b/sysutils/brightness/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30bca72..5df5a4b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/brightness/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/brightness/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,14 +21,8 @@ installs_libs no
</span> variant universal {}
configure.cflags-append -std=c99
<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;color:#808080;'>diff --git a/sysutils/disktype/Portfile b/sysutils/disktype/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dca4227..58e2571 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/disktype/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/disktype/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,15 +23,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} [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 755 -s ${worksrcpath}/disktype ${destroot}${prefix}/sbin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/dvdrtools/Portfile b/sysutils/dvdrtools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e9c4f42..295fb90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/dvdrtools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/dvdrtools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,13 +21,8 @@ checksums rmd160 ffdd13de33fdc6386dec02206a0150ef7eb1bee9 \
</span> size 1463718
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env \
"LIBS=-framework CoreFoundation -framework IOKit"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="-framework CoreFoundation -framework IOKit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> patchfiles patch-scsi-mac-iokit.c.diff \
patch-cdda2wav-cdda2wav.c.diff \
patch-cdrecord-cdrecord.c.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gkrellm/Portfile b/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d4f1ecd..1d3cbf2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,17 +35,10 @@ use_configure no
</span> variant universal {}
build.type gnu
<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>
build.target darwin9
destroot.target install_darwin9
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/john/Portfile b/sysutils/john/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea321ad..3a957b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/john/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/john/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,15 +103,9 @@ subport john-jumbo {
</span>
build.dir ${worksrcpath}/src
build.target default
<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>
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/libfaketime/Portfile b/sysutils/libfaketime/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2d8cdf7..dd251f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/libfaketime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/libfaketime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,15 +29,9 @@ variant universal {}
</span> compiler.blacklist *cc* *dragonegg*
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env CC=${configure.cc} \
CFLAGS=[get_canonical_archflags cc] \
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="[get_canonical_archflags cc]" \
</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>
destroot.args ${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/maxwell/Portfile b/sysutils/maxwell/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 412ffef..7f4c633 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/maxwell/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/maxwell/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +26,7 @@ patchfiles patch-maxwell.8.diff
</span> use_configure no
build.args CC=${configure.cc}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "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 CFLAGS="${configure.cflags} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot.destdir DESTDIR=${destroot} prefix=${prefix} \
mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rpm54/Portfile b/sysutils/rpm54/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19701c4..38fe57c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/rpm54/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rpm54/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,13 +147,8 @@ platform darwin {
</span> --with-glob
# avoid bison-2.7 problems
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
"YACC=/usr/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 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- YACC='/usr/bin/bison -y'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
post-destroot {
# Mac OS X specific changes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/uif2iso/Portfile b/sysutils/uif2iso/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df4f6f7..4b05539 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/uif2iso/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/uif2iso/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,11 +29,7 @@ depends_lib port:zlib
</span>
patchfiles Types.h.patch
<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.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.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
destroot {
xinstall -m 755 ${worksrcpath}/uif2iso ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/Portfile b/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ae569e..97329b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,11 +16,7 @@ description watches files and takes action when they change
</span> long_description ${description}
use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> autoreconf.env "AUTOMAKE=automake --foreign"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.env AUTOMAKE="automake --foreign"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
depends_build-append port:pkgconfig
depends_lib-append port:pcre
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/opensp/Portfile b/textproc/opensp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 217fa0f..21630fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/opensp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/opensp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,10 +34,6 @@ configure.args --enable-http --disable-dependency-tracking \
</span> --enable-default-catalog=${prefix}/share/sgml/catalog \
--mandir=${prefix}/share/man --disable-doc-build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env "LIBS=-L${prefix}/lib -lintl"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env LIBS="-L${prefix}/lib -lintl"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
livecheck.distname OpenSP
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/texinfo/Portfile b/textproc/texinfo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 82e541e..9787819 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/texinfo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/texinfo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,15 +42,9 @@ checksums rmd160 d0befc00f8e58e4bae7441a31a7270576f6584f2 \
</span>
configure.perl ${prefix}/bin/perl${pbranch}
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append \
PERL_EXT_CFLAGS=[get_canonical_archflags cc] \
PERL_EXT_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;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PERL_EXT_CFLAGS="[get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PERL_EXT_LDFLAGS="[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
destroot.target-append install-tex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/cgit/Portfile b/www/cgit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ee0bf4..911ef3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/cgit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/cgit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,13 +79,8 @@ build.args prefix=${prefix} \
</span> NO_GETTEXT=1 \
NO_LUA=1 \
V=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env 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 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 {*}${build.args}
destroot.env {*}${build.env}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk-2.0/Portfile b/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 36ace8b..7beb389 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,11 +173,7 @@ configure.cppflags-delete -I${prefix}/include
</span> # google-test suite build fix
configure.cppflags-append -DGTEST_USE_OWN_TR1_TUPLE=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> autoreconf.env-append "ACLOCAL=aclocal -I Source/autotools"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk/Portfile b/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0de53e7..7a3d8e0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,11 +160,7 @@ configure.cppflags-append -DGTEST_USE_OWN_TR1_TUPLE=1
</span> configure.cflags-append -ftemplate-depth=256
configure.cxxflags-append -ftemplate-depth=256
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> autoreconf.env-append "ACLOCAL=aclocal -I Source/autotools"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gkrellm-gtodo/Portfile b/x11/gkrellm-gtodo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 73f352c..d76a1c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gkrellm-gtodo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gkrellm-gtodo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,15 +23,9 @@ depends_lib port:gkrellm
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> build.env "CPPFLAGS=-L${prefix}/lib -I${prefix}/include" \
CFLAGS=-I${prefix}/include \
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 CPPFLAGS="-L${prefix}/lib -I${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="-I${prefix}/include" \
</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>
patchfiles patch-Makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/Portfile b/x11/openmotif/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d3bfd1d..52e137c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/openmotif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/openmotif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,11 +48,7 @@ configure.args --enable-xft \
</span> --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env "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 YACC="${prefix}/bin/bison -y"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
post-destroot {
set docdir ${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/windowmaker/Portfile b/x11/windowmaker/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd6ee7c..53dfa08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/windowmaker/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/windowmaker/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,15 +51,9 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env "LINGUAS=bg cs da de el es et fi fr gl hr hu it ja \
ko ms nl no pl pt ro ru sk sv tr zh_CN" \
"LIBS=-L${prefix}/lib -lintl -lX11"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env LINGUAS="bg cs da de el es et fi fr gl hr hu it ja \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ko ms nl no pl pt ro ru sk sv tr zh_CN" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="-L${prefix}/lib -lintl -lX11"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> configure.args --mandir=${prefix}/share/man \
--with-nlsdir=${prefix}/share/locale \
--with-gnustepdir=${prefix}/GNUstep/Local
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfce4-settings/Portfile b/xfce/xfce4-settings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e607cfd..e3b6d70 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfce4-settings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfce4-settings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,17 +30,9 @@ configure.args INTLTOOL_PERL=${configure.perl}
</span>
platform darwin 8 {
patchfiles-append patch-configure.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig \
XI_VERSION=1.0.0 XI_CFLAGS=-I${prefix}/include "XI_LIBS=-L${prefix}/lib -lXi" \
LIBX11_VERSION=6.2.0 LIBX11_CFLAGS=-I${prefix}/include "LIBX11_LIBS=-L${prefix}/lib -lX11" \
XRANDR_VERSION=2.0.0 XRANDR_CFLAGS=-I${prefix}/include "XRANDR_LIBS=-L${prefix}/lib -lXrandr" \
XCURSOR_VERSION=1.0.0 XCURSOR_CFLAGS=-I${prefix}/include "XCURSOR_LIBS=-L${prefix}/lib -lXcursor"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XI_VERSION="1.0.0" XI_CFLAGS="-I${prefix}/include" XI_LIBS="-L${prefix}/lib -lXi" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBX11_VERSION="6.2.0" LIBX11_CFLAGS="-I${prefix}/include" LIBX11_LIBS="-L${prefix}/lib -lX11" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XRANDR_VERSION="2.0.0" XRANDR_CFLAGS="-I${prefix}/include" XRANDR_LIBS="-L${prefix}/lib -lXrandr" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XCURSOR_VERSION="1.0.0" XCURSOR_CFLAGS="-I${prefix}/include" XCURSOR_LIBS="-L${prefix}/lib -lXcursor"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
</pre><pre style='margin:0'>
</pre>