<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/a560834f1e38aeec9e34b708baaed09366fa68e0">https://github.com/macports/macports-ports/commit/a560834f1e38aeec9e34b708baaed09366fa68e0</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 a560834 Adapt Portfiles to base *.env parsing changes
</span>a560834 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a560834f1e38aeec9e34b708baaed09366fa68e0
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Mar 23 20:30:33 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> Adapt Portfiles to base *.env parsing changes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: #116
</span>---
aqua/qt3-mac/Portfile | 12 +++++-----
aqua/qt4-mac/Portfile | 2 +-
archivers/arc/Portfile | 8 ++++++-
archivers/libzzip/Portfile | 2 +-
archivers/pbzip2/Portfile | 7 ++++++
archivers/pigz/Portfile | 6 +++++
archivers/upx/Portfile | 6 +++++
archivers/zstd/Portfile | 9 +++++++
audio/mp3_check/Portfile | 5 ++++
audio/mp3unicode/Portfile | 2 +-
benchmarks/forkbomb/Portfile | 7 +++++-
benchmarks/nbench-byte/Portfile | 4 ++++
cross/msp430-gdb-devel/Portfile | 4 ++--
cross/msp430-gdb/Portfile | 4 ++--
databases/leveldb/Portfile | 22 ++++++++++++++---
databases/rocksdb/Portfile | 18 ++++++++++++++
databases/tokyocabinet-java/Portfile | 11 +++++++++
devel/PIDA/Portfile | 7 ++++++
devel/afl/Portfile | 10 +++++++-
devel/appstream-glib/Portfile | 5 ++++
devel/argon2/Portfile | 22 +++++++++++++----
devel/bazaar/Portfile | 11 ++++++++-
devel/binutils/Portfile | 2 +-
devel/bsdiff/Portfile | 7 +++++-
devel/capstone/Portfile | 8 +++++++
devel/cdecl/Portfile | 2 +-
devel/cmake/Portfile | 6 ++---
devel/cryptlib/Portfile | 8 ++++++-
devel/csu/Portfile | 8 +++++++
devel/cvsps/Portfile | 9 ++++++-
devel/darwinbuild-legacy/Portfile | 5 ++++
devel/dub/Portfile | 16 ++++++++++++-
devel/fossil/Portfile | 5 +++-
devel/girara/Portfile | 10 ++++++++
devel/git-crypt/Portfile | 9 +++++++
devel/git-flow/Portfile | 2 +-
devel/glade/Portfile | 15 ++++++++++++
devel/icmake/Portfile | 7 +++++-
devel/legacy-support/Portfile | 11 +++++++--
devel/libCUDF/Portfile | 12 +++++++---
devel/libast/Portfile | 4 ++++
devel/libcryptopp/Portfile | 4 ++++
devel/libghash/Portfile | 9 ++++++-
devel/libmaxminddb/Portfile | 6 +++++
devel/libpointing/Portfile | 15 ++++++++++--
devel/libsigcxx2/Portfile | 2 +-
devel/libsigcxx3/Portfile | 2 +-
devel/libsockets/Portfile | 2 +-
devel/libtermkey/Portfile | 6 +++++
devel/libvterm/Portfile | 6 +++++
devel/lua-luasec/Portfile | 8 +++++++
devel/lua-md5/Portfile | 11 +++++++--
devel/lua-rings/Portfile | 7 +++++-
devel/meson/Portfile | 9 +++++++
devel/mspdebug/Portfile | 2 +-
devel/nu2/Portfile | 2 +-
devel/nuweb/Portfile | 5 ++++
devel/qqwing/Portfile | 10 +++++++-
devel/quickfix/Portfile | 2 +-
devel/snowleopardfixes/Portfile | 11 ++++++++-
devel/srecord/Portfile | 2 +-
devel/stm32flash/Portfile | 6 ++++-
devel/subversion-python27bindings/Portfile | 9 ++++++-
devel/tradcpp/Portfile | 5 ++++
devel/tup/Portfile | 7 ++++++
devel/unibilium/Portfile | 6 +++++
devel/ustl/Portfile | 2 +-
devel/xulrunner-devel/Portfile | 4 ++--
devel/xulrunner/Portfile | 4 ++--
editors/TECO/Portfile | 6 +++++
editors/atom/Portfile | 9 +++++++
editors/dhex/Portfile | 10 +++++++-
editors/texworks/Portfile | 2 +-
editors/vigor/Portfile | 2 +-
emulators/atari800/Portfile | 4 ++++
emulators/lisaem/Portfile | 13 ++++++++++
emulators/spim/Portfile | 6 ++++-
emulators/vpcs/Portfile | 9 +++++++
fuse/ext4fuse/Portfile | 7 +++++-
games/bastet/Portfile | 8 ++++++-
games/blobwars/Portfile | 6 +++++
games/defendguin/Portfile | 7 ++++++
games/fife/Portfile | 5 ++++
games/fortune/Portfile | 6 ++++-
games/gnushogi/Portfile | 2 +-
games/gtkevemon/Portfile | 7 +++++-
games/larn/Portfile | 4 ++++
games/openttd/Portfile | 7 ++++++
games/svinepalsen/Portfile | 4 ++++
games/vectoroids/Portfile | 5 +++-
gis/gctpc/Portfile | 8 ++++++-
gis/libproj4/Portfile | 14 +++++++++++
gis/saga/Portfile | 4 ++--
gnome/at-spi2-core/Portfile | 12 ++++++++++
gnome/desktop-file-utils/Portfile | 2 +-
gnome/gcab/Portfile | 12 ++++++++++
gnome/libdazzle/Portfile | 12 ++++++++++
graphics/MyPaint/Portfile | 6 +++++
graphics/antigraingeometry/Portfile | 4 ++++
graphics/argyll/Portfile | 8 ++++++-
graphics/babl-devel/Portfile | 8 +++++++
graphics/babl/Portfile | 8 +++++++
graphics/exiftran/Portfile | 5 ++++
graphics/feh/Portfile | 7 ++++++
graphics/gimp-help-en/Portfile | 2 +-
graphics/gphoto2/Portfile | 5 ++++
graphics/gpick/Portfile | 8 +++++++
graphics/graphene/Portfile | 10 ++++++++
graphics/ipe/Portfile | 5 ++++
graphics/makeicns/Portfile | 8 +++++++
graphics/mftrace/Portfile | 4 ++++
graphics/mscgen/Portfile | 4 ++++
graphics/openni/Portfile | 4 ++++
graphics/openvrml/Portfile | 4 ++++
graphics/pdf2djvu/Portfile | 2 +-
graphics/pict2pdf/Portfile | 6 +++++
graphics/pngquant/Portfile | 8 +++++++
graphics/poppler-qt4-mac/Portfile | 4 ++--
graphics/povray/Portfile | 4 ++++
graphics/sane-backends/Portfile | 2 +-
graphics/vips/Portfile | 2 +-
irc/bitlbee/Portfile | 4 ++++
java/ccl-util/Portfile | 2 +-
java/zeroc-ice35-java/Portfile | 8 +++++++
kde/tellico/Portfile | 4 ++--
lang/apple-gcc40/Portfile | 2 +-
lang/apple-gcc42/Portfile | 4 ++--
lang/berkeley_upc/Portfile | 2 +-
lang/bf2c/Portfile | 6 +++++
lang/cbmbasic/Portfile | 7 +++++-
lang/chapel/Portfile | 8 +++++--
lang/dragonegg-3.4/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/jekyll/Portfile | 4 ++--
lang/jlint/Portfile | 5 ++++
lang/libcxx/Portfile | 10 ++++++++
lang/llvm-3.3/Portfile | 9 +++++++
lang/llvm-3.4/Portfile | 9 +++++++
lang/llvm-3.5/Portfile | 9 +++++++
lang/llvm-3.7/Portfile | 9 +++++++
lang/llvm-gcc42/Portfile | 8 +++----
lang/mit-scheme/Portfile | 4 ++++
lang/mozart/Portfile | 4 ++++
lang/ocaml/Portfile | 4 ++++
lang/pcc/Portfile | 5 +++-
lang/pypy/Portfile | 8 ++++++-
lang/ruby/Portfile | 4 ++++
lang/ruby186/Portfile | 4 ++++
lang/v8/Portfile | 14 ++++++++++-
mail/altermime/Portfile | 5 ++++
mail/notmuch-addrlookup/Portfile | 4 ++++
mail/procmail/Portfile | 4 ++++
mail/putmail/Portfile | 2 +-
mail/signing-party/Portfile | 6 ++++-
math/DSDP/Portfile | 12 ++++++++++
math/SuiteSparse/Portfile | 28 ++++++++++++++++++++++
math/atlas/Portfile | 2 +-
math/eigen3/Portfile | 2 +-
math/hpddm/Portfile | 16 +++++++++++++
math/libfaiss/Portfile | 19 +++++++++++++--
math/msieve/Portfile | 8 ++++++-
math/mumps/Portfile | 4 ++++
math/octave/Portfile | 12 ++++++++++
math/pdc/Portfile | 7 +++++-
math/pyxplot/Portfile | 2 +-
math/sundials/Portfile | 2 +-
math/sundials2/Portfile | 2 +-
math/svdlibc/Portfile | 2 +-
math/taucs/Portfile | 12 +++++++---
multimedia/VLC/Portfile | 6 ++++-
multimedia/VLC2/Portfile | 5 ++++
multimedia/ffmpeg-devel/Portfile | 4 ++++
multimedia/ffmpeg/Portfile | 4 ++++
multimedia/libvpx/Portfile | 2 +-
multimedia/mlt/Portfile | 6 +++++
multimedia/subtitleripper/Portfile | 6 +++++
multimedia/vobcopy/Portfile | 4 ++++
net/angst/Portfile | 2 +-
net/baresip/Portfile | 13 +++++++++-
net/bittwist/Portfile | 5 +++-
net/blackbag/Portfile | 4 ++--
net/csup/Portfile | 4 ++++
net/deluge/Portfile | 8 ++++++-
net/dnsmasq/Portfile | 6 ++++-
net/dynamips/Portfile | 8 +++++++
net/fetch/Portfile | 6 +++++
net/gkrellm_snmp/Portfile | 6 ++---
net/gkwebmon/Portfile | 6 ++---
net/gpsd/Portfile | 8 +++++++
net/honeyd/Portfile | 6 +++++
net/libfetch/Portfile | 6 +++++
net/libre/Portfile | 13 +++++++++-
net/librem/Portfile | 13 +++++++++-
net/libtorrent-rasterbar/Portfile | 4 ++--
net/logjam/Portfile | 6 ++++-
net/ncid/Portfile | 5 +++-
net/newsboat/Portfile | 5 ++++
net/ngrep/Portfile | 7 +++++-
net/pwlib/Portfile | 10 ++++----
net/restund/Portfile | 13 +++++++++-
net/snort/Portfile | 12 +++++-----
net/whois/Portfile | 8 +++++++
ocaml/camlimages/Portfile | 7 +++++-
ocaml/ocaml-zip/Portfile | 4 ++++
office/zathura-plugin-cb/Portfile | 9 +++++++
office/zathura-plugin-djvu/Portfile | 9 +++++++
office/zathura-plugin-pdf-mupdf/Portfile | 9 +++++++
office/zathura-plugin-pdf-poppler/Portfile | 9 +++++++
office/zathura-plugin-ps/Portfile | 9 +++++++
office/zathura/Portfile | 9 +++++++
perl/p5-alien-sdl/Portfile | 4 ++--
perl/p5-appconfig-std/Portfile | 4 ++--
perl/p5-astro-fits-cfitsio/Portfile | 4 ++--
perl/p5-crypt-ssleay/Portfile | 4 ++--
perl/p5-dbd-pg/Portfile | 31 +++++++++++++++++++++++-
perl/p5-inline-python/Portfile | 2 +-
perl/p5-mogilefs-server/Portfile | 2 +-
perl/p5-net-curl/Portfile | 2 +-
perl/p5-pdl-graphics-plplot/Portfile | 4 ++--
perl/p5-term-gnuplot/Portfile | 4 ++--
print/epstool/Portfile | 5 ++++
python/py-cartopy/Portfile | 6 ++---
python/py-clnum/Portfile | 4 ++++
python/py-cvxopt/Portfile | 4 ++--
python/py-ffc/Portfile | 8 +++++++
python/py-gd/Portfile | 2 +-
python/py-gobject/Portfile | 2 +-
python/py-graph-tool/Portfile | 16 +++++++++++++
python/py-hcluster/Portfile | 4 ++++
python/py-llvmmath/Portfile | 4 ++--
python/py-matplotlib-basemap/Portfile | 4 ++--
python/py-matplotlib/Portfile | 2 +-
python/py-networkit/Portfile | 14 +++++++++++
python/py-numba/Portfile | 2 +-
python/py-numpy/Portfile | 10 +++++++-
python/py-pcapy/Portfile | 6 +++++
python/py-pgsql/Portfile | 8 +++----
python/py-processing/Portfile | 2 +-
python/py-pygpgme/Portfile | 2 +-
python/py-pymc/Portfile | 18 +++++++++++++-
python/py-pynacl/Portfile | 4 ++--
python/py-pynds/Portfile | 4 ++--
python/py-pynifti/Portfile | 4 ++++
python/py-pyqt4/Portfile | 2 +-
python/py-pysam/Portfile | 2 +-
python/py-qutip/Portfile | 10 ++++++++
python/py-requests-unixsocket/Portfile | 4 ++--
python/py-scientific/Portfile | 8 +++++--
python/py-scipy/Portfile | 19 ++++++++++++++-
python/py-tensorflow/Portfile | 2 +-
python/py26-wbxml/Portfile | 4 ++--
ruby/rb-flexmock/Portfile | 2 +-
ruby/rb-postgres/Portfile | 24 +++++++++++++++++++
science/alliance/Portfile | 4 ++--
science/ccfits/Portfile | 6 ++++-
science/cell-id/Portfile | 2 +-
science/esmf/Portfile | 38 ++++++++++++++++++++++++++++++
science/gds/Portfile | 4 ++--
science/grads/Portfile | 2 +-
science/h4h5tools/Portfile | 5 ++++
science/hdf5-lz4-plugin/Portfile | 7 +++++-
science/irsim/Portfile | 2 +-
science/liquid-dsp/Portfile | 8 ++++++-
science/nMOLDYN/Portfile | 4 ++++
science/ocaml-mpi/Portfile | 4 ++++
science/pymol/Portfile | 2 +-
science/wgrib2/Portfile | 13 ++++++++++
security/aesutil/Portfile | 9 +++++--
security/libewf/Portfile | 5 ++++
security/libtomcrypt/Portfile | 4 ++++
security/mkcert/Portfile | 2 +-
security/nasty/Portfile | 7 +++++-
security/pinentry/Portfile | 2 +-
security/sancp/Portfile | 7 +++++-
security/sign/Portfile | 6 ++++-
shells/mksh/Portfile | 7 ++++++
sysutils/MacPorts/Portfile | 4 ++++
sysutils/amttools/Portfile | 5 ++++
sysutils/brightness/Portfile | 7 +++++-
sysutils/bsdsfv/Portfile | 6 +++++
sysutils/cocoa-tlassemble/Portfile | 4 ++++
sysutils/disktype/Portfile | 7 +++++-
sysutils/dvdrtools/Portfile | 5 ++++
sysutils/entr/Portfile | 13 +++++++++-
sysutils/fatsort/Portfile | 5 ++++
sysutils/fd/Portfile | 2 +-
sysutils/gkrellm/Portfile | 7 ++++++
sysutils/john/Portfile | 6 +++++
sysutils/libfaketime/Portfile | 6 +++++
sysutils/maxwell/Portfile | 4 ++++
sysutils/pidof/Portfile | 7 +++++-
sysutils/rpm54/Portfile | 5 ++++
sysutils/rw/Portfile | 8 ++++++-
sysutils/smlr/Portfile | 8 ++++++-
sysutils/tag/Portfile | 5 ++++
sysutils/tldr-cpp-client/Portfile | 8 ++++++-
sysutils/tmux-pasteboard/Portfile | 6 ++---
sysutils/uif2iso/Portfile | 4 ++++
sysutils/vmdktool/Portfile | 5 ++++
sysutils/watchman/Portfile | 4 ++++
tex/latex2rtf/Portfile | 5 ++++
tex/texlive-bin/Portfile | 10 ++++++++
textproc/openjade/Portfile | 2 +-
textproc/opensp/Portfile | 4 ++++
textproc/rhyme/Portfile | 4 ++++
textproc/texinfo/Portfile | 6 +++++
textproc/wyrd/Portfile | 2 +-
textproc/xalanc/Portfile | 8 +++----
www/apache2/Portfile | 2 +-
www/cgit/Portfile | 5 ++++
www/edbrowse/Portfile | 4 ++++
www/http-parser/Portfile | 5 ++++
www/mongoose/Portfile | 4 ++++
www/netrik/Portfile | 2 +-
www/nghttp2/Portfile | 15 ++++++++++++
www/webkit-gtk-2.0/Portfile | 4 ++++
www/webkit-gtk/Portfile | 4 ++++
x11/gkrellm-gtodo/Portfile | 6 +++++
x11/herbstluftwm/Portfile | 7 +++++-
x11/mesa/Portfile | 2 +-
x11/openmotif/Portfile | 4 ++++
x11/windowmaker/Portfile | 6 +++++
x11/xdotool/Portfile | 7 ++++++
x11/xfs/Portfile | 4 ++--
x11/xorg-libX11/Portfile | 4 ++--
x11/xorg-libXaw/Portfile | 4 ++--
x11/xorg-libXcomposite/Portfile | 2 +-
x11/xorg-libXdmcp/Portfile | 4 ++--
x11/xorg-libXext/Portfile | 4 ++--
x11/xorg-libXfont/Portfile | 4 ++--
x11/xorg-libXfont2/Portfile | 4 ++--
x11/xorg-libXi/Portfile | 6 ++---
x11/xorg-libXmu/Portfile | 4 ++--
x11/xorg-libXtst/Portfile | 4 ++--
x11/xorg-libice/Portfile | 4 ++--
x11/xorg-libsm/Portfile | 4 ++--
x11/xorg-libxcb/Portfile | 2 +-
x11/xorg-server-devel/Portfile | 6 ++---
x11/xorg-server/Portfile | 6 ++---
x11/xorg-xorgproto/Portfile | 4 ++--
x11/xorg-xtrans/Portfile | 4 ++--
xfce/xfce4-settings/Portfile | 8 +++++++
354 files changed, 2013 insertions(+), 281 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt3-mac/Portfile b/aqua/qt3-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c6b8731..500839c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt3-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt3-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +48,9 @@ variant mysql5 conflicts mysql4 description "add MySQL 5 support" {
</span> }
configure.cmd "echo yes | ./configure"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env DYLD_LIBRARY_PATH='' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKESPEC='' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QTDIR=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env DYLD_LIBRARY_PATH= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKESPEC= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTDIR=
</span> configure.args -v -prefix '${prefix}' \
-docdir '${prefix}/share/doc/${name}/html' \
-datadir '${prefix}/share/qt3' \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,9 +66,9 @@ configure.args -v -prefix '${prefix}' \
</span> '-I${prefix}/include' \
'-L${prefix}/lib'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env DYLD_LIBRARY_PATH="${worksrcpath}/lib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKESPEC='' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QTDIR=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env DYLD_LIBRARY_PATH=${worksrcpath}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKESPEC= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTDIR=
</span> build.target symlinks src-qmake src-moc sub-src sub-tools
destroot.destdir INSTALL_ROOT='${destroot}'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/Portfile b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 36f522a..78b80c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -685,7 +685,7 @@ pre-configure {
</span>
# set which stdlib to use; clang only
if {[string match *clang* ${configure.compiler}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append QMAKE_STDLIB=-stdlib=${configure.cxx_stdlib}
</span> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/arc/Portfile b/archivers/arc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a33d02d..f9104b3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/arc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/arc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,11 +25,17 @@ patchfiles patch-gcc-warnings.diff \
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CC=${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC="${configure.cc} [get_canonical_archflags cc]" \
CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]' \
PREFIX='${prefix}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -W ${worksrcpath} ${name} m${name} ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/libzzip/Portfile b/archivers/libzzip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b913ad..979870c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/libzzip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/libzzip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_lib port:zlib
</span> set docdir ${prefix}/share/doc/${name}
configure.python ${prefix}/bin/python2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env ac_cv_path_PAX=":"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env ac_cv_path_PAX=:
</span>
post-configure {
set builddir [glob -dir ${worksrcpath} "*apple-darwin*"]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/pbzip2/Portfile b/archivers/pbzip2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e97382b..9dde506 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/pbzip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/pbzip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,10 +32,17 @@ use_configure no
</span> variant universal {}
pre-build {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append \
CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
destroot.args PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/pigz/Portfile b/archivers/pigz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ae5474d..667cf16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/pigz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/pigz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,15 @@ use_configure no
</span> variant universal {}
build.target
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 644 ${worksrcpath}/${name}.1 ${destroot}${prefix}/share/man/man1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/upx/Portfile b/archivers/upx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 911a1b9..4822734 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/upx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/upx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,9 +52,15 @@ post-configure {
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS_OPTIMIZE=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS_WERROR=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXX="${configure.cxx}" \
CXXFLAGS_OPTIMIZE="${configure.cxxflags} [get_canonical_archflags cxx]" \
CXXFLAGS_WERROR=
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 755 ${worksrcpath}/src/upx.out ${destroot}${prefix}/bin/upx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zstd/Portfile b/archivers/zstd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 08018ad..777e1a4 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;'>@@ -37,12 +37,21 @@ variant universal {}
</span>
build.target allmost
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 3a4cc3f..f9645d1 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;'>@@ -27,8 +27,13 @@ patch {
</span> use_configure no
configure.cflags-append -std=gnu89
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc}" \
CFLAGS="${configure.cflags} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 755 ${worksrcpath}/mp3_check \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/mp3unicode/Portfile b/audio/mp3unicode/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eec10e1..e702e5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/mp3unicode/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/mp3unicode/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ checksums rmd160 bb31045c51ef7d789ffe22767cf721fc7bc3ec30 \
</span> size 101593
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ICONV_LIBS="-liconv"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ICONV_LIBS=-liconv
</span>
depends_build port:pkgconfig
<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 ef6e593..a675126 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,9 +28,14 @@ patchfiles patch-Makefile.diff
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 91c84e1..a926fc4 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,7 +44,11 @@ post-install {
</span> }
if {${build_arch} ne ""} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CFLAGS=${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CFLAGS="${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/msp430-gdb-devel/Portfile b/cross/msp430-gdb-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 35ed99c..38a0c42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/msp430-gdb-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/msp430-gdb-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +43,8 @@ configure.args --target=${name_target} \
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CFLAGS="-I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append CFLAGS="-I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CFLAGS=-I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append CFLAGS=-I${prefix}/include
</span>
# TODO: Why? Ticket URL?
compiler.blacklist *clang*
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/msp430-gdb/Portfile b/cross/msp430-gdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c4369f..9ed66f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/msp430-gdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/msp430-gdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,8 @@ configure.args --target=${name_target} \
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CFLAGS="-I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append CFLAGS="-I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CFLAGS=-I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append CFLAGS=-I${prefix}/include
</span>
# TODO: Why? Ticket URL?
compiler.blacklist *clang*
<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 7d3005b..8168bf0 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,6 +48,21 @@ if {[string match *clang* ${configure.cxx}]} {
</span> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> if { [variant_isset universal] } {
foreach arch ${configure.universal_archs} {
lappend merger_build_env(${arch}) \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,12 +76,13 @@ 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:#e0ffe0;'>+}
</span>
build.env-append \
INSTALL_PATH=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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;'>- OPT="-DNDEBUG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT=-DNDEBUG
</span>
destroot {
xinstall -d -m 0755 ${destroot}${prefix}/include/leveldb
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/rocksdb/Portfile b/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a067719..8f904ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,24 @@ patchfiles-append patch-Makefile.diff
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=[get_canonical_archflags cxx] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORTABLE=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_LEVEL=0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT=${configure.optflags}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=[get_canonical_archflags cxx] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORTABLE=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBUG_LEVEL=0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT=${configure.optflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_PATH=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc}" \
CXX="${configure.cxx}" \
CFLAGS="[get_canonical_archflags cc]" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,3 +66,4 @@ destroot.env-append CC="${configure.cc}" \
</span> DEBUG_LEVEL=0 \
OPT="${configure.optflags}" \
INSTALL_PATH=${destroot}${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><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 4aea920..52edfb1 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,6 +25,16 @@ set javahome /System/Library/Frameworks/JavaVM.framework
</span> patch.args -p1
patchfiles patch-Makefile.in.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## configure ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env MYJAVAHOME=${javahome} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=-I${prefix}/include -I${javahome}/Headers" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-L${prefix}/lib INCLUDEDIR=${javahome}/Headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## build ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=-I${prefix}/include -I${javahome}/Headers" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> ## configure ##
configure.env MYJAVAHOME=${javahome} \
CFLAGS="-I${prefix}/include -I${javahome}/Headers" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +43,7 @@ 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:#e0ffe0;'>+}
</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 e2cce6c..723cd23 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,11 +30,18 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH=${python.prefix}/bin:$env(PATH)
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH=${python.prefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/afl/Portfile b/devel/afl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5783b3b..74d8b14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/afl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/afl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,13 +25,21 @@ checksums rmd160 b7c1174111cfc11d14a0982359ef903d5b8d1267 \
</span> sha256 43614b4b91c014d39ef086c5cc84ff5f068010c264c2c05bf199df60898ce045
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CXX="${configure.cxx}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/appstream-glib/Portfile b/devel/appstream-glib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4210c67..cfb6265 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/appstream-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/appstream-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,8 +60,13 @@ if {[variant_isset universal]} {
</span> lappend merger_destroot_env(${arch}) CC='${configure.cc} -arch ${arch}'
}
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span> }
configure.args -Drpm=false
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/argon2/Portfile b/devel/argon2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a149c1b..a5cd584 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/argon2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/argon2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,19 +23,33 @@ checksums rmd160 0c92cfd56d82acf295465aeab29917bb8b92ab12 \
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> destroot.destdir PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> destroot.env-append CC=${configure.cc} \
CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
test.run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> test.env-append CC=${configure.cc} \
CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bazaar/Portfile b/devel/bazaar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dbb3fd5..c81568a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bazaar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bazaar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,12 +46,21 @@ depends_build-append bin:gnutar:gnutar
</span> configure.args-append --with-gnu-tar=gnutar
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=-g -O2 -Wall -fno-strict-aliasing \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-I${prefix}/include -L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-lintl -lneon -lgpgme -lpth"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env "CFLAGS=-I${prefix}/include -L${prefix}/lib -lintl -lneon -lgpgme" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="-g -O2 -Wall -fno-strict-aliasing \
-I${prefix}/include -L${prefix}/lib \
-lintl -lneon -lgpgme -lpth"
destroot.env CFLAGS="-I${prefix}/include -L${prefix}/lib -lintl -lneon -lgpgme" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-LDFLAGS="-L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="-L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> destroot.destdir prefix=${destroot}${prefix}
post-destroot {
file rename ${destroot}${prefix}/bin/annotate ${destroot}${prefix}/bin/annotate-baz
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/binutils/Portfile b/devel/binutils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e90786..b88ba7b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/binutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/binutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ configure.args --infodir='${prefix}/share/info' \
</span> # The Makefile runs configure again in subdirectories.
# It correcty passes along most configure variables (CFLAGS, LDFLAGS, ...),
# but seems to neglect CPPFLAGS.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CPPFLAGS='-I${prefix}/include'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CPPFLAGS=-I${prefix}/include
</span>
# Binutils violates the mtree layout by creating ${prefix}/<arch>/
destroot.violate_mtree yes
<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 b13bd05..7032709 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,10 +32,15 @@ patchfiles patch-bspatch.c.diff \
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.destdir PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/capstone/Portfile b/devel/capstone/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c622fa1..33fce02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/capstone/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/capstone/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +27,19 @@ use_configure no
</span>
universal_variant yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ldflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ V=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CFLAGS="${configure.cflags}" \
LDFLAGS="${configure.ldflags}" \
PREFIX=${prefix} \
V=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
pre-build {
build.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cdecl/Portfile b/devel/cdecl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b1df94..ae4a06c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cdecl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cdecl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,4 +33,4 @@ autoreconf.args -fvi
</span>
test.run yes
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.env-append "TERM=xterm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env-append TERM=xterm
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41aa37c..91f95bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,12 +133,12 @@ compiler.blacklist-append macports-clang-3.9 macports-clang-4.0 macports-clang-5
</span>
platform darwin {
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_OSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
</span>
if {${configure.sdkroot} != ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append CMAKE_OSX_SYSROOT="${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append CMAKE_OSX_SYSROOT=${configure.sdkroot}
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append CMAKE_OSX_SYSROOT="/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append CMAKE_OSX_SYSROOT=/
</span> }
if {${os.arch} eq "i386" && ${os.major} <= 9} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cryptlib/Portfile b/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b674c47..d572aec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cryptlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,13 +64,19 @@ build.args CC="${configure.cc}" \
</span> configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
foreach arch ${universal_archs} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} ${configure.cppflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> lappend merger_build_env(${arch}) \
CFLAGS="${configure.cflags} ${configure.cppflags} -arch ${arch}" \
LDFLAGS="${configure.ldflags} -arch ${arch}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {![variant_isset universal] && [info exists merger_build_env(${configure.build_arch})]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append $merger_build_env(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append {*}$merger_build_env(${configure.build_arch})
</span> }
destroot.args PREFIX="${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 c9b7d10..4805a37 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,14 +17,22 @@ checksums rmd160 5196472e25fbe87566646d3cfba55f8c20c6d482 \
</span>
use_configure no
default_variants +universal
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CC=${configure.cc} -Wl,-new_linker"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC='${configure.cc} -Wl,-new_linker'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append RC_ARCHS=${configure.universal_archs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append RC_ARCHS='${configure.universal_archs}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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 f0793bf..d8eee17 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,11 +29,18 @@ 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;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 521ab04d..21b0d8d 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,8 +47,13 @@ revision 655
</span> build.post_args-append \
PREFIX=${prefix}
if {[info exists build_arch]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "RC_CFLAGS=-arch ${build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append \
RC_CFLAGS="-arch ${build_arch}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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 ff4d432..75c4979 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,20 @@ 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;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ![variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "DMD=${prefix}/bin/dmd -m64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "DMD=${prefix}/bin/dmd -m32"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(x86_64) "DMD=${prefix}/bin/dmd -m64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(i386) "DMD=${prefix}/bin/dmd -m32"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(ppc64) "DMD=${prefix}/bin/dmd -m64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(ppc) "DMD=${prefix}/bin/dmd -m32"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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,5 +71,6 @@ 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:#e0ffe0;'>+}
</span>
github.livecheck.regex {([^"rba]+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fossil/Portfile b/devel/fossil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a3ae69f..4aac2bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/fossil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/fossil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +40,11 @@ configure.args-append --with-tcl=${prefix}/lib \
</span> --with-th1-hooks \
--with-exec-rel-paths \
--json
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append "CC_FOR_BUILD=${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env-append CC_FOR_BUILD="${configure.cc} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.ldflags-append -liconv
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/girara/Portfile b/devel/girara/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58e1761..3174a27 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/girara/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/girara/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +58,15 @@ platform darwin {
</span> }
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[get_canonical_archflags ld] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERBOSE=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TERM=xterm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CXX=${configure.cxx} \
CPP=${configure.cpp} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +74,7 @@ build.env CC=${configure.cc} \
</span> LDFLAGS="[get_canonical_archflags ld]" \
VERBOSE=1 \
TERM=xterm
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env {*}${build.env}
destroot.args {*}${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-crypt/Portfile b/devel/git-crypt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 820bd45..6f59f0a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git-crypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-crypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +37,20 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.args ENABLE_MAN=yes PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-flow/Portfile b/devel/git-flow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d96de2..ef961ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git-flow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-flow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@ subport ${realname}-hf {
</span> This is the HubFlow version, and is actively developed.
conflicts ${realname} ${realname}-devel ${realname}-avh
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env INSTALL_INTO="${destroot}${prefix}/bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env INSTALL_INTO=${destroot}${prefix}/bin
</span> destroot.cmd ./install.sh
destroot.destdir
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/Portfile b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 774b339..d79dba0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,8 +78,13 @@ variant python35 conflicts python27 python36 python37 description {Build Python
</span> configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python3.5
set python_framework ${frameworks_dir}/Python.framework/Versions/3.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "PYTHON_LIBS=-L${python_framework}/lib -lpython3.5" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_LIB_LOC=${python_framework}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append PYTHON_LIBS="-L${python_framework}/lib -lpython3.5" \
PYTHON_LIB_LOC=${python_framework}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> depends_lib-append port:py35-gobject3
configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,8 +93,13 @@ variant python36 conflicts python27 python35 python37 description {Build Python
</span> configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python3.6
set python_framework ${frameworks_dir}/Python.framework/Versions/3.6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "PYTHON_LIBS=-L${python_framework}/lib -lpython3.6" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_LIB_LOC=${python_framework}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append PYTHON_LIBS="-L${python_framework}/lib -lpython3.6" \
PYTHON_LIB_LOC=${python_framework}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> depends_lib-append port:py36-gobject3
configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,8 +108,13 @@ variant python37 conflicts python27 python35 python36 description {Build Python
</span> configure.args-replace --disable-python --enable-python
configure.python ${prefix}/bin/python3.7
set python_framework ${frameworks_dir}/Python.framework/Versions/3.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "PYTHON_LIBS=-L${python_framework}/lib -lpython3.7" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_LIB_LOC=${python_framework}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append PYTHON_LIBS="-L${python_framework}/lib -lpython3.7" \
PYTHON_LIB_LOC=${python_framework}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> depends_lib-append port:py37-gobject3
configure.pkg_config_path ${python_framework}/lib/pkgconfig
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/icmake/Portfile b/devel/icmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d4287f..8e55690 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/icmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/icmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,10 +50,15 @@ post-patch {
</span>
use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span> build.cmd ./icm_bootstrap
build.pre_args ${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/legacy-support/Portfile b/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1659ae9..ef88345 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/legacy-support/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,14 +39,21 @@ test.run yes
</span> test.target test
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> destroot.env PREFIX=${prefix}
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libCUDF/Portfile b/devel/libCUDF/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 467e11f1..2c268bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libCUDF/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libCUDF/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,15 @@ use_configure no
</span> # parallel building fails
use_parallel_build no
<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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-patch {
reinplace "s#/usr/#${prefix}/#g" ${worksrcpath}/Makefile.config
<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 9c7b0a5..2769969 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;'>@@ -36,4 +36,8 @@ patchfiles patch-configure.ac.diff
</span>
use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</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;background:#e0ffe0;'>+} else {
</span> autoreconf.env ACLOCAL="aclocal -I ${prefix}/share/aclocal -I ."
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libcryptopp/Portfile b/devel/libcryptopp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 118fdb2..316a542 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libcryptopp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libcryptopp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,11 @@ proc _get_cryptopp_init_priority_flag {compiler} {
</span>
build.type gnu
build.target dynamic static cryptest.exe
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CXXFLAGS=[get_canonical_archflags cxx] -DNDEBUG [_get_cryptopp_init_priority_flag ${configure.compiler}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CXXFLAGS="[get_canonical_archflags cxx] -DNDEBUG [_get_cryptopp_init_priority_flag ${configure.compiler}]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.args-append CXX=${configure.cxx} PREFIX=${prefix}
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libghash/Portfile b/devel/libghash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ee9cc49..ef4fec4 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,11 +23,18 @@ patchfiles patch-Makefile
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ld_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env PREFIX="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env PREFIX=${prefix}
</span>
test.run yes
<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 9fded64..9b122d4 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,9 +32,15 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libpointing/Portfile b/devel/libpointing/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eac7e7a..fbea03a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libpointing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libpointing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,12 +30,17 @@ patchfiles patch-Makefile.diff
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> destroot.env PREFIX=${prefix}
pre-fetch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +51,13 @@ pre-fetch {
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> test.env CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> test.target test
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsigcxx2/Portfile b/devel/libsigcxx2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bdc055f..83261e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsigcxx2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsigcxx2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ depends_build port:pkgconfig \
</span>
configure.perl /usr/bin/perl
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "M4=${prefix}/bin/gm4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ M4=${prefix}/bin/gm4
</span> configure.args --enable-static \
--disable-silent-rules
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsigcxx3/Portfile b/devel/libsigcxx3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8bc0855..4d5c8a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsigcxx3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsigcxx3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ compiler.fallback-append macports-gcc-7
</span> configure.perl /usr/bin/perl
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "M4=${prefix}/bin/gm4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ M4=${prefix}/bin/gm4
</span>
configure.args --enable-static \
--disable-silent-rules
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsockets/Portfile b/devel/libsockets/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42f5bc4..9c5a78d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsockets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsockets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ post-extract {
</span> xinstall -m 755 ${filespath}/create-dylib.sh ${worksrcpath}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append PLATFORM="macosx" PREFIX="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PLATFORM=macosx PREFIX=${prefix}
</span> configure.cflags-append -I${prefix}/include/libxml2
configure.ldflags-append -lxml2
build.target-append libSockets.dylib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtermkey/Portfile b/devel/libtermkey/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b0f964c..b3e7b22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtermkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libtermkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,14 @@ depends_lib port:ncurses
</span> use_configure no
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.args ${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libvterm/Portfile b/devel/libvterm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b665504..681e317 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libvterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libvterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,15 @@ depends_build port:libtool \
</span> use_configure no
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.args ${build.args}
<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 9894a2f..eb4074f 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,11 +37,19 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INC_PATH=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_PATH=-L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LUAPATH=${lua_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LUACPATH=${lua_cpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 4210e01..c1ae8c4 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;'>@@ -41,13 +41,20 @@ build.args CC=${configure.cc} \
</span> PREFIX=${prefix}
# configure script is not from autotools, it only searches for lua binary prefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# it is needed to manually set flags env variable in build phase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# it is needed to manually set flags env variable in build phase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld] -llua -lm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
post-build {
# fdemo example is broken, it's using libcrypt
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tests/DES56 "[join ${build.env}] ${build.cmd} [join ${build.args}] fdemo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append fdemo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/tests/DES56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command_exec build
</span> }
post-destroot {
<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 723cfbb..40681ed 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,8 +30,13 @@ post-patch {
</span> variant universal {}
# it is needed to manually set flags env variable as well
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld] -llua -lm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
<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:#e0ffe0;'>+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld] -llua -lm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-destroot {
xinstall -d ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/Portfile b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d49ea5..761dc96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,11 +71,20 @@ pre-test {
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> test.env CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> test.cmd ./run_tests.py
test.target
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mspdebug/Portfile b/devel/mspdebug/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ab2984..835e4ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mspdebug/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mspdebug/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ variant universal {}
</span>
build.args-append CC="${configure.cc} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append PREFIX="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append PREFIX=${prefix}
</span>
platform darwin 8 {
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nu2/Portfile b/devel/nu2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 255bed8..41900d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nu2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nu2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ pre-build {
</span>
build.cmd ./mininush tools/nuke
build.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span> PREFIX=${prefix}
test.run yes
<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 e6ecdb7..48126f4 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,8 +23,13 @@ checksums rmd160 0c32ae064d742ff32bde14ab4a6a269c52772b84 \
</span> use_configure no
build.target nuweb
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc] -std=gnu89 -Wno-return-type"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 92c4bde..4a8c4b2 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,12 +32,20 @@ post-patch {
</span>
use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
build.target tgz
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/quickfix/Portfile b/devel/quickfix/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fecd9ac..2190ff6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/quickfix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/quickfix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ configure.args --with-java \
</span> --without-postgresql \
--without-python \
--without-ruby
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env "JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
</span>
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/${name}/sql
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/snowleopardfixes/Portfile b/devel/snowleopardfixes/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d599fe..45a323a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/snowleopardfixes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/snowleopardfixes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,11 +20,20 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
CC="${configure.cc}" \
CFLAGS="${configure.cflags}" \
<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:#e0ffe0;'>+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</span> PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/srecord/Portfile b/devel/srecord/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a6c240..bc02e2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/srecord/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/srecord/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ depends_lib port:boost \
</span> configure.cflags-append \
"-I${prefix}/include"
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "LIBTOOL=glibtool"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBTOOL=glibtool
</span>
destroot.destdir prefix=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/stm32flash/Portfile b/devel/stm32flash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c221c08..8dba69b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/stm32flash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/stm32flash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +28,13 @@ destroot.args PREFIX=${prefix}
</span> post-patch {
reinplace "s|\$\(AR\) rc|\$\(AR\) rcs|g" ${worksrcpath}/parsers/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
build.args-append CC=${configure.cc}
build.env-append MAKE=${build.cmd} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/subversion-python27bindings/Portfile b/devel/subversion-python27bindings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c9d63a..2f4bf02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion-python27bindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion-python27bindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,12 +51,19 @@ configure.args --with-berkeley-db=:${prefix}/include/db48:${prefix}/lib/db48:db
</span> --with-sasl=${prefix} \
--with-libmagic=${prefix} \
--without-gnome-keyring
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env ac_cv_path_PYTHON=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_python_includes=-I${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ac_cv_python_link=${configure.cc} -L${prefix}/lib -bundle -undefined dynamic_lookup ${frameworks_dir}/Python.framework/Versions/2.7/Python" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ac_cv_python_libs=-L${prefix}/lib -bundle -undefined dynamic_lookup ${frameworks_dir}/Python.framework/Versions/2.7/Python" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_python_compile=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env ac_cv_path_PYTHON=${prefix}/bin/python2.7 \
ac_cv_python_includes=-I${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7 \
ac_cv_python_link="${configure.cc} -L${prefix}/lib -bundle -undefined dynamic_lookup ${frameworks_dir}/Python.framework/Versions/2.7/Python" \
ac_cv_python_libs="-L${prefix}/lib -bundle -undefined dynamic_lookup ${frameworks_dir}/Python.framework/Versions/2.7/Python" \
ac_cv_python_compile=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
use_parallel_build yes
build.target swig-py
<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 046d0e3..afff9b4 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;'>@@ -25,7 +25,12 @@ checksums rmd160 e1ec74bc8623587ec26a8c7c8292e96935037144 \
</span>
use_configure no
build.type bsd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=${configure.cflags} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} NO_WERROR=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
CC="${configure.cc}" NO_WERROR=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env BINDIR=${prefix}/bin MANDIR=${prefix}/share/man/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tup/Portfile b/devel/tup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db725f7..c0e7fc0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,10 +35,17 @@ patchfiles patch-build.sh.diff
</span> use_configure no
build.cmd ./build.sh
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TUP_LABEL=${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC=${configure.cc} \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
TUP_LABEL=${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 0755 ${worksrcpath}/build/tup ${destroot}${prefix}/bin/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/unibilium/Portfile b/devel/unibilium/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aab6fc7..014e22f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/unibilium/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/unibilium/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,8 +26,14 @@ depends_build port:libtool
</span> use_configure no
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.args ${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ustl/Portfile b/devel/ustl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 43c97d3..68aaf29 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ustl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ustl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ platform darwin {
</span> patchfiles-append Config.mk.in.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env SED="${prefix}/bin/gsed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env SED=${prefix}/bin/gsed
</span>
pre-destroot {
reinplace "s|${prefix}|${destroot}${prefix}|g" ${worksrcpath}/Config.mk
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xulrunner-devel/Portfile b/devel/xulrunner-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b04269..a916800 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xulrunner-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xulrunner-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,8 +259,8 @@ post-patch {
</span> }
configure.env \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MOZCONFIG="${worksrcpath}/xulrunner/config/mozconfig" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOZILLA_FIVE_HOME="${prefix}/lib/${pkg_name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOZCONFIG=${worksrcpath}/xulrunner/config/mozconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOZILLA_FIVE_HOME=${prefix}/lib/${pkg_name}
</span>
build.args-append \
includedir="${prefix}/include/${pkg_name}" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xulrunner/Portfile b/devel/xulrunner/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d87db98..3008845 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xulrunner/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xulrunner/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -218,8 +218,8 @@ post-patch {
</span> }
configure.env \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MOZCONFIG="${worksrcpath}/xulrunner/config/mozconfig" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOZILLA_FIVE_HOME="${prefix}/lib/${component}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOZCONFIG=${worksrcpath}/xulrunner/config/mozconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOZILLA_FIVE_HOME=${prefix}/lib/${component}
</span>
build.args-append \
includedir="${prefix}/include/${component}" \
<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 9f7db15..be3ae95 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,9 +23,15 @@ extract.mkdir yes
</span> patchfiles patch-te_subs.c Makefile.patch
use_configure no
build.target
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} ${configure.ld_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 755 -W ${worksrcpath} te ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/atom/Portfile b/editors/atom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5fff92e..ca87018 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/atom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/atom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,12 +32,21 @@ build.cmd script/build
</span> configure.cflags-append "-mmacosx-version-min=${macosx_deployment_target}"
configure.cxxflags-append "-mmacosx-version-min=${macosx_deployment_target}"
configure.ldflags-append "-mmacosx-version-min=${macosx_deployment_target}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CC=${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXX=${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.cxxflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC="${configure.cc} [get_canonical_archflags cc]" \
CXX="${configure.cxx} [get_canonical_archflags cxx]" \
PYTHON="${prefix}/bin/python2.7" \
CFLAGS="${configure.cflags}" \
CXXFLAGS="${configure.cxxflags}" \
LDFLAGS="${configure.ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.target-delete all
build.args-append --ci
<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 3b08164..a86dc7a 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,12 +27,20 @@ depends_lib-append port:ncurses
</span> patchfiles patch-dhex-makefile.diff
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.destdir DESTDIR=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/texworks/Portfile b/editors/texworks/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6520110..f99a318 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/texworks/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/texworks/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ variant qt4 description {Build against Qt 4} {
</span> PortGroup qt4 1.0
depends_lib-append port:poppler-qt4-mac
configure.args-append -DDESIRED_QT_VERSION=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PKG_CONFIG_PATH="${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PKG_CONFIG_PATH=${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig
</span> }
# TODO: doesn't work at the moment
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vigor/Portfile b/editors/vigor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 22a7169..4982462 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vigor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vigor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ post-patch {
</span> ${worksrcpath}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env ADDLDFLAGS='-L${prefix}/lib/tk8.5'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env ADDLDFLAGS=-L${prefix}/lib/tk8.5
</span> configure.args --enable-tknvi \
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
<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 98b24c5..6ee34d5 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,7 +61,11 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
worksrcdir ${name}-${version}/src
use_parallel_build yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/lisaem/Portfile b/emulators/lisaem/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 23e167d..5090998 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/lisaem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/lisaem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,17 +34,30 @@ use_configure no
</span> build.cmd ./build.sh
build.target build
pre-build {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} [get_canonical_archflags cc] -Wno-error -Wno-return-type" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXX=${configure.cxx} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CC="${configure.cc} [get_canonical_archflags cc] -Wno-error -Wno-return-type" \
CXX="${configure.cxx} [get_canonical_archflags cxx]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
destroot.destdir
pre-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} [get_canonical_archflags cc] -Wno-error -Wno-return-type" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXX=${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIXAPP=${destroot}${applications_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIXBIN=${destroot}${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIXLIB=${destroot}${prefix}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> destroot.env-append CC="${configure.cc} [get_canonical_archflags cc] -Wno-error -Wno-return-type" \
CXX="${configure.cxx} [get_canonical_archflags cxx]" \
PREFIXAPP=${destroot}${applications_dir} \
PREFIXBIN=${destroot}${prefix}/bin \
PREFIXLIB=${destroot}${prefix}/share
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/spim/Portfile b/emulators/spim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5df005b..4f98ae9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/spim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/spim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,13 @@ worksrcdir code/spim
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.target spim
build.args CXX=${configure.cxx} \
MYLEX=${prefix}/bin/flex \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/vpcs/Portfile b/emulators/vpcs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d472f58..3788505 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/vpcs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/vpcs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,12 +45,21 @@ platform darwin powerpc {
</span> }
build.cmd ./mk.sh
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXX="${configure.cxx}" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
copy ${worksrcpath}/vpcs ${destroot}${prefix}/bin/vpcs
<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 268fef6..d6da37a 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,10 +25,15 @@ use_configure no
</span>
# osxfuse is not universal
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
build.target
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/bastet/Portfile b/games/bastet/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 836a4fe..c604f02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/bastet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/bastet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,11 +38,17 @@ post-patch {
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env BOOST_PO=-lboost_program_options-mt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env BOOST_PO=-lboost_program_options-mt \
CXX=${configure.cxx} \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.keepdirs ${scoredir}
<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 170b4c5..046739a 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,9 +52,15 @@ variant universal {}
</span>
use_parallel_build yes
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CXX=${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USEPAK=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXX="${configure.cxx} [get_canonical_archflags cxx]" \
CFLAGS="${configure.cppflags}" \
USEPAK=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 6db6d19..2774dc5 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,10 +37,17 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=${configure.cflags} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JOY=NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="${configure.cflags} [get_canonical_archflags]" \
CC=${configure.cc} \
PREFIX=${prefix} \
JOY=NO
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 16a8b98..7b2fd5f 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,8 +49,13 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CXX=${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SWIG=${prefix}/bin/swig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXX="${configure.cxx} [get_canonical_archflags cxx]" \
SWIG=${prefix}/bin/swig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 64e9289..bee04fb 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,9 +43,13 @@ use_configure no
</span> variant universal {}
build.type bsd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CFLAGS=[get_canonical_archflags] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CFLAGS="[get_canonical_archflags]" \
CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 755 -W ${worksrcpath} fortune/fortune strfile/strfile \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/gnushogi/Portfile b/games/gnushogi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 69de794..eb5d81e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/gnushogi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/gnushogi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ checksums md5 a18eae93afc89bfd368ed5f6768be791 \
</span> depends_lib port:xorg-libXaw \
port:ncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env X_LIBS="-L${prefix}/lib" X_CFLAGS="-I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env X_LIBS=-L${prefix}/lib X_CFLAGS=-I${prefix}/include
</span> configure.args --with-x --with-xshogi
use_parallel_build yes
<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 8fc90ef..acf0faa 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,10 +39,15 @@ use_configure no
</span> variant universal {}
use_parallel_build yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=[get_canonical_archflags cxx] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXX=${configure.cxx} \
CXXFLAGS="[get_canonical_archflags cxx]" \
LDFLAGS="[get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 725cae5..4b93996 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,7 +16,11 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
depends_lib-append port:ncurses
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/Portfile b/games/openttd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b832be9..7efedaf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openttd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,10 +47,17 @@ if {${name} eq ${subport}} {
</span> port:openttd-opensfx \
port:openttd-openmsx
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_BUILD=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS_BUILD=${configure.cxxflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_BUILD=${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append \
CFLAGS_BUILD="${configure.cflags}" \
CXXFLAGS_BUILD="${configure.cxxflags}" \
LDFLAGS_BUILD="${configure.ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> configure.args --prefix-dir=${prefix} \
--binary-dir=bin \
--icon-theme-dir=share/icons/hicolor \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/svinepalsen/Portfile b/games/svinepalsen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 108f465..44b11b1 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,7 +52,11 @@ post-configure {
</span> ${configure.dir}/src/svinepalsen.cc
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CPPFLAGS=-I${prefix}/include -I${prefix}/include/smpeg" LDFLAGS=-L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CPPFLAGS="-I${prefix}/include -I${prefix}/include/smpeg" LDFLAGS="-L${prefix}/lib"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 d593b8f..57cea01 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,8 +28,11 @@ depends_lib port:libsdl \
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
build.args JOY=NO \
PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gctpc/Portfile b/gis/gctpc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 82c777c..85a759b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gctpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gctpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,11 +40,17 @@ if {[variant_isset universal]} {
</span> set cflags "${configure.cflags} ${configure.cc_archflags}"
set ldflags "${configure.ldflags} ${configure.cc_archflags}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append LDFLAGS=${ldflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${cflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append LDFLAGS=\"${ldflags}\" \
CC=\"${configure.cc}\" \
CPPFLAGS=\"${configure.cppflags}\" \
CFLAGS=\"${cflags}\"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.target ""
build.args-append "-f makefile.gctpc"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/libproj4/Portfile b/gis/libproj4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f56a393..490e614 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/libproj4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/libproj4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,19 @@ variant universal {}
</span> use_parallel_build no
build.args-append -e
build.target libproj4 lproj
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=-I. ${configure.cppflags} -DPROJ_HAVE_GSL=1 -DPROJ_HAVE_THREADS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.cflags} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=-L./ -lproj4 ${configure.ldflags} ${configure.cc_archflags} -lgsl -lgslcblas"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=-I. ${configure.cppflags} -DPROJ_HAVE_GSL=1 -DPROJ_HAVE_THREADS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.cflags} ${configure.universal_cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=-L./ -lproj4 ${configure.ldflags} ${configure.universal_ldflags} -lgsl -lgslcblas"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> if {![variant_isset universal]} {
build.env-append CC=${configure.cc} \
CFLAGS=\"-I. ${configure.cppflags} -DPROJ_HAVE_GSL=1 -DPROJ_HAVE_THREADS=1 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +57,7 @@ if {![variant_isset universal]} {
</span> ${configure.cflags} ${configure.universal_cflags}\" \
LDFLAGS=\"-L./ -lproj4 ${configure.ldflags} ${configure.universal_ldflags} -lgsl -lgslcblas\"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 644 ${worksrcpath}/libproj4.a ${destroot}${prefix}/lib/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/Portfile b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e20e8f9..b3c0321 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,8 +77,8 @@ variant python27 description "build Python 2.7 bindings" {
</span> port:swig-python
configure.args-append --enable-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON="${prefix}/bin/python2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_VERSION="2.7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON_VERSION=2.7
</span> }
variant libfire {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/at-spi2-core/Portfile b/gnome/at-spi2-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f4c9607..45fd72c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/at-spi2-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/at-spi2-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,17 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> configure.args -Denable-introspection=yes
# gobject-introspection uses g-ir-scanner, which uses $CC from env
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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;'>@@ -50,5 +61,6 @@ 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:#e0ffe0;'>+}
</span>
livecheck.type gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/desktop-file-utils/Portfile b/gnome/desktop-file-utils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e0c2e34..1a19826 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/desktop-file-utils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/desktop-file-utils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span>
# emacs could probably be turned back on in a variant, depending on emacs
# from MacPorts, as for some this may otherwise fail (ticket #15922)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append EMACS="no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append EMACS=no
</span>
post-activate {
system "update-desktop-database -q ${prefix}/share/applications; true"
<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 f0d225d..e9a5c91 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,6 +39,17 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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;'>@@ -48,5 +59,6 @@ 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:#e0ffe0;'>+}
</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 bd470c6..5871559 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;'>@@ -38,6 +38,17 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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,5 +58,6 @@ 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:#e0ffe0;'>+}
</span>
livecheck.type gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MyPaint/Portfile b/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cbac3b0..5e37ee3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,9 +90,15 @@ build.cmd ${prefix}/bin/scons
</span> build.target
build.args python_binary=${prefix}/bin/python2.7 \
python_config=${prefix}/bin/python2.7-config
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXX=${configure.cxx} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_PATH=${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc} [get_canonical_archflags cc]" \
CXX="${configure.cxx} [get_canonical_archflags cxx]" \
PKG_CONFIG_PATH="${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.args {*}${build.args} \
prefix=${prefix}
<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 82a137e..00f214e 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,7 +47,11 @@ if {![variant_isset sdl]} {
</span>
use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.env "AUTOMAKE=automake --foreign --add-missing --ignore-deps"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> autoreconf.env AUTOMAKE="automake --foreign --add-missing --ignore-deps"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args --disable-ctrl \
--disable-examples \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/argyll/Portfile b/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14b3300..2661782 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,10 +50,16 @@ build.env-append HAVE_JPEG=true
</span> build.env-append HAVE_PNG=true
build.env-append HAVE_TIFF=true
build.env-append HAVE_Z=true HAVE_ZLIB=true
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PREF_CCFLAGS=${configure.cflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "PREF_LINKFLAGS=${configure.ldflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -ljpeg -lpng -ltiff -lusb-1.0 -lz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append PREF_CCFLAGS="${configure.cflags}"
build.env-append PREF_LINKFLAGS="${configure.ldflags} \
-ljpeg -lpng -ltiff -lusb-1.0 -lz"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env ${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env {*}${build.env}
</span> destroot.destdir DESTDIR=${worksrcpath}
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/babl-devel/Portfile b/graphics/babl-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ee20671..e140092 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/babl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/babl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,10 +53,18 @@ configure.args --disable-silent-rules \
</span>
# CC_FOR_BUILD is used by config.guess to determine processor type
if {![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "CC_FOR_BUILD=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env(${arch}) "CC_FOR_BUILD=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> lappend merger_configure_env(${arch}) CC_FOR_BUILD='${configure.cc} -arch ${arch}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/babl/Portfile b/graphics/babl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 87f1ae1..dad323e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/babl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/babl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,10 +46,18 @@ patchfiles-append patch-config.guess.diff
</span>
# CC_FOR_BUILD is used by config.guess to determine processor type
if {![variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "CC_FOR_BUILD=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_env(${arch}) "CC_FOR_BUILD=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> lappend merger_configure_env(${arch}) CC_FOR_BUILD='${configure.cc} -arch ${arch}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/exiftran/Portfile b/graphics/exiftran/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa40bac..a8bff0e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/exiftran/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/exiftran/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,13 @@ build.args verbose=yes \
</span> CC="${configure.cc}" \
EXTRA_CFLAGS="${configure.cflags} [get_canonical_archflags cc] ${configure.cppflags}" \
LIB="lib"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC="${configure.cc}" \
CPPFLAGS="${configure.cppflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 0755 ${worksrcpath}/exiftran ${destroot}${prefix}/bin/exiftran
<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 83a1ef8..5ec302c 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,10 +35,17 @@ variant universal {}
</span>
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.args PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp-help-en/Portfile b/graphics/gimp-help-en/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d72095c..c0cd775 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp-help-en/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp-help-en/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ post-patch {
</span>
configure.args --without-gimp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env ALL_LINGUAS='${lingua}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env ALL_LINGUAS=${lingua}
</span> configure.python ${prefix}/bin/python2.7
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gphoto2/Portfile b/graphics/gphoto2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f5b6f1..f4fb6a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gphoto2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gphoto2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +34,13 @@ depends_lib port:gettext \
</span> port:popt \
port:readline
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env POPT_CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POPT_LIBS=-L${prefix}/lib -lpopt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env POPT_CFLAGS="-I${prefix}/include" \
POPT_LIBS="-L${prefix}/lib -lpopt"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> configure.args --without-aalib \
--without-cdk \
ac_cv_prog_AWK=/usr/bin/awk
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gpick/Portfile b/graphics/gpick/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d4ddc2c..0273c8f 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,11 +43,19 @@ configure.ldflags-append -lexpat
</span>
build.cmd ${prefix}/bin/scons
build.target build
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.env {*}${build.env}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphene/Portfile b/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 62ec1e3..4307d44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,10 +63,20 @@ if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {[variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> lappend merger_build_env(${arch}) CC='${configure.cc} -arch ${arch}'
lappend merger_destroot_env(${arch}) CC='${configure.cc} -arch ${arch}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ipe/Portfile b/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0075f50..e67880f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ipe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,8 +56,13 @@ variant qvoronoi description {Add qvoronoi ipelet} {
</span> default_variants +qvoronoi
pre-build {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env CXXFLAGS=[get_canonical_archflags cxx] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env CXXFLAGS="[get_canonical_archflags cxx]" \
LDFLAGS="[get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> build.args-append IPEPREFIX=${prefix} \
CXX=${configure.cxx} \
LUA_PACKAGE="lua" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/makeicns/Portfile b/graphics/makeicns/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 23cbb1c..7bbb50a 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,11 +41,19 @@ if {[string match *clang* ${configure.cxx}]} {
</span> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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="[join ${configure.ldflags}] [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 0330980..bfcce8a 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,7 +26,11 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 d9d5bd5..61a823e 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,7 +29,11 @@ depends_lib port:gd2
</span>
worksrcdir ${name}-${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env GDLIB_CFLAGS=${configure.cflags} GDLIB_LIBS=-lgd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env GDLIB_CFLAGS='${configure.cflags}' GDLIB_LIBS='-lgd'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> use_configure yes
configure.args --prefix=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openni/Portfile b/graphics/openni/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 763a588..73c6973 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openni/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openni/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +68,11 @@ use_configure no
</span> variant universal {}
build.cmd ./RedistMaker
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CXX=${configure.cxx} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CXX="${configure.cxx} [get_canonical_archflags cxx]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.target
pre-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvrml/Portfile b/graphics/openvrml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 17fd57e..0d05b5a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvrml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvrml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,11 @@ variant js_spidermonkey description {Enable support for JavaScript in the Script
</span> configure.args-delete --disable-script-node-javascript
configure.args-append --enable-script-node-javascript \
--with-libjs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "JS_CFLAGS=-DXP_UNIX -DJS_THREADSAFE -I${prefix}/include/js"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append JS_CFLAGS="-DXP_UNIX -DJS_THREADSAFE -I${prefix}/include/js"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant opengl description {Build the OpenGL renderer} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pdf2djvu/Portfile b/graphics/pdf2djvu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4df6289..b88f266 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pdf2djvu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pdf2djvu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ patchfiles patch-i18n.hh.diff \
</span> # this prevents linking with ossp-uuid if it is installed
configure.env-append \
LIBUUID_CFLAGS=-I/usr/include/uuid/uuid.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBUUID_LIBS=' '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBUUID_LIBS=
</span>
configure.args-append --disable-openmp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pict2pdf/Portfile b/graphics/pict2pdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2dafb26..9e39bb6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pict2pdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pict2pdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,9 +16,15 @@ master_sites sourceforge
</span> checksums md5 c37627f7483509887f70d07d3f798208
patchfiles Makefile.diff
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env PREFIX=${prefix} CC=${configure.cc} LD=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ld_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env PREFIX="${prefix}" CC="${configure.cc}" LD="${configure.cc}" \
CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
LDFLAGS="${configure.ld_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> destroot { xinstall -m 755 ${worksrcpath}/pict2pdf ${destroot}${prefix}/bin
xinstall -m 644 ${worksrcpath}/pict2pdf.1 \
${destroot}${prefix}/share/man/man1 }
<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 d28cc1c..750671a 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;'>@@ -34,11 +34,19 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGSADD=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGSADD=[get_canonical_archflags ld] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARFLAGS=rsv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.env-append {*}${build.env}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-qt4-mac/Portfile b/graphics/poppler-qt4-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e3314ab..02722ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler-qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler-qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,8 +79,8 @@ To use this port to build poppler-based ports that require qt4, you will need\
</span> to pass in the directories to the pkgconfig files or otherwise direct the build\
to find these headers and libraries. For example, these lines may be useful:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append PKG_CONFIG_PATH="${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PKG_CONFIG_PATH="${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PKG_CONFIG_PATH=${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PKG_CONFIG_PATH=${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig
</span>
}
<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 292d25d..1d56643 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,7 +49,11 @@ pre-configure {
</span> system -W ${worksrcpath}/unix "./prebuild.sh"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env "COMPILED_BY=MacPorts <https://www.macports.org/>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env COMPILED_BY="MacPorts <https://www.macports.org/>"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/graphics/sane-backends/Portfile b/graphics/sane-backends/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db971dd..61f4548 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/sane-backends/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/sane-backends/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ post-configure {
</span> ${worksrcpath}/tools/sane-backends.pc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append LC_CTYPE="C"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append LC_CTYPE=C
</span>
use_parallel_build no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vips/Portfile b/graphics/vips/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c5f478..e96eed2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vips/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vips/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ variant python27 description {Install Python 2.7 interface} {
</span> # Include vips7 legacy API
configure.args-append --enable-pyvips7 \
am_cv_python_pyexecdir='${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages'
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON='${prefix}/bin/python2.7'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON=${prefix}/bin/python2.7
</span> }
variant python34 description {Install Python 3.4 interface} {
depends_lib-append port:py34-gobject3
<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 abfa32a..88795bf 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,7 +34,11 @@ patchfiles patch-configure.diff \
</span>
# Calls ld directly which makes universal hard
universal_variant no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env ARCHFLAGS=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env ARCHFLAGS="[get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/ccl-util/Portfile b/java/ccl-util/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 503145c..3dcbba1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/ccl-util/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/ccl-util/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ patchfiles patch-build.xml \
</span> build.cmd ant
build.target jar
build.dir ${worksrcpath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env ANT_OPTS="-Dfile.encoding=iso-8859-1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env ANT_OPTS=-Dfile.encoding=iso-8859-1
</span> #build.args-append -debug
destroot {
<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 26e343f..f4f042c 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,12 +59,20 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span> build.cmd ant
build.target clean all
test.run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span> test.cmd python
test.target allTests.py --debug --env
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/tellico/Portfile b/kde/tellico/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f0bdef..5e2cf9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/tellico/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/tellico/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,8 @@ depends_lib-append port:gettext \
</span> port:qjson \
port:poppler-qt4-mac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append PKG_CONFIG_PATH="${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PKG_CONFIG_PATH="${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PKG_CONFIG_PATH=${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PKG_CONFIG_PATH=${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig
</span>
patchfiles-append patch-CMakeLists-ksane.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/apple-gcc40/Portfile b/lang/apple-gcc40/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 776eea5..d3b0522 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/apple-gcc40/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/apple-gcc40/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ configure.args --enable-languages=c,objc \
</span> configure.cflags
configure.ldflags
configure.cppflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PATH="/bin:/usr/bin:/sbin:/usr/sbin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PATH=/bin:/usr/bin:/sbin:/usr/sbin
</span> configure.cxx_stdlib libstdc++
patchfiles patch-c-incpath.c.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/apple-gcc42/Portfile b/lang/apple-gcc42/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 138248a..01ed99d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/apple-gcc42/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/apple-gcc42/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,8 +202,8 @@ platform darwin 8 {
</span> }
build.env \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LANGUAGES="c,c++,objc,obj-c++"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH=/bin:/usr/bin:/sbin:/usr/sbin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LANGUAGES=c,c++,objc,obj-c++
</span>
if {![variant_isset bootstrap]} {
#depends_lib-append port:libiconv
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/berkeley_upc/Portfile b/lang/berkeley_upc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 76a59ec..b94a66d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/berkeley_upc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/berkeley_upc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ post-patch {
</span> reinplace "s|\$opt{'gccupc'}|1|g" ${worksrcpath}/multiconf.conf.in
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env MPI_CFLAGS="-O3" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env MPI_CFLAGS=-O3 \
</span> GCCUPC_TRANS=${prefix}/lib/upc/bin/upc
configure.args-append \
<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 a45b03d..dcfddce 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,9 +20,15 @@ patchfiles Makefile.patch
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXFLAGS=${configure.cxxflags} ${configure.cxx_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 6fdf855..311eeaa 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,10 +33,15 @@ patchfiles patch-Makefile.diff
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 755 ${worksrcpath}/cbmbasic ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/chapel/Portfile b/lang/chapel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd851ab..16d5902 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/chapel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/chapel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +33,12 @@ build.env-append CHPL_HOST_COMPILER=clang \
</span> CHPL_MEM=cstdlib \
CHPL_GMP=none \
CHPL_REGEXP=none \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CHPL_LLVM=none \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHPL_LLVM=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append LDFLAGS=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append LDFLAGS="[get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
build.args CXX=${configure.cxx} \
CC=${configure.cc} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/dragonegg-3.4/Portfile b/lang/dragonegg-3.4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a714d9e..d3643fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/dragonegg-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/dragonegg-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,12 +124,21 @@ set cxx_stdlibflags {}
</span> if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENABLE_LLVM_PLUGINS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC=${prefix}/bin/gcc-mp-${gcc_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CC=${configure.cc} ${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXX=${configure.cxx} ${configure.cppflags} ${configure.cxxflags} ${cxx_stdlibflags} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append \
ENABLE_LLVM_PLUGINS=1 \
LLVM_CONFIG=${prefix}/bin/llvm-config-mp-${llvm_version} \
GCC=${prefix}/bin/gcc-mp-${gcc_version} \
CC="${configure.cc} ${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
CXX="${configure.cxx} ${configure.cppflags} ${configure.cxxflags} ${cxx_stdlibflags} [get_canonical_archflags cxx]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 755 -d ${destroot}${prefix}/libexec/dragonegg
<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 9a355d7..cf94b4e 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,12 +241,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 f0b48bc..8971184 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,12 +236,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 cd421aa..0ef41b1 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,12 +339,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 c35eeb6..a018870 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,12 +242,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 ef6e366..19dbcdb 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,12 +234,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 fb1e20d..654565d 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,12 +224,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 f1f960b..d2d3231 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,12 +219,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 4c45bcd..b0c800e 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;'>@@ -224,12 +224,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 fd6c81b..7d1cae4 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;'>@@ -278,12 +278,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 2b05be3..6998498 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;'>@@ -329,12 +329,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 96e4c9c..29e47b0 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;'>@@ -302,12 +302,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 6970e10..1ce7f59 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;'>@@ -304,12 +304,21 @@ variant universal {
</span> configure.args-delete --disable-multilib
}
# the generated compiler doesn't accept -arch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 81bb9ac..8399b4c 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,7 +28,11 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/jekyll/Portfile b/lang/jekyll/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e0c9df..2cea7c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/jekyll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/jekyll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@ use_configure no
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append OCAMLPARAM="safe-string=0,_"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append OCAMLPARAM=safe-string=0,_
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append OCAMLPARAM="safe-string=0,_"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append OCAMLPARAM=safe-string=0,_
</span>
destroot {
xinstall -m 0755 ${worksrcpath}/jekyll ${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 78c42f0..bd16385 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,7 +30,12 @@ use_configure no
</span> variant universal {}
build.args CC=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.destdir INSTALL_DIR=${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/libcxx/Portfile b/lang/libcxx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 12d7f2b..d990dd8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/libcxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/libcxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,6 +162,15 @@ if {${os.major} < 11 || [variant_isset replacemnt_libcxx]} {
</span> }
build.dir ${workpath}/build
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_XBS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_ProjectSourceVersion=${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "RC_CFLAGS=[get_canonical_archflags] -I${libcxxabi_worksrcpath}/include -I${libcxx_worksrcpath}/include ${configure.optflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TRIPLE=-apple-darwin${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append \
CC="${configure.cc}" \
CXX="${configure.cxx}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,6 +178,7 @@ if {${os.major} < 11 || [variant_isset replacemnt_libcxx]} {
</span> RC_ProjectSourceVersion="${version}" \
RC_CFLAGS="[get_canonical_archflags] -I${libcxxabi_worksrcpath}/include -I${libcxx_worksrcpath}/include ${configure.optflags}" \
TRIPLE="-apple-darwin${os.major}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> build.args-append \
LIBCXXABI_PATH=${libcxxabi_worksrcpath} \
LIBCXX_PATH=${libcxx_worksrcpath} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.3/Portfile b/lang/llvm-3.3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0bcd42f..0db013c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,12 +145,21 @@ if {${subport} == "llvm-${llvm_version}"} {
</span> compiler.blacklist gcc-4.0
variant universal {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL_ARCH=[get_canonical_archs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL_ARCH=[get_canonical_archs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append \
UNIVERSAL=1 \
UNIVERSAL_ARCH="[get_canonical_archs]"
destroot.env-append \
UNIVERSAL=1 \
UNIVERSAL_ARCH="[get_canonical_archs]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-extract {
# workaround a bug in Apple's shipped gcc driver-driver, patched in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/Portfile b/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 02187fd..6abd5f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,12 +182,21 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> compiler.blacklist gcc-4.0 {gcc-4.2 <= 5577} {clang < 421}
variant universal {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL_ARCH=[get_canonical_archs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL_ARCH=[get_canonical_archs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append \
UNIVERSAL=1 \
UNIVERSAL_ARCH="[get_canonical_archs]"
destroot.env-append \
UNIVERSAL=1 \
UNIVERSAL_ARCH="[get_canonical_archs]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-extract {
# workaround a bug in Apple's shipped gcc driver-driver, patched in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/Portfile b/lang/llvm-3.5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 48df96b..bee12c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,12 +121,21 @@ platform darwin {
</span> }
variant universal {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL_ARCH=[get_canonical_archs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL_ARCH=[get_canonical_archs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append \
UNIVERSAL=1 \
UNIVERSAL_ARCH="[get_canonical_archs]"
destroot.env-append \
UNIVERSAL=1 \
UNIVERSAL_ARCH="[get_canonical_archs]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-extract {
# workaround a bug in Apple's shipped gcc driver-driver, patched in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.7/Portfile b/lang/llvm-3.7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ef1f5c..286bae7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,12 +227,21 @@ platform darwin {
</span> }
variant universal {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL_ARCH=[get_canonical_archs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UNIVERSAL_ARCH=[get_canonical_archs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append \
UNIVERSAL=1 \
UNIVERSAL_ARCH="[get_canonical_archs]"
destroot.env-append \
UNIVERSAL=1 \
UNIVERSAL_ARCH="[get_canonical_archs]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-extract {
# workaround a bug in Apple's shipped gcc driver-driver, patched in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-gcc42/Portfile b/lang/llvm-gcc42/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a14e85c..43fc6d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-gcc42/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-gcc42/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,10 +145,10 @@ compiler.library_path /usr/lib
</span>
# TODO: Better use of MacPorts dependencies
build.env \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY_PATH="/usr/lib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPATH="/usr/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LANGUAGES="c,c++,objc,obj-c++" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_PATH=/usr/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPATH=/usr/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH=/bin:/usr/bin:/sbin:/usr/sbin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LANGUAGES=c,c++,objc,obj-c++ \
</span> AR_FOR_TARGET=${prefix}/bin/ar \
AS_FOR_TARGET=${prefix}/bin/as \
LD_FOR_TARGET=${prefix}/bin/ld \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mit-scheme/Portfile b/lang/mit-scheme/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b5b5176..8f36703 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mit-scheme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mit-scheme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,11 @@ build.dir ${worksrcpath}/src
</span> build.cmd etc/make-liarc.sh
build.args --prefix=${prefix}
build.target
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} "CFLAGS=${configure.cflags} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} CFLAGS="${configure.cflags} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.url https://ftp.gnu.org/gnu/${name}/stable.pkg/
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mozart/Portfile b/lang/mozart/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 500cfb0..dd2ea4d 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,7 +54,11 @@ if {[variant_isset universal]} {
</span> } else {
set archflags ${configure.cxx_archflags}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append CPU_FLAGS=${archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env-append CPU_FLAGS="${archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/ocaml/Portfile b/lang/ocaml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00609ad..a695134 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ocaml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ocaml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,11 @@ post-destroot {
</span>
# Variants.
variant profile description {Enable profiling} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "CC=gcc -pg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append CC="gcc -pg"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
livecheck.type regex
<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 92d0c9e..dad85b3 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,8 +37,11 @@ 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;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env "YACC=${prefix}/bin/bison -y"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env YACC="${prefix}/bin/bison -y"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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/pypy/Portfile b/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e610f6e..e958927 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pypy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,9 +80,15 @@ if {$subport == ${name}} {
</span> size 19741694
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cc_archflags} ${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ld_archflags} ${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env PYPY_USESSION_DIR=${workpath} PYPY_LOCALBASE=${prefix} \
CFLAGS="${configure.cc_archflags} ${configure.cppflags}" \
LDFLAGS="${configure.ld_archflags} ${configure.ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
build.dir ${worksrcpath}/pypy/goal
build.args --batch --verbose \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +97,7 @@ build.args --batch --verbose \
</span> build.target ../../rpython/bin/rpython
build.post_args targetpypystandalone
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env ${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env {*}${build.env}
</span> destroot.dir ${worksrcpath}/pypy/tool/release
destroot.args --builddir ${destroot}${prefix}/lib \
--archive-name ${subport} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby/Portfile b/lang/ruby/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index deec4fa..1d2057f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +126,11 @@ if {[variant_isset universal]} {
</span> "ac_cv_build=\"${cpu_type}-apple-darwin${os.major}\" "
}
} elseif {[info exists build_arch] && ${build_arch} ne ""} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "ARCH_FLAG=-arch ${build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append ARCH_FLAG="-arch ${build_arch}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
destroot.target install install-doc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ruby186/Portfile b/lang/ruby186/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c845bf..2761b40 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ruby186/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ruby186/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +88,11 @@ configure.args --enable-shared \
</span> --disable-ucontext
if {![variant_isset universal] && [info exists build_arch] && ${build_arch} ne ""} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "ARCH_FLAG=-arch ${build_arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append ARCH_FLAG="-arch ${build_arch}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
destroot.target install install-doc
<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 62b4b58..3539e9f 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,18 @@ configure.args dependencies
</span> configure.universal_args-delete \
--disable-dependency-tracking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINK=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC.host=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS.host=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX.host=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS.host=${configure.cxxflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINK.host=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS.host=${configure.ldflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "GYPFLAGS=-Duse_system_icu=1 -Dwerror="
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC="${configure.cc}" \
CXX="${configure.cxx}" \
LINK="${configure.cxx}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +61,7 @@ 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:#e0ffe0;'>+}
</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 b4197b4..29d311a 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,8 +22,13 @@ patchfiles patch-Makefile.diff
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CFLAGS="${configure.cflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 179dcfe..81f9b90 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,7 +21,11 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:notmuch
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CC=${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC="${configure.cc} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 2a180dd..ac077cb 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,7 +85,11 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/mail/putmail/Portfile b/mail/putmail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f337c8..621b030 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/putmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/putmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ use_configure no
</span>
build {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env PREFIX="${destroot}${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env PREFIX=${destroot}${prefix}
</span> destroot.cmd ./install.sh
destroot.destdir
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/signing-party/Portfile b/mail/signing-party/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49a5634..d7f4c58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/signing-party/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/signing-party/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,9 +50,13 @@ depends_run path:bin/gpg:gnupg2 \
</span> port:python27
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC=${configure.cc} \
CFLAGS="${configure.cflags} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
pre-build {
reinplace "s|/usr/bin/perl|${perl5.bin}|g" \
<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 aecbd3b..87ae4df 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,14 +34,26 @@ use_configure no
</span>
build.target dsdpapi
if { ![variant_isset universal] } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DSDPROOT=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MP_ARCHFLAGS=${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append \
DSDPROOT=${worksrcpath} \
MP_ARCHFLAGS="${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DSDPROOT=${worksrcpath}-${arch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "MP_ARCHFLAGS=-arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> lappend merger_build_env(${arch}) \
DSDPROOT=${worksrcpath}-${arch} \
MP_ARCHFLAGS='-arch ${arch}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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 84630ee..66e3755 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,13 +99,25 @@ 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:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "MY_METIS_LIB=-L${prefix}/lib -lmetis" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MY_METIS_INC=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append \
MY_METIS_LIB='-L${prefix}/lib -lmetis' \
MY_METIS_INC='${prefix}/include'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> pre-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "BLAS=-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LAPACK=-L${prefix}/lib ${linalglib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append \
BLAS='-L${prefix}/lib ${linalglib}' \
LAPACK='-L${prefix}/lib ${linalglib}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
license LGPL-2.1+
long_description-append ${subport}: sparse Cholesky factorization.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,9 +158,15 @@ 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:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "BLAS=-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LAPACK=-L${prefix}/lib ${linalglib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append \
BLAS='-L${prefix}/lib ${linalglib}' \
LAPACK='-L${prefix}/lib ${linalglib}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
license GPL-2+
long_description-append ${subport}: sparse LU factorization.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,9 +186,15 @@ 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:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "BLAS=-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LAPACK=-L${prefix}/lib ${linalglib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append \
BLAS='-L${prefix}/lib ${linalglib}' \
LAPACK='-L${prefix}/lib ${linalglib}'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
license GPL-2+
long_description-append ${subport}: sparse QR factorization.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,7 +271,11 @@ if {${subport} eq ${name}} {
</span> configure.universal_cxxflags
configure.cxx_archflags
pre-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append TARGET_ARCH=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append TARGET_ARCH='[get_canonical_archflags ld]'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
configure.cmd printenv
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/atlas/Portfile b/math/atlas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6756f6c..1755b49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/atlas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/atlas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -733,7 +733,7 @@ post-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append "CC=${configure.cc} CXX=${configure.cxx}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} CXX=${configure.cxx}
</span> use_parallel_build no
build.target build
build.dir ${worksrcpath}/build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/eigen3/Portfile b/math/eigen3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ce3cb8..50c0021 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/eigen3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/eigen3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ variant blas description \
</span> }
if {![variant_isset blas]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append FC="nofortran"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append FC=nofortran
</span> }
configure.env-append PKG_CONFIG_LIBDIR=${prefix}/lib/pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/hpddm/Portfile b/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b64dc3e..1c4be4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/hpddm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,21 @@ post-extract {
</span> copy ${worksrcpath}/Make.inc/Makefile.OSX ${worksrcpath}/Makefile.inc
}
pre-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPICXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPICC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPIF90=${configure.f90} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "MPIRUN=${prefix}/bin/${mpi.exec} -np" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MUMPS_INCS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_INCS=-I${prefix}/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "BLAS_LIBS=-L${prefix}/lib ${linalglib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ARPACK_LIBS=-L${prefix}/lib -larpack" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "SCALAPACK_LIBS=-L${prefix}/lib -lscalapack" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "MUMPS_LIBS=-L${prefix}/lib -lmumps_common -lsmumps -ldmumps -lcmumps -lzmumps -lpord" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "HYPRE_LIBS=-L${prefix}/lib -lHYPRE" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PYTHON_LIBS=-L${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib -lpython2.7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append \
MPICXX=${configure.cxx} \
MPICC=${configure.cc} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +69,7 @@ pre-configure {
</span> MUMPS_LIBS="-L${prefix}/lib -lmumps_common -lsmumps -ldmumps -lcmumps -lzmumps -lpord" \
HYPRE_LIBS="-L${prefix}/lib -lHYPRE" \
PYTHON_LIBS="-L${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib -lpython2.7"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
configure.cmd printenv
configure.pre_args
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/libfaiss/Portfile b/math/libfaiss/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 35d9c10..65ec732 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/libfaiss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/libfaiss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,17 @@ use_configure no
</span> pre-build {
touch ${worksrcpath}/makefile.inc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CFLAGS=-fPIC -m64 -Wall -g -O3 -msse4 -mpopcnt -fopenmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-sign-compare -std=c++11 -I/usr/include/malloc/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "LDFLAGS=-g -fPIC -fopenmp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append SHAREDEXT=dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "SHAREDFLAGS=-Wl,-F. -bundle -undefined dynamic_lookup"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append FAISSSHAREDFLAGS=-dynamiclib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append BLASCFLAGS=-DFINTEGER=int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "BLASLDFLAGS=-framework Accelerate"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC="${configure.cxx}"
build.env-append CFLAGS="-fPIC -m64 -Wall -g -O3 -msse4 -mpopcnt -fopenmp \
-Wno-sign-compare -std=c++11 -I/usr/include/malloc/"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +55,7 @@ build.env-append SHAREDFLAGS="-Wl,-F. -bundle -undefined dynamic_lookup"
</span> build.env-append FAISSSHAREDFLAGS="-dynamiclib"
build.env-append BLASCFLAGS="-DFINTEGER=int"
build.env-append BLASLDFLAGS="-framework Accelerate"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.target libfaiss.a libfaiss.dylib
destroot.target
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,8 +67,12 @@ destroot.cmd mkdir -p ${destroot}${prefix}/lib && \
</span>
variant openblas description {Use OpenBLAS instead of Apple's Accelerate framework} {
depends_lib-append port:openblas
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-delete "BLASLDFLAGS=-framework Accelerate"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-delete BLASLDFLAGS="-framework Accelerate"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append BLASLDFLAGS="${prefix}/lib/libopenblas.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append BLASLDFLAGS=${prefix}/lib/libopenblas.dylib
</span> }
default_variants +openblas
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/msieve/Portfile b/math/msieve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a999195..481e97b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/msieve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/msieve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,17 @@ post-patch {
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPATH=${compiler.cpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_PATH=${compiler.library_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACHINE_FLAGS=${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="${configure.cflags}" \
CPATH="${compiler.cpath}" \
LIBRARY_PATH="${compiler.library_path}" \
MACHINE_FLAGS="${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 755 -d ${destroot}${prefix}/include/msieve \
<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 d5f9d16..8b2e5b9 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,7 +52,11 @@ configure.fflags-append -fPIC
</span>
configure.env-append MACPORTS_PREFIX=${prefix}
pre-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MACPORTS_BLAS=${linalglib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append MACPORTS_BLAS="${linalglib}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {![variant_isset universal]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dc48bab..df4fe2e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,11 +131,19 @@ compiler.blacklist-append {*gcc-4.6}
</span>
# see https://wiki.octave.org/Building for a list of dependencies
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid depends_build-append port:coreutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append "MKDIR_P=/bin/mkdir -p"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/57850
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append "INSTALL_DATA=\${INSTALL} -m 644 -p"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> # avoid depends_build-append port:coreutils
configure.env-append MKDIR_P="/bin/mkdir -p"
# see https://trac.macports.org/ticket/57850
configure.env-append INSTALL_DATA="\${INSTALL} -m 644 -p"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if { ${os.major} > 10 } {
# avoid depends_build-append port:cctools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,7 +209,11 @@ depends_build-append port:flex
</span> configure.env-append LEX=${prefix}/bin/flex
depends_build-append port:bison
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append "YACC=${prefix}/bin/bison -y"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env-append YACC="${prefix}/bin/bison -y"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_build-append port:gperf
configure.env-append GPERF=/usr/bin/gperf
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/pdc/Portfile b/math/pdc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 866ed21..bc0f297 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,10 +23,15 @@ checksums md5 03dadb29fd517a2b23e2cb3018cf5753
</span> depends_lib port:readline port:ncurses
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ldflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CFLAGS="${configure.cppflags}" \
LDFLAGS="${configure.ldflags}" \
CC="${configure.cc}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -s -m 755 ${worksrcpath}/pdc ${destroot}${prefix}/bin/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/pyxplot/Portfile b/math/pyxplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ccf6d0..942f669 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/pyxplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/pyxplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ post-patch {
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc}
</span>
livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/sundials/Portfile b/math/sundials/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9cb4aeb..ac588da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/sundials/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/sundials/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +82,7 @@ configure.args-append \
</span> # Only Apple Clang compilers support tbd files.
# See https://trac.macports.org/ticket/53151
# See https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_SYSROOT.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append SDKROOT="/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append SDKROOT=/
</span>
variant examples description {Install Examples} {
set example_langs {C CXX F90 F77}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/sundials2/Portfile b/math/sundials2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c267a2..7fd4f39 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/sundials2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/sundials2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +82,7 @@ configure.args-append \
</span> # Only Apple Clang compilers support tbd files.
# See https://trac.macports.org/ticket/53151
# See https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_SYSROOT.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append SDKROOT="/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append SDKROOT=/
</span>
if {![mpi_variant_isset]} {
default_variants +mpich
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/svdlibc/Portfile b/math/svdlibc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 810b621..7ace47f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/svdlibc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/svdlibc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ variant universal {}
</span> configure.cflags-append -Wall -fno-common
set hosttype bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append HOSTTYPE='${hosttype}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append HOSTTYPE=${hosttype}
</span> build.target svd
build.args CC="${configure.cc} ${configure.cflags} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/taucs/Portfile b/math/taucs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d3c95a3..d60822b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/taucs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/taucs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,15 +58,21 @@ configure.post_args-append \
</span> " && printenv >> config/${os.platform}.mk"
configure.env-append PREFIX=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBMETIS="-lmetis" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBF77="-lf2c" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBC="" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBMETIS=-lmetis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBF77=-lf2c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBC= \
</span> OSTYPE=${os.platform}
pre-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBBLAS=${linalglib} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBLAPACK=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append \
LIBBLAS="${linalglib}" \
LIBLAPACK=""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/Portfile b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc651bd..eba3108 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,9 +201,13 @@ autoreconf.cmd ./bootstrap
</span> autoreconf.pre_args
autoreconf.args
depends_build-append port:libtool port:autoconf port:automake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env-append \
CXXCPP="${configure.cxx} -E"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1 -k
# gl.c:121:3: error: Platform not recognized.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/Portfile b/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 56fce1a..633d020 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,8 +192,13 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> autoreconf.args
depends_build-append port:libtool port:autoconf port:automake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append \
CXXCPP="${configure.cxx} -E"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f2ad754..8e1588f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -250,7 +250,11 @@ if {[variant_isset universal]} {
</span> lappend merger_configure_args(x86_64) --enable-x86asm
} else {
configure.args-append --arch=${configure.build_arch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append ASFLAGS=[get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append ASFLAGS='[get_canonical_archflags]'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
depends_build-append port:nasm
configure.args-append --enable-x86asm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a141d33..aa4c000 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,7 +253,11 @@ if {[variant_isset universal]} {
</span> lappend merger_configure_args(x86_64) --enable-x86asm
} else {
configure.args-append --arch=${configure.build_arch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append ASFLAGS=[get_canonical_archflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append ASFLAGS='[get_canonical_archflags]'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
depends_build-append port:nasm
configure.args-append --enable-x86asm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx/Portfile b/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e655dca..8dd11d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +82,7 @@ configure.args --enable-vp8 \
</span> --disable-examples \
--disable-unit-tests
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env LD="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env LD=${configure.cc}
</span>
# add in when docs are installed correctly
#variant docs description {Build documentation} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mlt/Portfile b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 81229dc..a351a0f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,9 +127,15 @@ if {[variant_isset universal]} {
</span> lappend merger_build_env(${arch}) {*}"LDFLAGS='${configure.ldflags} -L${worksrcpath}-${arch}/src/framework -L${prefix}/lib -arch ${arch}'"
}
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "LDFLAGS=${configure.ldflags} -L${worksrcpath}/src/framework -L${prefix}/lib [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
build.env-append CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]"
build.env-append LDFLAGS="${configure.ldflags} -L${worksrcpath}/src/framework -L${prefix}/lib [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant gtk2 description {include the gtk2 module (for additional image and text producers)} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/subtitleripper/Portfile b/multimedia/subtitleripper/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a77333..d9fa9f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/subtitleripper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/subtitleripper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,15 @@ if {${os.platform} eq "darwin" && ${os.major} >= 11} {
</span> set defines -DHAVE_GETLINE
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env DEFINES=${defines} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "INCLUDES=${configure.cppflags} -I${prefix}/include/netpbm" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} ${configure.ld_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env DEFINES="${defines}" \
INCLUDES="${configure.cppflags} -I${prefix}/include/netpbm" \
LDFLAGS="${configure.ldflags} ${configure.ld_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.args CC="${configure.cc}" \
COPT="${configure.cflags} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/vobcopy/Portfile b/multimedia/vobcopy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d771597..7405882 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/vobcopy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/vobcopy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,4 +27,8 @@ configure.args --with-lfs \
</span> variant universal {}
build.target
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/angst/Portfile b/net/angst/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8669df9..915c023 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/angst/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/angst/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,4 +30,4 @@ post-patch {
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/baresip/Portfile b/net/baresip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f375c3..aa8aa2b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/baresip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/baresip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,17 @@ destroot.args ${build.args}
</span> if {[tbool configure.ccache]} {
build.env-append CCACHE=ccache
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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;'>@@ -65,3 +75,4 @@ 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:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/bittwist/Portfile b/net/bittwist/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 640d757..03bbbd3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/bittwist/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/bittwist/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,11 @@ livecheck.regex bittwist-macosx-(.*?)${extract.suffix}
</span> configure {
reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=${configure.cflags} -D__BSD_VISIBLE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="${configure.cflags} -D__BSD_VISIBLE"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 755 -W ${worksrcpath}/src bittwist bittwistb bittwiste \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/blackbag/Portfile b/net/blackbag/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5903643..c06bd2b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/blackbag/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/blackbag/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +28,8 @@ use_configure no
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env LFLAGS="-L${prefix}/lib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IFLAGS="-I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env LFLAGS=-L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IFLAGS=-I${prefix}/include
</span>
patchfiles patch-bkb.diff
<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 e71f882..23be9d0 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,7 +31,11 @@ use_configure no
</span>
build.args -f GNUmakefile PREFIX=${prefix} \
CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CFLAGS=${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/deluge/Portfile b/net/deluge/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 05f4039..7332178 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/deluge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/deluge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +32,17 @@ depends_lib-append port:libtorrent-rasterbar \
</span> port:xdg-utils
patchfiles patch-remove-osx-native-menus.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "PYTHON_CFLAGS=-I${prefix}/include -I${prefix}/include/boost" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_LDFLAGS=-L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=-I${prefix}/include -I${prefix}/include/boost" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env PYTHON_CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
PYTHON_LDFLAGS=-L${prefix}/lib \
CFLAGS="-I${prefix}/include -I${prefix}/include/boost" \
CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant python27 description {Build for Python 2.7} {
require_active_variants libtorrent-rasterbar python27
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dnsmasq/Portfile b/net/dnsmasq/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70f2e4f..4a01114 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dnsmasq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dnsmasq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +48,13 @@ post-patch {
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CC=${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append "CC=${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC="${configure.cc} [get_canonical_archflags]"
destroot.env-append CC="${configure.cc} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.args PREFIX=${prefix}
destroot.keepdirs ${destroot}${prefix}/var/run/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/dynamips/Portfile b/net/dynamips/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 10d0f8e..9a07533 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/dynamips/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/dynamips/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,11 +34,19 @@ use_configure no
</span> patch.pre_args -p1
build.pre_args-append PREFIX=${prefix} CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CFLAGS=${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CFLAGS="${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> use_parallel_build no
destroot.pre_args-append PREFIX=${prefix} CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append CFLAGS=${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> destroot.env-append CFLAGS="${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${build_arch} eq "x86_64"} {
set dynamips_arch amd64
<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 b6c8901..756b614 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,9 +18,15 @@ checksums md5 3788e294fbcf146495983a7dd6578ea3 \
</span> rmd160 58de08f399a04b20eef4f810077c37d6566f72b9
variant universal {}
build.type bsd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cppflags} ${configure.cflags} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span> build.args -DMK_OPENSSL
worksrcdir ${name}
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gkrellm_snmp/Portfile b/net/gkrellm_snmp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4973675..b6ed381 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gkrellm_snmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gkrellm_snmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,9 @@ depends_lib port:gkrellm
</span> use_configure no
build.type gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CPPFLAGS="-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:#e0ffe0;'>+build.env CPPFLAGS=-L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-L${prefix}/lib
</span>
build.target osx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gkwebmon/Portfile b/net/gkwebmon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bfeef84..b2364a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gkwebmon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gkwebmon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,9 @@ use_configure no
</span> build.target ""
build.type gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CPPFLAGS="-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:#e0ffe0;'>+build.env CPPFLAGS=-L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-L${prefix}/lib
</span>
set plugin_dir ${prefix}/libexec/gkrellm2/plugins
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gpsd/Portfile b/net/gpsd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79503d8..b4b26cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gpsd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gpsd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,11 +141,19 @@ build.args prefix=${prefix} \
</span> strip=no \
dbus_export=no \
xgps=no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CC=${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXX=${configure.cxx} [get_canonical_archflags cxx] ${cxx_stdlibflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.cxxflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC="${configure.cc} [get_canonical_archflags cc]" \
CFLAGS="${configure.cflags}" \
CXX="${configure.cxx} [get_canonical_archflags cxx] ${cxx_stdlibflags}" \
CXXFLAGS="${configure.cxxflags}" \
LDFLAGS="${configure.ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# Allow the regression tests to be run via "port test gpsd".
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/honeyd/Portfile b/net/honeyd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ba075b..7cfc4fc 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,9 +36,15 @@ post-patch {
</span> }
configure.args --with-python
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PATH_PYTHON=${prefix}/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EVENTINC=-I${prefix}/include/libevent1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "EVENTLIB=-L${prefix}/lib/libevent1 -levent"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 7779e2b..c28db6a 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,9 +18,15 @@ checksums md5 93032be6c3d61a5629deab5e5660801e \
</span> rmd160 27190ff9b524992e7eb8f0e96f79c3153d92d1eb
variant universal {}
build.type bsd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cppflags} ${configure.cflags} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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/libre/Portfile b/net/libre/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e3cd1aa..2ff46ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/libre/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/libre/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,17 @@ destroot.args ${build.args}
</span> if {[tbool configure.ccache]} {
build.env-append CCACHE=ccache
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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,6 +59,7 @@ 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:#e0ffe0;'>+}
</span>
post-destroot {
system "install_name_tool -id ${prefix}/lib/libre.dylib ${destroot}${prefix}/lib/libre.dylib"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/librem/Portfile b/net/librem/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a9cd443..4991f15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/librem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/librem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,17 @@ destroot.args ${build.args}
</span> if {[tbool configure.ccache]} {
build.env-append CCACHE=ccache
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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,6 +59,7 @@ 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:#e0ffe0;'>+}
</span>
post-destroot {
system "install_name_tool -id ${prefix}/lib/librem.dylib ${destroot}${prefix}/lib/librem.dylib"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libtorrent-rasterbar/Portfile b/net/libtorrent-rasterbar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 901993d..5a0f728 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/libtorrent-rasterbar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/libtorrent-rasterbar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,8 +58,8 @@ variant python27 description {Build bindings for Python 2.7} {
</span> depends_lib-append port:python27
configure.python ${prefix}/bin/python2.7
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "PYTHON_INSTALL_PARAMS=--prefix=${destroot}${frameworks_dir}/Python.framework/Versions/2.7" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_EXTRA_LIBS=' '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_INSTALL_PARAMS=--prefix=${destroot}${frameworks_dir}/Python.framework/Versions/2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_EXTRA_LIBS=
</span> }
variant error_logging description {Enable logging of errors to disk} {
<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 454529e..e8dd54ca 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,8 +18,12 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env "LIBS=-L${prefix}/lib -lX11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env LIBS="-L${prefix}/lib -lX11"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append "-L${prefix}/lib -bind_at_load"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -L${prefix}/lib -bind_at_load
</span>
configure.args --without-gtkspell --without-xmms --without-gtkhtml \
--without-librsvg --mandir=${prefix}/share/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/ncid/Portfile b/net/ncid/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cca8ac4..392a7b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/ncid/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/ncid/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,8 +65,11 @@ if {[variant_isset universal]} {
</span> } else {
set archflags ${configure.cc_archflags}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} ${archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc} ${archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.type sourceforge
livecheck.regex /${name}-(\[0-9.\]+)-src${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/newsboat/Portfile b/net/newsboat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index daca4ae..a59c550 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/newsboat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/newsboat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -425,8 +425,13 @@ variant universal {}
</span> build.args-append prefix=${prefix} \
CXX=${configure.cxx}
build.target-append doc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.args-append \
prefix=${prefix}
<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 9b551a5..3f97ccb 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,7 +45,12 @@ 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;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/pwlib/Portfile b/net/pwlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7baf823..48a31d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/pwlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/pwlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,11 +39,11 @@ post-patch {
</span>
configure.args --mandir=${prefix}/share/man
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PWLIBDIR="${worksrcpath}" \
</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;'>- CPPFLAGS="-I${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD_LIBRARY_PATH="${worksrcpath}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PWLIBDIR=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-L${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_LIBRARY_PATH=${worksrcpath}/lib
</span>
build.target both
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/restund/Portfile b/net/restund/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a089d6..e4055ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/restund/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/restund/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,17 @@ destroot.args ${build.args}
</span> if {[tbool configure.ccache]} {
build.env-append CCACHE=ccache
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> if {[variant_isset universal]} {
foreach arch ${configure.universal_archs} {
lappend merger_build_env(${arch}) CC='${configure.cc} -arch ${arch}'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +64,7 @@ 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:#e0ffe0;'>+}
</span>
post-destroot {
reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/etc/restund.conf
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/snort/Portfile b/net/snort/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da2b2f3..887f301 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/snort/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/snort/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +141,7 @@ variant mysql51 \
</span> configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql51/bin/mysql_config
configure.args-append --with-mysql-includes=${prefix}/include/mysql51/mysql \
--with-mysql-libraries=${prefix}/lib/mysql51/mysql
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS="-L${prefix}/lib/mysql51/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env CFLAGS=-L${prefix}/lib/mysql51/mysql
</span> }
variant mysql55 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +152,7 @@ variant mysql55 \
</span> configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql55/bin/mysql_config
configure.args-append --with-mysql-includes=${prefix}/include/mysql55/mysql \
--with-mysql-libraries=${prefix}/lib/mysql55/mysql
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS="-L${prefix}/lib/mysql55/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env CFLAGS=-L${prefix}/lib/mysql55/mysql
</span> }
variant mysql56 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,7 +163,7 @@ variant mysql56 \
</span> configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql56/bin/mysql_config
configure.args-append --with-mysql-includes=${prefix}/include/mysql56/mysql \
--with-mysql-libraries=${prefix}/lib/mysql56/mysql
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS="-L${prefix}/lib/mysql56/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env CFLAGS=-L${prefix}/lib/mysql56/mysql
</span> }
variant mysql57 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,7 +174,7 @@ variant mysql57 \
</span> configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql57/bin/mysql_config
configure.args-append --with-mysql-includes=${prefix}/include/mysql57/mysql \
--with-mysql-libraries=${prefix}/lib/mysql57/mysql
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS="-L${prefix}/lib/mysql57/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env CFLAGS=-L${prefix}/lib/mysql57/mysql
</span> }
variant mariadb \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,7 +185,7 @@ variant mariadb \
</span> configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb/bin/mysql_config
configure.args-append --with-mysql-includes=${prefix}/include/mariadb/mysql \
--with-mysql-libraries=${prefix}/lib/mariadb/mysql
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS="-L${prefix}/lib/mariadb/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env CFLAGS=-L${prefix}/lib/mariadb/mysql
</span> }
variant percona \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,7 +195,7 @@ variant percona \
</span> configure.env-append MYSQL_CONFIG=${prefix}/lib/percona/bin/mysql_config
configure.args-append --with-mysql-includes=${prefix}/include/percona/mysql \
--with-mysql-libraries=${prefix}/lib/percona/mysql
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFLAGS="-L${prefix}/lib/percona/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env CFLAGS=-L${prefix}/lib/percona/mysql
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/whois/Portfile b/net/whois/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3538a21..dc2bfdb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/whois/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/whois/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,11 +74,19 @@ post-configure {
</span> variant universal {}
build.target-append pos
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG_FILE=${prefix}/etc/whois.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_LIBIDN2=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_ICONV=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOCALEDIR=${prefix}/share/locale
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc} [get_canonical_archflags]" \
CONFIG_FILE=${prefix}/etc/whois.conf \
HAVE_LIBIDN2=1 \
HAVE_ICONV=1 \
LOCALEDIR=${prefix}/share/locale
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.args prefix=${prefix} \
INCLUDES="${configure.cflags} ${configure.cppflags}" \
LIBS="${configure.ldflags}" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/camlimages/Portfile b/ocaml/camlimages/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e992123..3da431f 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;'>@@ -49,8 +49,13 @@ 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;'>- destroot.env OCAMLFIND_DESTDIR="${ocaml_destdir}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env OCAMLFIND_DESTDIR=${ocaml_destdir} \
</span> OCAMLFIND_LDCONF=ignore
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant lablgtk2 {
<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 5410a9d..0998726 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,7 +36,11 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env "OCAMLFIND_INSTFLAGS=-destdir $ocamlfind_destdir -ldconf ignore" OCAMLFIND_STUBLIBS=${ocamlfind_destdir}/stublibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> destroot.env OCAMLFIND_INSTFLAGS="-destdir $ocamlfind_destdir -ldconf ignore" OCAMLFIND_STUBLIBS=${ocamlfind_destdir}/stublibs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> destroot.target ocamlfind-install
pre-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/zathura-plugin-cb/Portfile b/office/zathura-plugin-cb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 445aafc..d5cf9c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/zathura-plugin-cb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/zathura-plugin-cb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,12 +42,21 @@ compiler.blacklist *gcc* {clang < 300}
</span> variant universal {}
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[get_canonical_archflags ld] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERBOSE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CXX=${configure.cxx} \
CPP=${configure.cpp} \
CFLAGS="[get_canonical_archflags cc]" \
LDFLAGS="[get_canonical_archflags ld]" \
VERBOSE=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env {*}${build.env}
destroot.args {*}${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/zathura-plugin-djvu/Portfile b/office/zathura-plugin-djvu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9264fcb..8156116 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/zathura-plugin-djvu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/zathura-plugin-djvu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,12 +42,21 @@ compiler.blacklist *gcc* {clang < 300}
</span> variant universal {}
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[get_canonical_archflags ld] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERBOSE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CXX=${configure.cxx} \
CPP=${configure.cpp} \
CFLAGS="[get_canonical_archflags cc]" \
LDFLAGS="[get_canonical_archflags ld]" \
VERBOSE=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env {*}${build.env}
destroot.args {*}${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/zathura-plugin-pdf-mupdf/Portfile b/office/zathura-plugin-pdf-mupdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f73aac..7d61672 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/zathura-plugin-pdf-mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/zathura-plugin-pdf-mupdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,12 +42,21 @@ use_configure no
</span> variant universal {}
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[get_canonical_archflags ld] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERBOSE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CXX=${configure.cxx} \
CPP=${configure.cpp} \
CFLAGS="[get_canonical_archflags cc]" \
LDFLAGS="[get_canonical_archflags ld]" \
VERBOSE=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env {*}${build.env}
destroot.args {*}${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/zathura-plugin-pdf-poppler/Portfile b/office/zathura-plugin-pdf-poppler/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e347c99..21db445 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/zathura-plugin-pdf-poppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/zathura-plugin-pdf-poppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,12 +45,21 @@ compiler.blacklist *gcc* {clang < 300}
</span> variant universal {}
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[get_canonical_archflags ld] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERBOSE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CXX=${configure.cxx} \
CPP=${configure.cpp} \
CFLAGS="[get_canonical_archflags cc]" \
LDFLAGS="[get_canonical_archflags ld]" \
VERBOSE=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env {*}${build.env}
destroot.args {*}${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/zathura-plugin-ps/Portfile b/office/zathura-plugin-ps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74cad05..9a15413 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/zathura-plugin-ps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/zathura-plugin-ps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,12 +41,21 @@ compiler.blacklist *gcc* {clang < 300}
</span> variant universal {}
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[get_canonical_archflags ld] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERBOSE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CXX=${configure.cxx} \
CPP=${configure.cpp} \
CFLAGS="[get_canonical_archflags cc]" \
LDFLAGS="[get_canonical_archflags ld]" \
VERBOSE=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env {*}${build.env}
destroot.args {*}${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/zathura/Portfile b/office/zathura/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fad55ed..e690c85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/zathura/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/zathura/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,12 +46,21 @@ compiler.blacklist *gcc* {clang < 300}
</span> variant universal {}
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[get_canonical_archflags ld] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERBOSE=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CXX=${configure.cxx} \
CPP=${configure.cpp} \
CFLAGS="[get_canonical_archflags cc]" \
LDFLAGS="[get_canonical_archflags ld]" \
VERBOSE=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env {*}${build.env}
destroot.args {*}${build.args}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-alien-sdl/Portfile b/perl/p5-alien-sdl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71fe29b..7a9be9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-alien-sdl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-alien-sdl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,8 +37,8 @@ if {${perl5.major} != ""} {
</span>
patchfiles patch-Build.PL.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append SDL_INC='${prefix}/include' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL_LIB='${prefix}/lib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append SDL_INC=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDL_LIB=${prefix}/lib
</span>
supported_archs noarch
perl5.use_module_build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-appconfig-std/Portfile b/perl/p5-appconfig-std/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3b2b9de..7228233 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-appconfig-std/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-appconfig-std/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +22,6 @@ if {${perl5.major} != ""} {
</span> depends_lib-append \
port:p${perl5.major}-appconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env C_INCLUDE_PATH="${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY_PATH="${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env C_INCLUDE_PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_PATH=${prefix}/lib
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-astro-fits-cfitsio/Portfile b/perl/p5-astro-fits-cfitsio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58a4fda..a2c2821 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-astro-fits-cfitsio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-astro-fits-cfitsio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,9 @@ checksums rmd160 5bd4c4c81fa3b03307c47e7aefc9145fdc6dff05 \
</span> size 355127
if {${perl5.major} != ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CFITSIO="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env CFITSIO=${prefix}
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTIMIZE="-O"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTIMIZE=-O
</span>
depends_lib-append \
port:cfitsio
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-crypt-ssleay/Portfile b/perl/p5-crypt-ssleay/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fe1c82e..d989372 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-crypt-ssleay/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-crypt-ssleay/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,8 +27,8 @@ if {${perl5.major} != ""} {
</span>
patchfiles patch-default-inc-excludes-dot.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env C_INCLUDE_PATH="${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY_PATH="${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env C_INCLUDE_PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_PATH=${prefix}/lib
</span>
configure.args-append \
"--lib=${prefix}"
<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 ccca3db..2afb8c8 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;'>@@ -29,42 +29,71 @@ if {${perl5.major} ne ""} {
</span>
variant postgresql92 conflicts postgresql93 postgresql94 postgresql95 postgresql96 description {build with postgresql92 port} {
depends_lib-append port:postgresql92
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=${prefix}/lib/postgresql92/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POSTGRES_INCLUDE=${prefix}/include/postgresql92 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_LIB=${prefix}/lib/postgresql92 -lssl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env PATH=${prefix}/lib/postgresql92/bin:$env(PATH) \
POSTGRES_INCLUDE="${prefix}/include/postgresql92" \
POSTGRES_LIB="${prefix}/lib/postgresql92 -lssl"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant postgresql93 conflicts postgresql92 postgresql94 postgresql95 postgresql96 description {build with postgresql93 port} {
depends_lib-append port:postgresql93
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=${prefix}/lib/postgresql93/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POSTGRES_INCLUDE=${prefix}/include/postgresql93 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_LIB=${prefix}/lib/postgresql93 -lssl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env PATH=${prefix}/lib/postgresql93/bin:$env(PATH) \
POSTGRES_INCLUDE="${prefix}/include/postgresql93" \
POSTGRES_LIB="${prefix}/lib/postgresql93 -lssl"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant postgresql94 conflicts postgresql92 postgresql93 postgresql95 postgresql96 description {build with postgresql94 port} {
depends_lib-append port:postgresql94
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=${prefix}/lib/postgresql94/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POSTGRES_INCLUDE=${prefix}/include/postgresql94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_LIB=${prefix}/lib/postgresql94 -lssl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span> }
variant postgresql95 conflicts postgresql92 postgresql93 postgresql94 postgresql96 description {build with postgresql95 port} {
depends_lib-append port:postgresql95
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=${prefix}/lib/postgresql95/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POSTGRES_INCLUDE=${prefix}/include/postgresql95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_LIB=${prefix}/lib/postgresql95 -lssl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span> }
variant postgresql96 conflicts postgresql92 postgresql93 postgresql94 postgresql95 description {build with postgresql96 port} {
depends_lib-append port:postgresql96
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=${prefix}/lib/postgresql96/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POSTGRES_INCLUDE=${prefix}/include/postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_LIB=${prefix}/lib/postgresql96 -lssl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span> }
# Default to latest release
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-inline-python/Portfile b/perl/p5-inline-python/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d26b074..89fdc73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-inline-python/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-inline-python/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,5 +38,5 @@ if {${perl5.major} != ""} {
</span> port:p${perl5.major}-inline
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- INLINE_PYTHON_EXECUTABLE="${prefix}/bin/python2.7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INLINE_PYTHON_EXECUTABLE=${prefix}/bin/python2.7
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-mogilefs-server/Portfile b/perl/p5-mogilefs-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c6f06e7..7343a84 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-mogilefs-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-mogilefs-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ depends_lib-append \
</span> }
# add perl5.bindir to PATH so mogadm can be found
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.env-append PATH="$env(PATH):${perl5.bindir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env-append PATH=$env(PATH):${perl5.bindir}
</span>
# test configuration for MySQL, see TESTING for others
test.args-append MOGTEST_DBUSER=test \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-net-curl/Portfile b/perl/p5-net-curl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49f192b..6fbef7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-net-curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-net-curl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,5 +27,5 @@ if {${perl5.major} != ""} {
</span> }
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CURL_CONFIG="${prefix}/bin/curl-config"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CURL_CONFIG=${prefix}/bin/curl-config
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-pdl-graphics-plplot/Portfile b/perl/p5-pdl-graphics-plplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a9fb99..98c74c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-pdl-graphics-plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-pdl-graphics-plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,6 @@ if {${perl5.major} != ""} {
</span> patchfiles patch-Makefile.PL.diff
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "PLPLOT_LIBDIR=${prefix}/lib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "PLPLOT_INCDIR=${prefix}/include/plplot"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PLPLOT_LIBDIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PLPLOT_INCDIR=${prefix}/include/plplot
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-term-gnuplot/Portfile b/perl/p5-term-gnuplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b6de42f..b17ac69 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-term-gnuplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-term-gnuplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +28,8 @@ if {${perl5.major} != ""} {
</span> port:gd2 \
port:xorg-libX11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env C_INCLUDE_PATH="${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY_PATH="${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env C_INCLUDE_PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_PATH=${prefix}/lib
</span>
patchfiles patch-gnuterm-Makefile.PL.diff \
patch-doc.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/epstool/Portfile b/print/epstool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ac0dcbd..b83344c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/epstool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/epstool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,8 +35,13 @@ if {[variant_isset universal]} {
</span> lappend cflags ${configure.cc_archflags}
lappend ldflags ${configure.ld_archflags}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CFLAGS=[join ${cflags} " "] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[join ${ldflags} " "]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="[join ${cflags} " "]" \
LDFLAGS="[join ${ldflags} " "]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.args-append CC=${configure.cc} \
CXX=${configure.cxx} \
CPP=${configure.cpp}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cartopy/Portfile b/python/py-cartopy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74e4e35..d484675 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cartopy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cartopy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +63,9 @@ if {${name} ne ${subport}} {
</span> # Allows setup.py to identify proj4 non-standard location and build flags
# https://trac.macports.org/ticket/56150
set proj4_prefix ${prefix}/lib/proj49
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PATH="${proj4_prefix}/bin:$env(PATH)" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CONFIG_PATH="${proj4_prefix}/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PATH="${proj4_prefix}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PATH=${proj4_prefix}/bin:$env(PATH) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CONFIG_PATH=${proj4_prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PATH=${proj4_prefix}/bin:$env(PATH)
</span>
# Adding documentation
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-clnum/Portfile b/python/py-clnum/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d1def9..e6bc0d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-clnum/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-clnum/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,11 @@ python.versions 26
</span> if {${subport} ne ${name}} {
depends_lib-append port:cln
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env CPPFLAGS=${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env CPPFLAGS="${configure.cppflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-destroot {
set docdir ${destroot}${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cvxopt/Portfile b/python/py-cvxopt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef1beb0..fefa43d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cvxopt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cvxopt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,8 @@ if {${subport} ne ${name}} {
</span> patchfiles patch-setup.py.diff
build.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CVXOPT_BLAS_LIB_DIR="${prefix}/lib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CVXOPT_LAPACK_LIB=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_BLAS_LIB_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CVXOPT_LAPACK_LIB=
</span>
pre-build {
set blas_lib {}
<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 1f70ee1..17cf950 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,11 +39,19 @@ if {${subport} ne ${name}} {
</span> port:boost
pre-build {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CXXFLAGS=${configure.cxxflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CXXFLAGS="${configure.cxxflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
pre-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append CXXFLAGS=${configure.cxxflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> destroot.env-append CXXFLAGS="${configure.cxxflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-fetch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gd/Portfile b/python/py-gd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a166f2..386b4c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ if {${name} ne ${subport}} {
</span> reinplace "s|PREFIX|${prefix}|g" ${worksrcpath}/setup.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env LDFLAGS="-L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env LDFLAGS=-L${prefix}/lib
</span>
post-destroot {
xinstall -m 644 -W ${worksrcpath} README LICENSE gd-ref.html \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gobject/Portfile b/python/py-gobject/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index def3487..9159521 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gobject/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gobject/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ if {$subport ne $name} {
</span>
use_configure yes
configure.python ${python.bin}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PKG_CONFIG_PATH='${python.prefix}/lib/pkgconfig'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig
</span> configure.pre_args --prefix='${python.prefix}'
configure.args-append --disable-glibtest \
--enable-introspection=no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graph-tool/Portfile b/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1779345..51a1e44 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,21 +85,37 @@ if {${name} ne ${subport}} {
</span>
# PYTHON_EXTRA_LDFLAGS is set to work around incorrect detection of
# link flags by configure
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON=${python.bin} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_VERSION=${python.branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_CPPFLAGS=-I${python.include} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PYTHON_LDFLAGS=-L${python.libdir}/.. -lpython${python.branch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PYTHON_EXTRA_LDFLAGS=-L${python.libdir}/.. -lpython${python.branch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append PYTHON=${python.bin} \
PYTHON_VERSION=${python.branch} \
PYTHON_CPPFLAGS=-I${python.include} \
PYTHON_LDFLAGS="-L${python.libdir}/.. -lpython${python.branch}" \
PYTHON_EXTRA_LDFLAGS="-L${python.libdir}/.. -lpython${python.branch}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> # With python2.7 PYTHON_EXTRA_LIBS is determined to be
# '-u _PyMac_Error Python.framework/Versions/2.7/Python'. Not clear whether
# python2.7 or py-graph-tool's configure script is to blame, but we can easily
# work around this:
if {${python.version} eq "27"} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "PYTHON_EXTRA_LIBS=-u _PyMac_Error"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append PYTHON_EXTRA_LIBS="-u _PyMac_Error"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# Something similar is happening with python3.6
if {${python.version} eq "36"} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "PYTHON_EXTRA_LIBS=-Wl,-stack_size,1000000 -framework CoreFoundation ${python.lib}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append PYTHON_EXTRA_LIBS="-Wl,-stack_size,1000000 -framework CoreFoundation ${python.lib}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
configure.cppflags-append -I${prefix}/include -I${python.include}/..
configure.ldflags-append -L${prefix}/lib
<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 3305e21..1aacda3 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,5 +28,9 @@ python.versions 27
</span>
if {${name} ne ${subport}} {
depends_lib-append port:py${python.version}-numpy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env "CCFLAGS=-I${prefix}/include -L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env CCFLAGS="-I${prefix}/include -L${prefix}/lib"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-llvmmath/Portfile b/python/py-llvmmath/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2982d5b..79b84c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-llvmmath/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-llvmmath/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,9 +43,9 @@ if {${name} ne ${subport}} {
</span> reinplace "s|@clang@|${prefix}/bin/clang-mp-3.3|g" ${worksrcpath}/llvmmath/build.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CC="${configure.cc}" CXX="${configure.cxx}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CC=${configure.cc} CXX=${configure.cxx}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CC="${configure.cc}" CXX="${configure.cxx}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append CC=${configure.cc} CXX=${configure.cxx}
</span>
livecheck.type none
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib-basemap/Portfile b/python/py-matplotlib-basemap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25e9198..da054d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib-basemap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib-basemap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +21,8 @@ checksums rmd160 1bc84b761419c3dba4e128edf7e053c407d9d12f \
</span>
python.versions 27 34 35 36 37
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append GEOS_DIR="${prefix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append GEOS_DIR="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append GEOS_DIR=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append GEOS_DIR=${prefix}
</span>
universal_variant no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-matplotlib/Portfile b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 45048d1..5de458a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-matplotlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@ if {${name} ne ${subport}} {
</span> port:py27-subprocess32
}
<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:#e0ffe0;'>+ build.env PKG_CONFIG_PATH=${python.prefix}/lib/pkgconfig
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/setup.cfg
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-networkit/Portfile b/python/py-networkit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0adcbe8..5f35441 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-networkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-networkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +55,19 @@ if {${name} ne ${subport}} {
</span> reinplace "s|installExternalPythonPackages|#installExternalPythonPackages|" ${worksrcpath}/setup.py
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.cxx_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.cxx_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CC="${configure.cc}" \
CXX="${configure.cxx}" \
CFLAGS="${configure.cc_archflags}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +79,7 @@ if {${name} ne ${subport}} {
</span> CFLAGS="${configure.cc_archflags}" \
CXXFLAGS="${configure.cxx_archflags}" \
CPPFLAGS="${configure.cppflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numba/Portfile b/python/py-numba/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c22adbe..e3f2466 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numba/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numba/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ checksums rmd160 dba2d23b3a9fcf2d9e996da26c99e4e28414432b \
</span>
variant tbb description "Add support for TBB" {
depends_lib-append port:tbb
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append TBBROOT="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append TBBROOT=${prefix}
</span> }
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/Portfile b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3528505..1cbb1b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ if {${name} ne ${subport}} {
</span> patch-fcompiler_g95.diff
# patch-numpy_distutils_fcompiler_gnu.py.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compilers.setup require_fortran -clang -gcc44 -gcc45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compilers.setup -clang -gcc44 -gcc45 \
</span> -gcc46 -gcc47 -gcc48 -g95 clang37
depends_lib-append port:fftw-3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,11 +64,19 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-cython
pre-build {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append ARCHFLAGS=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append ARCHFLAGS="[get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
pre-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append ARCHFLAGS=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> destroot.env-append ARCHFLAGS="[get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant atlas conflicts openblas description "Use MacPorts ATLAS Libraries" {
<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 bcb6883..d792e10 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,9 +45,15 @@ if {${name} ne ${subport}} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env "CPPFLAGS=-I${prefix}/include -L${prefix}/lib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span>
post-destroot {
set docdir ${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pgsql/Portfile b/python/py-pgsql/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 926c027..9bfb839 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pgsql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pgsql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,25 +39,25 @@ if {${name} ne ${subport}} {
</span>
variant postgresql82 conflicts postgresql83 postgresql84 postgresql90 description {Use with PostgreSQL 8.2} {
depends_lib-append port:postgresql82
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env PATH="${prefix}/lib/postgresql82/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env PATH=${prefix}/lib/postgresql82/bin:$env(PATH)
</span> destroot.env [option build.env]
}
variant postgresql83 conflicts postgresql82 postgresql84 postgresql90 description {Use with PostgreSQL 8.3} {
depends_lib-append port:postgresql83
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env PATH="${prefix}/lib/postgresql83/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env PATH=${prefix}/lib/postgresql83/bin:$env(PATH)
</span> destroot.env [option build.env]
}
variant postgresql84 conflicts postgresql82 postgresql83 postgresql90 description {Use with PostgreSQL 8.4} {
depends_lib-append port:postgresql84
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env PATH="${prefix}/lib/postgresql84/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env PATH=${prefix}/lib/postgresql84/bin:$env(PATH)
</span> destroot.env [option build.env]
}
variant postgresql90 conflicts postgresql82 postgresql83 postgresql84 description {Use with PostgreSQL 9.0} {
depends_lib-append port:postgresql90
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env PATH="${prefix}/lib/postgresql90/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env PATH=${prefix}/lib/postgresql90/bin:$env(PATH)
</span> destroot.env [option build.env]
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-processing/Portfile b/python/py-processing/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ddc87d..c38421e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-processing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-processing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ if {${name} ne ${subport}} {
</span>
test.run yes
test.cmd ${python.bin} -m processing.tests
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.env "PYTHONPATH=build/lib.macosx-10.3-${os.arch}-${python.branch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env PYTHONPATH=build/lib.macosx-10.3-${os.arch}-${python.branch}
</span>
livecheck.type none
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pygpgme/Portfile b/python/py-pygpgme/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff6de20..8e54cbb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pygpgme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pygpgme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ checksums md5 d38355af73f0352cde3d410b25f34fd0 \
</span> if {${name} ne ${subport}} {
depends_lib-append port:gpgme
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CPPFLAGS="-I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CPPFLAGS=-I${prefix}/include
</span> }
livecheck.type regex
<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 dcd35c2..6c5266f 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,22 @@ 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;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CFLAGS=${configure.universal_cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCFLAGS=${configure.universal_cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.universal_cxxflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=-undefined dynamic_lookup -bundle ${configure.universal_ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCFLAGS=${configure.objc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.cxx_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFLAGS=${configure.f77_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F90FLAGS=${configure.f90_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FCFLAGS=${configure.fc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=-undefined dynamic_lookup -bundle ${configure.ld_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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,6 +74,7 @@ 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:#e0ffe0;'>+ }
</span>
livecheck.type none
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pynacl/Portfile b/python/py-pynacl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a8a185d..ade7a0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pynacl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pynacl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +42,9 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-six \
port:libsodium
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append SODIUM_INSTALL="system"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append SODIUM_INSTALL=system
</span> destroot.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SODIUM_INSTALL="system"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SODIUM_INSTALL=system
</span>
livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pynds/Portfile b/python/py-pynds/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c1143f3..5be0545 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pynds/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pynds/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,8 +63,8 @@ if {${name} ne ${subport}} {
</span> reinplace "s/boost_python/boost_python-mt/" ${worksrcpath}/setup.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env PYTHON_CFLAGS="-I${prefix}/include/boost" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="-I${prefix}/include/boost"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env PYTHON_CFLAGS=-I${prefix}/include/boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-I${prefix}/include/boost
</span>
}
<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 96086ea..8b4b241 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,7 +26,11 @@ if {${name} ne ${subport}} {
</span> port:nifticlib \
port:swig-python
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env "CCFLAGS=-I${prefix}/include -L${prefix}/lib -I${prefix}/include/nifti"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env CCFLAGS="-I${prefix}/include -L${prefix}/lib -I${prefix}/include/nifti"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
distname pynifti_${version}
worksrcdir pynifti-${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt4/Portfile b/python/py-pyqt4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0197f8f..1e3fbf8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +93,7 @@ if {${name} ne ${subport}} {
</span> pre-configure {
# allow ccache, if specified by the user
if {[tbool configure.ccache]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append "CCACHE=ccache"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append CCACHE=ccache
</span> }
foreach arch [get_canonical_archs] {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pysam/Portfile b/python/py-pysam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f723c1..34e2fdf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pysam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pysam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,4 +46,4 @@ if {${name} ne ${subport}} {
</span> livecheck.regex pysam-(\\d+(\\.\\d+)+)${extract.suffix}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env HTSLIB_MODE="shared"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env HTSLIB_MODE=shared
</span><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 93c4cbd..4e16fc4 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,6 +48,15 @@ if {${name} ne ${subport}} {
</span> build.args
# why only archflags?
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCFLAGS=${configure.objc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.cxx_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFLAGS=${configure.f77_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F90FLAGS=${configure.f90_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FCFLAGS=${configure.fc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=-undefined dynamic_lookup -bundle ${configure.ld_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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;'>@@ -55,6 +64,7 @@ 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:#e0ffe0;'>+ }
</span>
livecheck.type none
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-requests-unixsocket/Portfile b/python/py-requests-unixsocket/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd68604..4d3022d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-requests-unixsocket/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-requests-unixsocket/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +30,8 @@ if {${name} ne ${subport}} {
</span>
patchfiles patch-requirements.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PBR_VERSION="${version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append PBR_VERSION="${version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PBR_VERSION=${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PBR_VERSION=${version}
</span>
livecheck.type none
}
<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 a76ce26..a4b879b 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,9 +28,13 @@ 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;'>- build.env CPPFLAGS="-I${python.include} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${worksrcpath}/Include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env "CPPFLAGS=-I${python.include} -I${worksrcpath}/Include" \
</span> NETCDF_PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env CPPFLAGS="-I${python.include} -I${worksrcpath}/Include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NETCDF_PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
platform macosx {
post-extract {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/Portfile b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c4c719..c018e74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,9 +39,13 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-pytest
worksrcdir ${distname}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CCFLAGS=-I${prefix}/include -L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CCFLAGS=-I${prefix}/include -L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> configure.fflags-append -fno-second-underscore
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +54,18 @@ if {${name} ne ${subport}} {
</span> build.cmd-append ${fc_options} ${config_options}
destroot.cmd-append ${fc_options} ${config_options}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.cxx_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS=${configure.cxx_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CC="${configure.cc}" \
CXX="${configure.cxx}" \
CFLAGS="${configure.cc_archflags}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +76,7 @@ if {${name} ne ${subport}} {
</span> CFLAGS="${configure.cc_archflags}" \
CXXFLAGS="${configure.cxx_archflags}" \
CPPFLAGS="${configure.cppflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow/Portfile b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 603d42f..c5b228a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@ if {${name} ne ${subport}} {
</span> build.env-append TMPDIR=${workpath}/tmp
build.env-append JAVA_HOME=${java.home}
if {![variant_isset native]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append CC_OPT_FLAGS="-march=ivybridge"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append CC_OPT_FLAGS=-march=ivybridge
</span> }
# Disable Xcode detection on older OSes, as we want the
# MP provided commandline utilities to be used instead.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py26-wbxml/Portfile b/python/py26-wbxml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d67c536..c54a4bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py26-wbxml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py26-wbxml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_build port:py26-pyrex \
</span> depends_lib port:wbxml2
set python.prefix "${frameworks_dir}/Python.framework/Versions/2.6"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PATH="${python.prefix}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env PATH="${python.prefix}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PATH=${python.prefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env PATH=${python.prefix}/bin:$env(PATH)
</span>
destroot.args-append wbxmlbindingsdir=${python.prefix}/lib/python2.6
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ruby/rb-flexmock/Portfile b/ruby/rb-flexmock/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e5f73ec..4ca3afe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ruby/rb-flexmock/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ruby/rb-flexmock/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,6 +23,6 @@ use_configure no
</span> pre-destroot { file mkdir ${destroot}/${ruby.lib}/flexmock/rails }
destroot.args ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env DESTDIR="${destroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env DESTDIR=${destroot}
</span>
depends_lib port:ruby
<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 608ed82..455d5d5 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,9 +24,15 @@ 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:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_LIB=${prefix}/lib/postgresql83 -L${prefix}/lib -lssl -lcrypto" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_INCLUDE=${prefix}/include/postgresql83 -I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span> }
variant postgresql82 conflicts postgresql80 postgresql81 postgresql83 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +40,15 @@ 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:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span> configure.env \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_LIB=${prefix}/lib/postgresql82 -L${prefix}/lib -lssl -lcrypto" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_INCLUDE=${prefix}/include/postgresql82 -I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env \
</span> 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:#e0ffe0;'>+ }
</span> }
variant postgresql81 conflicts postgresql80 postgresql82 postgresql83 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,9 +56,15 @@ 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:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_LIB=${prefix}/lib/postgresql81 -L${prefix}/lib -lssl -lcrypto" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_INCLUDE=${prefix}/include/postgresql81 -I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span> }
variant postgresql80 conflicts postgresql81 postgresql82 postgresql83 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +72,13 @@ 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:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_LIB=${prefix}/lib/postgresql80 -L${prefix}/lib -lssl -lcrypto" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "POSTGRES_INCLUDE=${prefix}/include/postgresql80 -I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/alliance/Portfile b/science/alliance/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7bba31d..4466c8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/alliance/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/alliance/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ patchfiles patch-distrib-etc-Makefile.in.diff
</span> use_parallel_build no
configure.args-append --mandir=${prefix}/share/man
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append YACC='/usr/bin/yacc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append YACC=/usr/bin/yacc
</span> build.env LC_ALL=C
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append YACC='/usr/bin/yacc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append YACC=/usr/bin/yacc
</span>
# compiler_issue
if {[string match *clang* ${configure.compiler}]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ccfits/Portfile b/science/ccfits/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4fc6e73..9c2fe94 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ccfits/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ccfits/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,10 +31,14 @@ configure.args-append \
</span> --with-cfitsio=${prefix}
# avoid depends_build-append port:coreutils
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append "MKDIR_P=/bin/mkdir -p"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env-append MKDIR_P="/bin/mkdir -p"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# avoid depends_build-append port:gmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append GMAKE="/usr/bin/make"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append GMAKE=/usr/bin/make
</span>
post-configure {
# when linking, libtool does not respect -arch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cell-id/Portfile b/science/cell-id/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 168f680..2bdd3ec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cell-id/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cell-id/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ pre-build {
</span> }
build.target cell
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc}
</span> use_parallel_build no
destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/esmf/Portfile b/science/esmf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4c0ba32..9630595 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/esmf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/esmf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +62,20 @@ if {[variant_isset gcc47] || [variant_isset gcc48] || [variant_isset gcc49] || [
</span>
build.target lib
pre-build {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env ESMF_DIR=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_F90=${configure.f90} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_F90COMPILEOPTS=${configure.f90flags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_CXXCOMPILEOPTS=${configure.cxxflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_NETCDF=split \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_NETCDF_INCLUDE=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_NETCDF_LIBPATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_XERCES=standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_XERCES_INCLUDE=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_XERCESF_LIBPATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_XERCES_LIBS=-lxerces-c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env ESMF_DIR=${worksrcpath} \
ESMF_F90=${configure.f90} \
ESMF_F90COMPILEOPTS="${configure.f90flags}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,6 +88,7 @@ pre-build {
</span> ESMF_XERCES_INCLUDE=${prefix}/include \
ESMF_XERCESF_LIBPATH=${prefix}/lib \
ESMF_XERCES_LIBS=-lxerces-c
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {[variant_isset accelerate]} {
build.env-append ESMF_LAPACK=system \
ESMF_LAPACK_LIBS=-lvecLibFort
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,6 +115,28 @@ pre-build {
</span> }
}
pre-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env ESMF_DIR=${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_F90=${configure.f90} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_F90COMPILEOPTS=${configure.f90flags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ESMF_F90LINKOPTS=-L${worksrcpath}/lib ${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_CXXCOMPILEOPTS=${configure.cxxflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "ESMF_CXXLINKOPTS=-L${worksrcpath}/lib ${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_NETCDF=split \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_NETCDF_INCLUDE=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_NETCDF_LIBPATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_XERCES=standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_XERCES_INCLUDE=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_XERCESF_LIBPATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_XERCES_LIBS=-lxerces-c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_INSTALL_PREFIX=${destroot}${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_INSTALL_HEADERDIR=${destroot}${prefix}/include/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_INSTALL_MODDIR=${destroot}${prefix}/include/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_INSTALL_LIBDIR=${destroot}${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_INSTALL_BINDIR=${destroot}${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ESMF_INSTALL_DOCDIR=${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> destroot.env ESMF_DIR=${worksrcpath} \
ESMF_F90=${configure.f90} \
ESMF_F90COMPILEOPTS="${configure.f90flags}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,6 +157,7 @@ pre-destroot {
</span> ESMF_INSTALL_LIBDIR=${destroot}${prefix}/lib \
ESMF_INSTALL_BINDIR=${destroot}${prefix}/bin \
ESMF_INSTALL_DOCDIR=${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {[variant_isset accelerate]} {
destroot.env-append ESMF_LAPACK=system \
ESMF_LAPACK_LIBS=-lvecLibFort
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gds/Portfile b/science/gds/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ad1605e..a9b8a04 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gds/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gds/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,13 +74,13 @@ destroot.args-append \
</span> # Use root 6 for High Sierra and beyond else root 5
if {${os.platform} eq "darwin" && ${os.major} >= 17 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CXXFLAGS='-std=c++1z'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env CXXFLAGS=-std=c++1z
</span>
depends_lib-append port:root6
require_active_variants root6 python27
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env CXXFLAGS='-std=c++11'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env CXXFLAGS=-std=c++11
</span>
depends_lib-append port:root5
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/grads/Portfile b/science/grads/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e29a146..c805eec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/grads/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/grads/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ depends_build port:pkgconfig
</span>
patchfiles patch-configure.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append SUPPLIBS="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append SUPPLIBS=${prefix}
</span> configure.args --without-gui \
--with-readline \
--with-grib2 \
<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 3d3818e..c335ba1 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;'>@@ -35,8 +35,13 @@ configure.cppflags \
</span> configure.ldflags \
-L${prefix}/lib/hdf5-18/lib \
-L${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LIBS=-ldf -lmfhdf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env-append \
LIBS="-ldf -lmfhdf"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/hdf5-lz4-plugin/Portfile b/science/hdf5-lz4-plugin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3919c66..218a84d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/hdf5-lz4-plugin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf5-lz4-plugin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +48,14 @@ post-patch {
</span> use_configure no
build.target lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CFLAGS="${configure.cflags}"
build.env-append LDFLAGS="${configure.ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
file mkdir \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/irsim/Portfile b/science/irsim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d796b8c..5da9c69 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/irsim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/irsim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_lib port:tcl \
</span>
patchfiles patch-remove_sw.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append LIBS="-L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append LIBS=-L${prefix}/lib
</span>
post-destroot {
xinstall -d -m 755 ${destroot}${prefix}/share/doc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/liquid-dsp/Portfile b/science/liquid-dsp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 66d97bc..7ce78fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/liquid-dsp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/liquid-dsp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,11 +39,17 @@ pre-configure {
</span> }
# make sure MP programs are used
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SED=${prefix}/bin/gsed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GREP=${prefix}/bin/ggrep \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "EGREP=${prefix}/bin/ggrep -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env-append \
SED=${prefix}/bin/gsed \
GREP=${prefix}/bin/ggrep \
EGREP="${prefix}/bin/ggrep -E"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# remove top-level include path, such that internal headers are used
# instead of any already-installed ones.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/nMOLDYN/Portfile b/science/nMOLDYN/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5252236..79653ba 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,6 +29,10 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CPPFLAGS=-I${prefix}/include -I${python.include}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CPPFLAGS="-I${prefix}/include -I${python.include}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 9329a84..62b0faa 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,7 +39,11 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env "OCAMLFIND_INSTFLAGS=-destdir $ocamlfind_destdir -ldconf ignore" OCAMLFIND_STUBLIBS=${ocamlfind_destdir}/stublibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> destroot.env OCAMLFIND_INSTFLAGS="-destdir $ocamlfind_destdir -ldconf ignore" OCAMLFIND_STUBLIBS=${ocamlfind_destdir}/stublibs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> destroot.target ocamlfind-install
pre-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/Portfile b/science/pymol/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd4650c..ed917b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pymol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pymol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ build {}
</span> destroot.cmd ${python.bin} setup.py --no-user-cfg --osx-frameworks
pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env CC="${configure.cc}" CXX="${configure.cxx}" PREFIX_PATH="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env CC=${configure.cc} CXX=${configure.cxx} PREFIX_PATH=${prefix}
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/Portfile b/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 77df73e..453e057 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,14 +79,27 @@ pre-build {
</span> set fsymbol -DGFORTRAN
build.args-append USE_OPENMP=1
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env FC=${configure.fc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F90=${configure.fc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "FFLAGS=${configure.fflags} ${ompflg}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env FC=\"${configure.fc}\" \
F90=\"${configure.fc}\" \
FFLAGS=\"${configure.fflags} ${ompflg}\"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "LDFLAGS=${ldflags} ${ompflg}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPPFLAGS=${fsymbol} ${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${cflags} ${ompflg}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append LDFLAGS=\"${ldflags} ${ompflg}\" \
CC=\"${configure.cc}\" \
CPPFLAGS=\"${fsymbol} ${configure.cppflags}\" \
CFLAGS=\"${cflags} ${ompflg}\"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
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 37198f6..f084826 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,8 +28,13 @@ configure.universal_args
</span> variant universal {}
build.args CC=${configure.cc}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CFLAGS="[join ${configure.cflags}] [get_canonical_archflags cc]" \
</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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 74459eb..89a6926 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;'>@@ -38,8 +38,13 @@ depends_lib port:bzip2 \
</span> universal_variant no
platform linux {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LIBS=-L${prefix}/lib -lintl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append \
LIBS="-L${prefix}/lib -lintl"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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 b439596..c8ab408 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,7 +31,11 @@ worksrcdir ${name}-${version}
</span> use_configure no
build.target
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} CFLAGS=${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} CFLAGS="${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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/mkcert/Portfile b/security/mkcert/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da4baeb..581d2c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/mkcert/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/mkcert/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ use_configure no
</span>
build.cmd ${prefix}/bin/go
build.target build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env GOPATH="${workpath}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env GOPATH=${workpath}
</span>
destroot {
xinstall -m 755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/${name}
<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 ceca942..b126816 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,9 +37,14 @@ if {[variant_isset universal]} {
</span> } else {
set archflags ${configure.cc_archflags}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} ${configure.cppflags} ${archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} ${archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc}" \
CFLAGS="${configure.cflags} ${configure.cppflags} ${archflags}" \
LDFLAGS="${configure.ldflags} ${archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.destdir prefix=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/pinentry/Portfile b/security/pinentry/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 474a778..31ea12a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/pinentry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/pinentry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ variant qt5 conflicts qt4 description {Enable qt5-based pinentry tool} {
</span> PortGroup qt5 1.0
# FIXME: why do we have a qt5 PortGroup if it doesn't set PATH correctly?!
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MOC="${qt_moc_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MOC=${qt_moc_cmd}
</span>
configure.args-delete --disable-pinentry-qt \
--disable-pinentry-qt5
<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 e811271..5c7607e 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,10 +26,15 @@ patch.pre_args -p1
</span> depends_build port:libpcap
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CPPFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=-O3 -s -I${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 119fd7e..2e64d17 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;'>@@ -17,9 +17,13 @@ checksums rmd160 f145829ef6f47ce96b8fe8bafddc7cf9d02c8aa4 \
</span> depends_lib path:lib/libssl.dylib:openssl
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall ${worksrcpath}/sign ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/mksh/Portfile b/shells/mksh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 411c66a..95df0a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/mksh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/mksh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,10 +37,17 @@ build.target
</span> if {${build.jobs} > 1} {
build.args-append -j
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot {
xinstall -d ${destroot}${prefix}/share/doc/mksh/examples/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/MacPorts/Portfile b/sysutils/MacPorts/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f39451..0125c5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/MacPorts/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/MacPorts/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,7 +142,11 @@ platform darwin 8 powerpc {
</span> }
# Supply architecture and sysroot flags to build MacPorts universal.
configure.cflags-append -isysroot ${sdkrootpath} -arch ppc -arch i386
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "SHLIB_LDFLAGS=-Wl,-syslibroot,${sdkrootpath} -arch ppc -arch i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append SHLIB_LDFLAGS='-Wl,-syslibroot,${sdkrootpath} -arch ppc -arch i386'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/amttools/Portfile b/sysutils/amttools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4643566..57796ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/amttools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/amttools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,8 +55,13 @@ patchfiles patch-amttool-prepare-hashbang-for-reinplace.diff \
</span> patch-GNUmakefile-disable-gamt.diff
build.type gnu
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.args CC=${configure.cc} \
LD=${configure.cc} \
verbose=yes
<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 5263ff4..30bca72 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,9 +21,14 @@ installs_libs no
</span> variant universal {}
configure.cflags-append -std=c99
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.destdir prefix=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/bsdsfv/Portfile b/sysutils/bsdsfv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 36beaed..8677009 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/bsdsfv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/bsdsfv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,13 @@ worksrcdir ${name}
</span> use_configure no
test.run no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} ${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc} ${configure.cc_archflags}" \
CFLAGS="${configure.cflags} ${configure.cppflags}" \
LDFLAGS="${configure.ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> destroot.args PREFIX=${prefix} INSTALL="${configure.install}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/cocoa-tlassemble/Portfile b/sysutils/cocoa-tlassemble/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 519c46d..f0764dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/cocoa-tlassemble/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/cocoa-tlassemble/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,11 @@ patch {
</span> reinplace "s/clang/\$(CC)/g" ${worksrcpath}/makefile
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CC=${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC="${configure.cc} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
use_configure no
<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 d7e4d0e..dca4227 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,10 +23,15 @@ patchfiles patch-Makefile.diff
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 a7bebaa..e9c4f42 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,8 +21,13 @@ checksums rmd160 ffdd13de33fdc6386dec02206a0150ef7eb1bee9 \
</span> size 1463718
platform darwin {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LIBS=-framework CoreFoundation -framework IOKit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env \
LIBS="-framework CoreFoundation -framework IOKit"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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/entr/Portfile b/sysutils/entr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a80e16..ac421ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/entr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/entr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,15 +28,26 @@ worksrcdir eradman-entr-f4e2cbe57708
</span> # ./configure is just a simple batch file
configure.pre_args
configure.universal_args
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
destroot.destdir PREFIX="${destroot}${prefix}" \
MANPREFIX="${destroot}${prefix}/share/man"
test.run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> test.env-append CC=${configure.cc} \
CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fatsort/Portfile b/sysutils/fatsort/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dbaf6f5..fa2336c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fatsort/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fatsort/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,13 @@ use_configure no
</span> variant universal {}
build.type gnu
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.args CC=${configure.cc} \
LD=${configure.cc}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/fd/Portfile b/sysutils/fd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6eccc00..1bdbe4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/fd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/fd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@ pre-build {
</span> file mkdir ${worksrcpath}/shell_completions
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append SHELL_COMPLETIONS_DIR="shell_completions"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append SHELL_COMPLETIONS_DIR=shell_completions
</span>
destroot {
xinstall -m 755 ${worksrcpath}/target/[cargo.rust_platform]/release/${name} ${destroot}${prefix}/bin/
<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 83bfd79..d4f1ecd 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,10 +35,17 @@ use_configure no
</span> variant universal {}
build.type gnu
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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 c380d8c..ca145de 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;'>@@ -91,9 +91,15 @@ subport john-jumbo {
</span> configure.dir ${worksrcpath}/src
build.dir ${worksrcpath}/src
build.target default
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</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 dbfbe26..2d8cdf7 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,9 +29,15 @@ variant universal {}
</span> compiler.blacklist *cc* *dragonegg*
build.args PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc}" \
CFLAGS="[get_canonical_archflags cc]" \
LDFLAGS="[get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 bdc8bb4..412ffef 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,7 +26,11 @@ patchfiles patch-maxwell.8.diff
</span> use_configure no
build.args CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CFLAGS=${configure.cflags} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="${configure.cflags} ${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.destdir DESTDIR=${destroot} prefix=${prefix} \
mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/pidof/Portfile b/sysutils/pidof/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cb77eab..32edf67 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/pidof/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/pidof/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +26,15 @@ patchfiles patch-Makefile.diff \
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC=${configure.cc} \
CFLAGS="${configure.cflags}" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env-append PREFIX=${prefix}
<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 e392921..c89a16d 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;'>@@ -143,8 +143,13 @@ platform darwin {
</span> --with-glob
# avoid bison-2.7 problems
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "YACC=/usr/bin/bison -y"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append \
YACC='/usr/bin/bison -y'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-destroot {
# Mac OS X specific changes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rw/Portfile b/sysutils/rw/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e7746fe..e573582 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/rw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +37,17 @@ pre-fetch {
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc} [get_canonical_archflags cc]" \
CPPFLAGS="${configure.cppflags}" \
CFLAGS="${configure.cflags}" \
LDFLAGS="${configure.ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.args PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/smlr/Portfile b/sysutils/smlr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e1d9b94..fcd5d2e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/smlr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/smlr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,10 +21,16 @@ patchfiles patch-Makefile.diff
</span> variant universal {}
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/tag/Portfile b/sysutils/tag/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5489f6..c85e954 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/tag/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/tag/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +21,13 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.args prefix=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/tldr-cpp-client/Portfile b/sysutils/tldr-cpp-client/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b4e2ecb..8050163 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/tldr-cpp-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/tldr-cpp-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,17 @@ depends_build-append \
</span> depends_lib-append \
port:curl \
port:libzip
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC='${configure.cc}' \
LD='${configure.cc}' \
CFLAGS='${configure.cflags} [get_canonical_archflags cc]' \
LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.args PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/tmux-pasteboard/Portfile b/sysutils/tmux-pasteboard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15960c7..94a5968 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/tmux-pasteboard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/tmux-pasteboard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ checksums rmd160 2cc454a397f3cc8b5b86a2140f85be97eee060e5 \
</span> use_configure no
variant universal {}
<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="-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:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-L${prefix}/lib
</span> build.target reattach-to-user-namespace
build.args ARCHES="[get_canonical_archs]"
<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 384340c..df4f6f7 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,7 +29,11 @@ depends_lib port:zlib
</span>
patchfiles Types.h.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} CFLAGS=${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} CFLAGS="${configure.cc_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 755 ${worksrcpath}/uif2iso ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/vmdktool/Portfile b/sysutils/vmdktool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 721ac60..40d61a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/vmdktool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/vmdktool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +33,13 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC=${configure.cc} \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
test.run yes
<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 6c0c198..3ae569e 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,7 +16,11 @@ description watches files and takes action when they change
</span> long_description ${description}
use_autoreconf yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.env "AUTOMAKE=automake --foreign"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> autoreconf.env AUTOMAKE="automake --foreign"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_build-append port:pkgconfig
depends_lib-append port:pcre
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tex/latex2rtf/Portfile b/tex/latex2rtf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c80c0a..34f77a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tex/latex2rtf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tex/latex2rtf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +34,13 @@ installs_libs no
</span> destroot.target install install-info
# append to CFLAGS (instead of replacing value in Makefile)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
destroot.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
build.pre_args-append \
PREFIX=${prefix} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tex/texlive-bin/Portfile b/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eb55bc1..31a0cc4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tex/texlive-bin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,9 +221,15 @@ if {[variant_isset universal]} {
</span>
# work around bug in texlive makefiles where $OBJC is not recorded
# during configure phase
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env OBJC=${configure.objc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "OBJCFLAGS=${configure.objcflags} [get_canonical_archflags objc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCXX=${configure.objcxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env OBJC=${configure.objc} \
OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
OBJCXX=${configure.objcxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# this is not optimal, but we have to duplicate this cxx11 PG logic here
# because of https://trac.macports.org/ticket/56280
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,7 +239,11 @@ if {[string match *clang* ${configure.cxx}]} {
</span> if {[string match macports-libstdc++ ${configure.cxx_stdlib}]} {
lappend configure.objcxxflags -D_GLIBCXX_USE_CXX11_ABI=0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "OBJCXXFLAGS=${configure.objcxxflags} [get_canonical_archflags objcxx]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# work around differences between libc++ and libstdc++ headers building with clang
# https://trac.macports.org/ticket/54358#comment:26
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/openjade/Portfile b/textproc/openjade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e0be41d..227ac5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/openjade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/openjade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ if {[string match *clang* ${configure.cxx}]} {
</span> set cxx_stdlibflags "-stdlib=${configure.cxx_stdlib}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append LIBS="-L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append LIBS=-L${prefix}/lib
</span> configure.cxxflags-append "-isystem ${prefix}/include -fno-rtti"
configure.ldflags-delete "-L${prefix}/lib"
<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 a56f52d..217fa0f 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,6 +34,10 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env "LIBS=-L${prefix}/lib -lintl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env LIBS="-L${prefix}/lib -lintl"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
livecheck.distname OpenSP
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/rhyme/Portfile b/textproc/rhyme/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 977be5f..9991962 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/rhyme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/rhyme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,11 @@ patchfiles patch-Makefile.diff
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "FLAGS=${configure.cflags} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append FLAGS="${configure.cflags} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
use_parallel_build no
build.args-append PREFIX=${prefix} \
<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 959df6f..99d848e 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;'>@@ -41,9 +41,15 @@ checksums rmd160 d0befc00f8e58e4bae7441a31a7270576f6584f2 \
</span>
configure.perl ${prefix}/bin/perl${pbranch}
pre-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PERL_EXT_CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PERL_EXT_LDFLAGS=[get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span> }
destroot.target-append install-tex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/wyrd/Portfile b/textproc/wyrd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ae8f05..6ec3bdb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/wyrd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/wyrd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,6 +46,6 @@ use_parallel_build no
</span>
# Error: This expression has type string but an expression was expected of type
# bytes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env OCAMLPARAM="safe-string=0,_"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env OCAMLPARAM=safe-string=0,_
</span>
livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/xalanc/Portfile b/textproc/xalanc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 123bef4..e2db7c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/xalanc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/xalanc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +32,8 @@ depends_lib port:xercesc3
</span>
worksrcdir xalan-c-${version}/c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env XALANCROOT='${workpath}/${worksrcdir}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XERCESCROOT='${prefix}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env XALANCROOT=${workpath}/${worksrcdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XERCESCROOT=${prefix}
</span> configure.cmd ./runConfigure
configure.pre_args -C --prefix=${prefix} \
-c ${configure.cc} -x ${configure.cxx}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,10 +42,10 @@ platform darwin {
</span> configure.pre_args-append -p macosx
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env ${configure.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env {*}${configure.env}
</span> build.type gnu
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env ${configure.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env {*}${configure.env}
</span>
livecheck.type moddate
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/apache2/Portfile b/www/apache2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 20fcf09..46d2690 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/apache2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/apache2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,7 +172,7 @@ post-activate {
</span> }
platform openbsd {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append "LD_LIBRARY_PATH=${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append LD_LIBRARY_PATH=${prefix}/lib
</span> }
variant openldap description {Enable LDAP support through OpenLDAP} {
<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 3d1c8e8..c7adc76 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;'>@@ -78,8 +78,13 @@ build.args prefix=${prefix} \
</span> NO_GETTEXT=1 \
NO_LUA=1 \
V=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CFLAGS=${configure.cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CFLAGS="${configure.cflags}" \
LDFLAGS="${configure.ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.args {*}${build.args}
destroot.env {*}${build.env}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/edbrowse/Portfile b/www/edbrowse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b6c33c..7c34656 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/edbrowse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/edbrowse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,11 @@ use_configure no
</span> variant universal {}
configure.cppflags-append -I${prefix}/include/mozjs185
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append "CC=${configure.cc} [get_canonical_archflags cc]" CFLAGS=${configure.cflags} "CPPFLAGS=${configure.cppflags} -DSYSBSD -DXP_UNIX -DX86_LINUX"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append CC="${configure.cc} [get_canonical_archflags cc]" CFLAGS="${configure.cflags}" CPPFLAGS="${configure.cppflags} -DSYSBSD -DXP_UNIX -DX86_LINUX"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> build.args STRIP=''
destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/http-parser/Portfile b/www/http-parser/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21db97a..45f4c82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/http-parser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/http-parser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +33,13 @@ build.env CC=${configure.cc} \
</span> PREFIX=${prefix}
pre-build {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/mongoose/Portfile b/www/mongoose/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f799043..a38ef72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/mongoose/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/mongoose/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,11 @@ use_configure no
</span> variant universal {}
build.target mac
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env CC="${configure.cc} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot {
xinstall -m 555 ${worksrcpath}/mongoose ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/netrik/Portfile b/www/netrik/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b52f20..67b6c1a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/netrik/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/netrik/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,6 +28,6 @@ depends_lib port:readline \
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env CPP="${configure.cc} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cpp ${configure.cc} -E
</span>
configure.cc-append [get_canonical_archflags cc]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/nghttp2/Portfile b/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f4a0e8..4ec0492 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/nghttp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +62,16 @@ configure.args --disable-silent-rules \
</span> --enable-app \
ac_cv_prog_AWK=/usr/bin/awk
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env CYTHON=${prefix}/bin/cython-${PythonVersion} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JANSSON_CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "JANSSON_LIBS=-L${prefix}/lib -ljansson" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBEVENT_OPENSSL_CFLAGS=-I${prefix}/include/event2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LIBEVENT_OPENSSL_LIBS=-L${prefix}/lib -levent -levent_openssl" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENSSL_CFLAGS=-I${prefix}/include/openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "OPENSSL_LIBS=-L${prefix}/lib -lcrypto -lssl" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON=${prefix}/bin/python${PythonVersion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env CYTHON=${prefix}/bin/cython-${PythonVersion} \
JANSSON_CFLAGS=-I${prefix}/include JANSSON_LIBS="-L${prefix}/lib -ljansson" \
LIBEVENT_OPENSSL_CFLAGS=-I${prefix}/include/event2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,6 +79,7 @@ configure.env CYTHON=${prefix}/bin/cython-${PythonVersion} \
</span> OPENSSL_CFLAGS=-I${prefix}/include/openssl \
OPENSSL_LIBS="-L${prefix}/lib -lcrypto -lssl" \
PYTHON=${prefix}/bin/python${PythonVersion}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.env PYTHONPATH=${destroot}${prefix}/lib/python${PythonVersion}/site-packages/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +88,11 @@ pre-destroot {
</span> }
variant python27 conflicts python35 python36 python37 description {Build using Python 2.7} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append "PYTHON_EXTRA_LDFLAGS=-u _PyMac_Error ${frameworks_dir}/Python.framework/Versions/${PythonVersion}/Python"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> configure.env-append PYTHON_EXTRA_LDFLAGS="-u _PyMac_Error ${frameworks_dir}/Python.framework/Versions/${PythonVersion}/Python"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant python35 conflicts python27 python36 python37 description {Build using Python 3.5 - obsolete} {
<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 946300e..8d3164e 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,7 +173,11 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.env-append "ACLOCAL=aclocal -I Source/autotools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 a93743a..7452293 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,7 +160,11 @@ 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:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.env-append "ACLOCAL=aclocal -I Source/autotools"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> autoreconf.env-append ACLOCAL="aclocal -I Source/autotools"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 45c5546..73f352c 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,9 +23,15 @@ depends_lib port:gkrellm
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CPPFLAGS=-L${prefix}/lib -I${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-I${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=-L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</span>
patchfiles patch-Makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/herbstluftwm/Portfile b/x11/herbstluftwm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f97b635..f48a81a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/herbstluftwm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/herbstluftwm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,10 +44,15 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> variant universal {}
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig \
CFLAGS="${configure.cflags} [get_canonical_archflags]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
build.args-append CC=${configure.cc} \
LD=${configure.cc} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mesa/Portfile b/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4cd60e1..599499c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mesa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,7 +118,7 @@ variant python27 description {Use python 2.7} {
</span> depends_build-append \
port:py27-libxml2
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON2="${prefix}/bin/python2.7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON2=${prefix}/bin/python2.7
</span> }
if {![variant_isset python27]} {
<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 1b87dd6..d3bfd1d 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,7 +48,11 @@ configure.args --enable-xft \
</span> --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env "YACC=${prefix}/bin/bison -y"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> configure.env YACC="${prefix}/bin/bison -y"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 9827c5a..cd6ee7c 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,9 +51,15 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+ ko ms nl no pl pt ro ru sk sv tr zh_CN" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LIBS=-L${prefix}/lib -lintl -lX11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</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:#e0ffe0;'>+}
</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/x11/xdotool/Portfile b/x11/xdotool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 50ef2e1..97d7584 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xdotool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xdotool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,10 +45,17 @@ use_configure no
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> build.env PREFIX=${prefix} \
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:#e0ffe0;'>+}
</span> destroot.env PREFIX=${prefix} \
INSTALLMAN=${prefix}/share/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xfs/Portfile b/x11/xfs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a0b425b..1dfc59c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xfs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,8 +52,8 @@ variant docs description "Install extra documentation" {
</span> --enable-devel-docs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libX11/Portfile b/x11/xorg-libX11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7389601..f831db4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libX11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libX11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,8 +61,8 @@ variant docs description "Install extra documentation" {
</span> --enable-specs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXaw/Portfile b/x11/xorg-libXaw/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3b158ba..17457d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXaw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libXaw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,8 +57,8 @@ variant docs description "Install extra documentation" {
</span> --enable-specs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXcomposite/Portfile b/x11/xorg-libXcomposite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e0020d5..828e0c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXcomposite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libXcomposite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ variant docs description "Install extra documentation" {
</span> --with-xmlto
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXdmcp/Portfile b/x11/xorg-libXdmcp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74ad0be..ad6a07d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXdmcp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libXdmcp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,8 +53,8 @@ variant docs description "Install extra documentation" {
</span> --enable-docs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXext/Portfile b/x11/xorg-libXext/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c5e01d..2df437e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libXext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,8 +61,8 @@ variant docs description "Install extra documentation" {
</span> --enable-specs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont/Portfile b/x11/xorg-libXfont/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2bcc8c..db61f29 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libXfont/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,8 +65,8 @@ variant docs description "Install extra documentation" {
</span> --enable-devel-docs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXfont2/Portfile b/x11/xorg-libXfont2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84ec5fa..b3ce5d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXfont2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libXfont2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,8 +68,8 @@ variant docs description "Install extra documentation" {
</span> --enable-devel-docs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXi/Portfile b/x11/xorg-libXi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 16e4b9c..23cd63d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libXi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,9 +63,9 @@ variant docs description "Install extra documentation" {
</span> --enable-specs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ASCIIDOC="${prefix}/bin/asciidoc" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASCIIDOC=${prefix}/bin/asciidoc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXmu/Portfile b/x11/xorg-libXmu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0930a10..a0c4d16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXmu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libXmu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,8 +56,8 @@ variant docs description "Install extra documentation" {
</span> --enable-docs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libXtst/Portfile b/x11/xorg-libXtst/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c08062..3f7b382 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libXtst/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libXtst/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,8 +55,8 @@ variant docs description "Install extra documentation" {
</span> --enable-specs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libice/Portfile b/x11/xorg-libice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 63acb71..702648f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,8 +57,8 @@ variant docs description "Install extra documentation" {
</span> --enable-specs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libsm/Portfile b/x11/xorg-libsm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e31e529..e9f820d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libsm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libsm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,8 +58,8 @@ variant docs description "Install extra documentation" {
</span> --enable-docs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-libxcb/Portfile b/x11/xorg-libxcb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 68f9771..491abb2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-libxcb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-libxcb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ variant docs description "Install extra documentation" {
</span> --enable-build-docs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DOXYGEN="${prefix}/bin/doxygen"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOXYGEN=${prefix}/bin/doxygen
</span> }
variant python27 conflicts python34 python35 python36 python37 description {Use python 2.7} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/Portfile b/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b195439..f76950e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,9 +159,9 @@ variant docs description "Install extra documentation" {
</span> --enable-devel-docs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DOXYGEN="${prefix}/bin/doxygen" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOXYGEN=${prefix}/bin/doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto
</span> }
livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/Portfile b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15713d7..d5a3d2f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,9 +139,9 @@ variant docs description "Install extra documentation" {
</span> --enable-devel-docs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DOXYGEN="${prefix}/bin/doxygen" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOXYGEN=${prefix}/bin/doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-xorgproto/Portfile b/x11/xorg-xorgproto/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2fba4ca..8fbcb4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-xorgproto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-xorgproto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,8 +46,8 @@ variant docs description "Install extra documentation" {
</span> --enable-specs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-xtrans/Portfile b/x11/xorg-xtrans/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ea56e8..3afe310 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-xtrans/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-xtrans/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,8 +48,8 @@ variant docs description "Install extra documentation" {
</span> --enable-docs
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop
</span> }
livecheck.type regex
<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 31fa945..67962e0 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;'>@@ -23,9 +23,17 @@ depends_lib port:libxfce4ui port:exo port:libwnck port:xorg-libXrandr
</span>
platform darwin 8 {
patchfiles-append patch-configure.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ 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:#e0ffe0;'>+ 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:#e0ffe0;'>+ 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:#e0ffe0;'>+ } else {
</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:#e0ffe0;'>+ }
</span> }
</pre><pre style='margin:0'>
</pre>