<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/3b0bc3ce7499398bdfc1839378e7418ea62d57bb">https://github.com/macports/macports-ports/commit/3b0bc3ce7499398bdfc1839378e7418ea62d57bb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3b0bc3ce7499398bdfc1839378e7418ea62d57bb
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jun 3 20:29:35 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> misc: remove universal_possible compat code
</span>---
aqua/phantomjs-qt/Portfile | 4 ----
aqua/qt53/Portfile | 4 ----
aqua/qt55/Portfile | 4 ----
aqua/qt56/Portfile | 4 ----
aqua/qt57/Portfile | 4 ----
aqua/qt58/Portfile | 4 ----
archivers/lz4/Portfile | 3 ---
audio/lpcnetfreedv/Portfile | 3 ---
audio/mpg123/Portfile | 3 ---
devel/ResIL/Portfile | 4 +---
devel/appstream-glib/Portfile | 3 ---
devel/boost169/Portfile | 3 ---
devel/boost171/Portfile | 3 ---
devel/boost173/Portfile | 3 ---
devel/boost176/Portfile | 3 ---
devel/boost177/Portfile | 3 ---
devel/boost178/Portfile | 3 ---
devel/boost179/Portfile | 3 ---
devel/cryptlib/Portfile | 3 ---
devel/glade/Portfile | 3 ---
devel/glib2-devel/Portfile | 4 ----
devel/glib2-upstream/Portfile | 4 ----
devel/glib2/Portfile | 4 ----
devel/gnutls/Portfile | 3 ---
devel/ld64/Portfile | 3 ---
devel/legacy-support/Portfile | 3 ---
devel/libgpg-error/Portfile | 3 ---
devel/mpir/Portfile | 3 ---
devel/nettle/Portfile | 3 ---
devel/openssl3/Portfile | 3 ---
gnome/at-spi2-core/Portfile | 3 ---
gnome/eog/Portfile | 3 ---
gnome/gedit/Portfile | 4 ----
gnome/geocode-glib/Portfile | 3 ---
gnome/gexiv2/Portfile | 3 ---
gnome/gnome-desktop/Portfile | 3 ---
gnome/grilo/Portfile | 3 ---
gnome/gsettings-desktop-schemas/Portfile | 3 ---
gnome/gtk2-devel/Portfile | 3 ---
gnome/gtk2/Portfile | 3 ---
gnome/gtk3-devel/Portfile | 4 ----
gnome/gtk3/Portfile | 4 ----
gnome/gtksourceview4/Portfile | 3 ---
gnome/gucharmap/Portfile | 3 ---
gnome/libchamplain/Portfile | 3 ---
gnome/libgdata/Portfile | 3 ---
gnome/libgit2-glib/Portfile | 3 ---
gnome/libhandy-0.0/Portfile | 4 ----
gnome/libhandy/Portfile | 3 ---
gnome/libpeas/Portfile | 3 ---
gnome/libsoup-devel/Portfile | 3 ---
gnome/libsoup/Portfile | 3 ---
gnome/totem-pl-parser/Portfile | 3 ---
graphics/babl-devel/Portfile | 3 ---
graphics/babl/Portfile | 3 ---
graphics/feh/Portfile | 3 ---
graphics/gdk-pixbuf2-devel/Portfile | 4 ----
graphics/gdk-pixbuf2/Portfile | 4 ----
graphics/gegl-0.3/Portfile | 3 ---
graphics/gegl-devel/Portfile | 3 ---
graphics/gegl/Portfile | 3 ---
graphics/graphene/Portfile | 3 ---
graphics/libQGLViewer/Portfile | 3 ---
graphics/libjpeg-turbo-devel/Portfile | 3 ---
graphics/libjpeg-turbo/Portfile | 3 ---
graphics/libmediaart/Portfile | 3 ---
graphics/mozjpeg/Portfile | 3 ---
lang/dmd-tools/Portfile | 3 ---
lang/dmd/Portfile | 3 ---
lang/druntime/Portfile | 3 ---
lang/mozjs52/Portfile | 3 ---
lang/mozjs60/Portfile | 4 +---
lang/mozjs68/Portfile | 3 ---
lang/mozjs91/Portfile | 3 ---
lang/phobos/Portfile | 3 ---
lang/ruby186/Portfile | 3 ---
math/OpenBLAS/Portfile | 3 ---
math/gr1c/Portfile | 3 ---
math/gts/Portfile | 3 ---
math/lp_solve/Portfile | 3 ---
math/mumps/Portfile | 4 ----
math/octave/Portfile | 3 ---
math/petsc/Portfile | 4 ----
math/slepc/Portfile | 3 ---
multimedia/aom/Portfile | 4 ----
multimedia/dav1d/Portfile | 3 ---
multimedia/ffmpeg-devel/Portfile | 3 ---
multimedia/ffmpeg/Portfile | 3 ---
multimedia/libvpx-devel/Portfile | 4 ----
multimedia/libvpx/Portfile | 4 ----
multimedia/mlt/Portfile | 3 ---
multimedia/x264/Portfile | 3 ---
net/libgweather/Portfile | 3 ---
python/py-gobject3/Portfile | 3 ---
python/py-sip4/Portfile | 3 ---
science/libsc/Portfile | 3 ---
science/netcdf-fortran/Portfile | 3 ---
science/netcdf/Portfile | 4 ----
science/opencascade/Portfile | 3 ---
science/p4est/Portfile | 3 ---
science/plplot/Portfile | 3 ---
science/plplot510/Portfile | 3 ---
x11/tigervnc/Portfile | 3 ---
x11/tk/Portfile | 3 ---
x11/wine-crossover/Portfile | 3 ---
x11/wine-devel/Portfile | 3 ---
x11/wine/Portfile | 3 ---
107 files changed, 2 insertions(+), 342 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/phantomjs-qt/Portfile b/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e5f51645e15..d692d648601 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,10 +38,6 @@ if {${subport} ne ${name}} {
</span> fetch.type git
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ############################################################################### TODO
#
# TODO: possible to trim dependencies of qtbase?
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/Portfile b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd4c36bad12..fca32758c63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,10 +45,6 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ############################################################################### Modules Not Considered
#
# No qtactiveqt (Windows Only)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2dbaea765e4..6f18d58bfda 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,10 +45,6 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ############################################################################### Modules Not Considered
#
# No qtactiveqt (Windows Only)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 540bfa713bf..350a6942ff8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,10 +51,6 @@ if { ${os.major} < 12 } {
</span> conflicts-delete qt5-qtbase
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ############################################################################### Modules Not Considered
#
# No qtactiveqt (Windows Only)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06552f34ba3..f245c813726 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,10 +51,6 @@ if { ${os.major} == 12 } {
</span> conflicts-delete qt5-qtbase
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ############################################################################### Modules Not Considered
#
# No qtactiveqt (Windows Only)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e3d74faa2dd..d6e929593b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,10 +51,6 @@ if { ${os.major} == 13 } {
</span> conflicts-delete qt5-qtbase
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ############################################################################### Modules Not Considered
#
# No qtactiveqt (Windows Only)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/lz4/Portfile b/archivers/lz4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96adf92eab5..22738bf9641 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/lz4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/lz4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +40,6 @@ destroot.args-append CC=${configure.cc} \
</span> PREFIX=${prefix} \
OS=Darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
build.args-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/lpcnetfreedv/Portfile b/audio/lpcnetfreedv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 09ec36c55c6..79f9df263fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/lpcnetfreedv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/lpcnetfreedv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,6 @@ depends_lib-append \
</span> configure.args-append \
-DDISABLE_CPU_OPTIMIZATION=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # enable optimization on all supported hardwares
if {${universal_possible} && [variant_isset universal]} {
set merger_configure_args(x86_64) -DAVX=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/mpg123/Portfile b/audio/mpg123/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 327372491f3..31f321b81eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/mpg123/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/mpg123/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +37,6 @@ set merger_configure_args(i386) --with-cpu=sse
</span> set merger_configure_args(ppc) --with-cpu=altivec
set merger_configure_args(ppc64) --with-cpu=altivec
set merger_configure_args(x86_64) --with-cpu=x86-64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {(!${universal_possible} || ![variant_isset universal]) && [info exists merger_configure_args(${configure.build_arch})]} {
configure.args-append $merger_configure_args(${configure.build_arch})
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ResIL/Portfile b/devel/ResIL/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fd40c53cf6d..b15cee4ec0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ResIL/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ResIL/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,9 +80,7 @@ configure.args --enable-ILU \
</span> --disable-exr \
--disable-sdl \
--disable-xpm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {!${universal_possible} || ![variant_isset universal]} {
if {${configure.build_arch} eq "i386"} {
configure.args-append --enable-x86
<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 7964fab7f49..0eeaa39bb46 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;'>@@ -54,9 +54,6 @@ post-patch {
</span> # attempt to fix build on 10.6 by blacklisting troublesome compilers
compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 300}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost169/Portfile b/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f876875787a..6edd913caf8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -360,9 +360,6 @@ if {[mpi_variant_isset]} {
</span>
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
# Honour 'build_arch', if not universal as per #28327
if {[lsearch ${build_arch} ppc*] != -1} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost171/Portfile b/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86672629e81..b6adb1092e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost171/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -416,9 +416,6 @@ if {$subport eq $name} {
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if {[lsearch ${build_arch} arm*] != -1} {
build.args-append address-model=64 architecture=arm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost173/Portfile b/devel/boost173/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f9a5a1537c..9ef16e166a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost173/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost173/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -404,9 +404,6 @@ if {$subport eq $name} {
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if {[lsearch ${build_arch} arm*] != -1} {
build.args-append address-model=64 architecture=arm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost176/Portfile b/devel/boost176/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 27796506acb..7e9bf2c8f84 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost176/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost176/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,9 +441,6 @@ if {$subport eq $name} {
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if {[lsearch ${build_arch} arm*] != -1} {
build.args-append address-model=64 architecture=arm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost177/Portfile b/devel/boost177/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 364cb846f50..1c4f1427189 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost177/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost177/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -442,9 +442,6 @@ if {$subport eq $name} {
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if {[lsearch ${build_arch} arm*] != -1} {
build.args-append address-model=64 architecture=arm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost178/Portfile b/devel/boost178/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71a278a9996..1cdd351c85d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost178/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost178/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -442,9 +442,6 @@ if {$subport eq $name} {
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if {[lsearch ${build_arch} arm*] != -1} {
build.args-append address-model=64 architecture=arm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost179/Portfile b/devel/boost179/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7dd7c335a30..1eed5f4203e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost179/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost179/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -444,9 +444,6 @@ if {$subport eq $name} {
</span> livecheck.type none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if {[lsearch ${build_arch} arm*] != -1} {
build.args-append address-model=64 architecture=arm
<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 314e1fcfb73..40c3c73f1cd 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;'>@@ -70,9 +70,6 @@ foreach arch ${configure.universal_archs} {
</span> "LDFLAGS=${configure.ldflags} -arch ${arch}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {(!${universal_possible} || ![variant_isset universal]) && [info exists merger_build_env(${configure.build_arch})]} {
build.env-append {*}$merger_build_env(${configure.build_arch})
}
<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 211be65413a..c24f95ddd5c 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;'>@@ -49,9 +49,6 @@ configure.args -Dgladeui=true \
</span> -Dpython=disabled \
-Dwebkit2gtk=disabled
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a2f4faf576..34bed627c4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,10 +92,6 @@ configure.perl /usr/bin/perl
</span> configure.python ${prefix}/bin/python${py_ver}
configure.env-append PERL_PATH=${configure.perl}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
foreach my_arch {ppc ppc64 i386 x86_64 arm64} {
# strip the automatic setting of host, meson does not accept
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-upstream/Portfile b/devel/glib2-upstream/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 32ded8a9ba5..3efe0adb3f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,10 +115,6 @@ configure.perl /usr/bin/perl
</span> configure.python ${prefix}/bin/python${py_ver}
configure.env-append PERL_PATH=${configure.perl}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
foreach my_arch {ppc ppc64 i386 x86_64 arm64} {
# strip the automatic setting of host, meson does not accept
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bdf4612db34..ee51c7004fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,10 +96,6 @@ configure.perl /usr/bin/perl
</span> configure.python ${prefix}/bin/python${py_ver}
configure.env-append PERL_PATH=${configure.perl}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
foreach my_arch {ppc ppc64 i386 x86_64 arm64} {
# strip the automatic setting of host, meson does not accept
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gnutls/Portfile b/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7fba1ca865b..84f893aff1a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,9 +172,6 @@ variant guile description {Build guile bindings} {
</span> configure.args-replace --disable-guile --enable-guile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ld64/Portfile b/devel/ld64/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f5265ba6808..ff4ea16a051 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ld64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ld64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -541,9 +541,6 @@ if {"${configure.sdkroot}" eq ""} {
</span> configure.sdkroot "/"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # for a universal build, we need to run the tests for each arch and clean between
if {!${universal_possible} || ![variant_isset universal]} {
test.run yes
<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 85d40bd1620..639cd90b31a 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;'>@@ -82,9 +82,6 @@ platform darwin 8 {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
foreach arch ${universal_archs_supported} {
lappend merger_build_env(${arch}) "CXXFLAGS=${configure.cxxflags} [muniversal_get_arch_flag ${arch}]" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libgpg-error/Portfile b/devel/libgpg-error/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 774b7addd8e..412c884785e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libgpg-error/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgpg-error/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +48,6 @@ platform darwin 8 {
</span> configure.cppflags-append -D__DARWIN_UNIX03
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal] && ${using_muniversal_PG}} {
# muniversal's *.h merger does not handle \-continued lines properly
patchfiles-append patch-gen-posix-lock-obj_c.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mpir/Portfile b/devel/mpir/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f654c8c6447..a801d06f659 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mpir/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mpir/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,9 +93,6 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
configure.env-append ABI=64
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nettle/Portfile b/devel/nettle/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15327de0abd..b6e4d30f67a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nettle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nettle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,9 +58,6 @@ configure.args --disable-openssl \
</span> # etc.
set merger_configure_args(arm64) --build=aarch64-apple-darwin${os.major}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {(!${universal_possible} || ![variant_isset universal]) && [info exists merger_configure_args(${build_arch})]} {
configure.args-append $merger_configure_args(${build_arch})
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl3/Portfile b/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6480f558676..3773b4598d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,9 +123,6 @@ platform darwin {
</span> # Don't pass --host to configure.
array set merger_host {ppc {} i386 {} ppc64 {} x86_64 {} arm64 {}}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {(!${universal_possible} || ![variant_isset universal])
&& [info exists merger_configure_args(${configure.build_arch})]} {
configure.args-append $merger_configure_args(${configure.build_arch})
<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 8da5c73e859..567b73c9e99 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;'>@@ -42,9 +42,6 @@ configure.args -Ddocs=true \
</span> -Dintrospection=yes \
-Dx11=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/eog/Portfile b/gnome/eog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2934f1157a4..7ad3d0dc943 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/eog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/eog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,9 +72,6 @@ if {${os.platform} eq "darwin" && (
</span> -Dlibrsvg=false
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gedit/Portfile b/gnome/gedit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b996f71f10..0c887d2a6f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +59,6 @@ post-patch {
</span>
configure.args -Dgtk_doc=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/geocode-glib/Portfile b/gnome/geocode-glib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6956c507a87..4a350d64e2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/geocode-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/geocode-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +42,6 @@ platform darwin 8 {
</span> destroot.env-append "DYLD_LIBRARY_PATH=${build_dir}/geocode-glib"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gexiv2/Portfile b/gnome/gexiv2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19945f154ac..9ac2f8eaeac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gexiv2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gexiv2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,9 +90,6 @@ compiler.cxx_standard 2011
</span>
configure.args-append -Dgtk_doc=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-desktop/Portfile b/gnome/gnome-desktop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 276feaab218..ba88fa717c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-desktop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-desktop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,9 +57,6 @@ configure.args -Dgnome_distributor=MacPorts \
</span> -Ddesktop_docs=true \
-Dgtk_doc=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/grilo/Portfile b/gnome/grilo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f4705cbed9c..17ce43c6d25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/grilo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/grilo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +40,6 @@ patchfiles no-undefined.patch
</span>
compiler.c_standard 1999
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gsettings-desktop-schemas/Portfile b/gnome/gsettings-desktop-schemas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6022fea0b7e..06d59bdb978 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gsettings-desktop-schemas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gsettings-desktop-schemas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,9 +39,6 @@ post-patch {
</span> reinplace "s|#!.*|#!${prefix}/bin/python3.8|" ${worksrcpath}/build-aux/meson/post-install.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2-devel/Portfile b/gnome/gtk2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 697791dc382..be6b0cbcb4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,9 +70,6 @@ configure.ccache no
</span> configure.cppflags-append -DX_LOCALE -D_IPP_PRIVATE_STRUCTURES=1
configure.cflags-append -fstrict-aliasing
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2/Portfile b/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f6ca050f91f..ecb7801304e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,9 +70,6 @@ configure.ccache no
</span> configure.cppflags-append -DX_LOCALE -D_IPP_PRIVATE_STRUCTURES=1
configure.cflags-append -fstrict-aliasing
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3-devel/Portfile b/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b3565a1ef60..c6847e829eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,10 +74,6 @@ if {[variant_isset quartz]} {
</span> compiler.blacklist *gcc-3.* *gcc-4.* {clang < 300}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3/Portfile b/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c9cb5c09c2f..0022bb36b93 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,10 +74,6 @@ if {[variant_isset quartz]} {
</span> compiler.blacklist *gcc-3.* *gcc-4.* {clang < 300}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtksourceview4/Portfile b/gnome/gtksourceview4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ed9673d4c4..a9b8f010365 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtksourceview4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtksourceview4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,9 +50,6 @@ configure.args -Dgtk_doc=true
</span> # error: declaration of 'index' shadows a global declaration
configure.cflags-append -Wno-shadow
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gucharmap/Portfile b/gnome/gucharmap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0bf62157eea..3f7c921d05b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gucharmap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gucharmap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,9 +84,6 @@ compiler.blacklist-append {clang < 700}
</span>
configure.args -Ducd_path=${workpath}/UCD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libchamplain/Portfile b/gnome/libchamplain/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a688a79936a..d1650cc0048 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libchamplain/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libchamplain/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +37,6 @@ depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span>
configure.args -Dgtk_doc=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgdata/Portfile b/gnome/libgdata/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 88e263d9b67..a9aad991e3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgdata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgdata/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,9 +44,6 @@ configure.args -Dgtk_doc=true
</span>
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgit2-glib/Portfile b/gnome/libgit2-glib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06a65bd66d6..1a22d4ca345 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgit2-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgit2-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,9 +59,6 @@ platform darwin 8 {
</span> destroot.env-append "DYLD_LIBRARY_PATH=${build_dir}/${name}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libhandy-0.0/Portfile b/gnome/libhandy-0.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42685d11ae3..c4024c6382a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libhandy-0.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libhandy-0.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,10 +50,6 @@ configure.args -Dintrospection=enabled \
</span> -Dtests=false \
-Dbuildtype=plain
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libhandy/Portfile b/gnome/libhandy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b502f7f3dad..01dc5598380 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libhandy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libhandy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,9 +46,6 @@ configure.args -Dintrospection=enabled \
</span> -Dtests=false \
-Dbuildtype=plain
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libpeas/Portfile b/gnome/libpeas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2497619776c..dbd8b6d7500 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libpeas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libpeas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,9 +43,6 @@ platform darwin 8 {
</span> destroot.env-append "DYLD_LIBRARY_PATH=${build_dir}/${name}:${build_dir}/${name}-gtk"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libsoup-devel/Portfile b/gnome/libsoup-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a3753de41cc..67704b2baa8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libsoup-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libsoup-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,9 +73,6 @@ post-patch {
</span> ${worksrcpath}/tests/http2-server.py
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libsoup/Portfile b/gnome/libsoup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ceabdf7261f..ae2f179c1a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libsoup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libsoup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,9 +59,6 @@ configure.args -Dbrotli=enabled \
</span> -Dvapi=enabled \
-Dtests=false
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/totem-pl-parser/Portfile b/gnome/totem-pl-parser/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3356952eb77..ff5c47bebe0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/totem-pl-parser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/totem-pl-parser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,6 @@ configure.args -Denable-libarchive=yes \
</span> -Denable-quvi=yes \
-Denable-gtk-doc=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<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 57fd66458a5..8a82306d747 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;'>@@ -56,9 +56,6 @@ compiler.blacklist-append *gcc-3.* *gcc-4.*
</span> # ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<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 2de423ece6f..8371683f90b 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;'>@@ -56,9 +56,6 @@ compiler.blacklist-append *gcc-3.* *gcc-4.*
</span> # ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<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 a5fa587ae11..e4128ad2dcc 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;'>@@ -51,9 +51,6 @@ build.args PREFIX=${prefix} \
</span> 'exif=1' \
'verscmp=0'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
foreach arch ${universal_archs_supported} {
lappend merger_build_env(${arch}) \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gdk-pixbuf2-devel/Portfile b/graphics/gdk-pixbuf2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5475878031d..e096d4f66c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gdk-pixbuf2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gdk-pixbuf2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,10 +61,6 @@ configure.ldflags-append \
</span> configure.args-append \
-Dgtk_doc=false
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gdk-pixbuf2/Portfile b/graphics/gdk-pixbuf2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 612b16f6d3d..7dfee6d6714 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gdk-pixbuf2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gdk-pixbuf2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,10 +61,6 @@ configure.ldflags-append \
</span> configure.args-append \
-Dgtk_doc=false
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl-0.3/Portfile b/graphics/gegl-0.3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b03ee82b7de..33d1e0807b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl-0.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl-0.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,9 +98,6 @@ post-destroot {
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {${universal_possible} && [variant_isset universal]} {
# In order to build universal on Leopard, you need MacPorts 2.1
set merger_configure_args(x86_64) --build=${configure.build_arch}-apple-${os.platform}${os.version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl-devel/Portfile b/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 611ba8c9682..88ad9351339 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,9 +111,6 @@ platform darwin powerpc {
</span> # }
#}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/Portfile b/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a80d17fc23..d53f7947458 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,9 +112,6 @@ platform darwin powerpc {
</span> # }
#}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<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 9d26a0e1091..3076cf7d3fd 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;'>@@ -59,9 +59,6 @@ if {${build_arch} eq "arm64"} {
</span> supported_archs ppc ppc64
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libQGLViewer/Portfile b/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e89b366357c..5a4cfe9b306 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +42,6 @@ post-patch {
</span> reinplace "s|@@QT_PLUGINS_DIR@@|${qt_plugins_dir}|g" ${worksrcpath}/designerPlugin/designerPlugin.pro
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {[variant_isset qt4] && (!${universal_possible} || ![variant_isset universal])} {
configure.pre_args-append "CONFIG+=\"${qt_arch_types}\""
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjpeg-turbo-devel/Portfile b/graphics/libjpeg-turbo-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 629abe18f72..4ac475bb8b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libjpeg-turbo-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libjpeg-turbo-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,9 +39,6 @@ checksums rmd160 b8b2d64f4627b2d0aa7d6c4d1e5c8162af7aa2e7 \
</span>
configure.args -DWITH_JPEG8=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
if {"x86_64" in ${configure.universal_archs} || "i386" in ${configure.universal_archs}} {
depends_build-append port:nasm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libjpeg-turbo/Portfile b/graphics/libjpeg-turbo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f284ee3146b..c32ee96360f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libjpeg-turbo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libjpeg-turbo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,9 +39,6 @@ checksums rmd160 b8b2d64f4627b2d0aa7d6c4d1e5c8162af7aa2e7 \
</span>
configure.args -DWITH_JPEG8=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
if {"x86_64" in ${configure.universal_archs} || "i386" in ${configure.universal_archs}} {
depends_build-append port:nasm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libmediaart/Portfile b/graphics/libmediaart/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 676e2545c7b..c312dee1530 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libmediaart/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libmediaart/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,6 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span>
configure.args -Dgtk_doc=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mozjpeg/Portfile b/graphics/mozjpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 294e11c48fb..15011abca54 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mozjpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mozjpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,6 @@ array set merger_host {
</span> x86_64 x86_64-apple-darwin
i386 i686-apple-darwin
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {(!${universal_possible} || ![variant_isset universal])
&& [info exists merger_host(${configure.build_arch})]} {
configure.args-append --host=$merger_host(${configure.build_arch})
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/dmd-tools/Portfile b/lang/dmd-tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a10691e7d4..834c5987da6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/dmd-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/dmd-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +40,6 @@ destroot.args -f posix.mak \
</span> INSTALL_DIR=${destroot}${prefix} \
PREFIX=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
build.args-append MODEL=64
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/dmd/Portfile b/lang/dmd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 665c829ddd6..0c0c29294d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/dmd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/dmd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,9 +47,6 @@ build.args -f posix.mak all man \
</span> SYSCONFDIR=${prefix}/etc/${name} \
HOST_DMD=${prefix}/libexec/dmd-bootstrap/bin/dmd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
build.args-append MODEL=64
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/druntime/Portfile b/lang/druntime/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 964b64d1198..171894833f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/druntime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/druntime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,6 @@ build.args -f posix.mak \
</span> DMD_DIR=${prefix}/share/dmd
build.target ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
build.args-append MODEL=64
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mozjs52/Portfile b/lang/mozjs52/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c1fd228269..c8ef9d92202 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mozjs52/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mozjs52/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,9 +90,6 @@ variant profiling description {Set compile flags necessary for using sampling pr
</span> configure.args-append --enable-profiling
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mozjs60/Portfile b/lang/mozjs60/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 65b31691a2f..2514c014fcb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mozjs60/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mozjs60/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,9 +79,7 @@ post-destroot {
</span> # make static lib name version specific to avoid conflict with other mozjs versions
move ${destroot}${prefix}/lib/libjs_static.ajs ${destroot}${prefix}/lib/libjs60_static.ajs
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${universal_possible} && [variant_isset universal]} {
merger-post-destroot {
foreach arch ${universal_archs_to_use} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mozjs68/Portfile b/lang/mozjs68/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2514c0caab4..95781bf6573 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mozjs68/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mozjs68/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,9 +103,6 @@ post-destroot {
</span> # make static lib name version specific to avoid conflict with other mozjs versions
move ${destroot}${prefix}/lib/libjs_static.ajs ${destroot}${prefix}/lib/libjs${version_major}_static.ajs
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
if {${universal_possible} && [variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mozjs91/Portfile b/lang/mozjs91/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a67203d739..cfd89bf7063 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mozjs91/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mozjs91/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,9 +105,6 @@ post-destroot {
</span> # make static lib name version specific to avoid conflict with other mozjs versions
move ${destroot}${prefix}/lib/libjs_static.ajs ${destroot}${prefix}/lib/libjs${version_major}_static.ajs
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
if {${universal_possible} && [variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/phobos/Portfile b/lang/phobos/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c9a1c5f5432..05752636972 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/phobos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/phobos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,9 +55,6 @@ build.args -f posix.mak \
</span> DMD=${prefix}/bin/dmd
build.target ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!(${universal_possible} && [variant_isset universal])} {
if { ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64" } {
build.args-append MODEL=64 DRUNTIME=${workpath}/druntime/${build_arch}/libdruntime.a
<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 613de13c8c4..b40040861ba 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;'>@@ -91,9 +91,6 @@ configure.args --enable-shared \
</span> --with-openssl-lib=${prefix}/lib/openssl-1.0 \
--disable-ucontext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {(!${universal_possible} || ![variant_isset universal]) && ${configure.build_arch} ne ""} {
configure.env-append "ARCH_FLAG=-arch ${configure.build_arch}"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/OpenBLAS/Portfile b/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ec52c61086..8d7a03f76a6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -254,9 +254,6 @@ platform darwin 8 {
</span>
destroot.args "PREFIX=${prefix}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
merger-post-destroot {
foreach arch ${universal_archs_to_use} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gr1c/Portfile b/math/gr1c/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 697ddb45dd6..9b6e56116cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gr1c/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gr1c/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,9 +45,6 @@ foreach arch ${configure.universal_archs} {
</span> LD='ld -r -arch ${arch}'
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {(!${universal_possible} || ![variant_isset universal]) && [info exists merger_build_args(${build_arch})]} {
build.args-append $merger_build_args(${build_arch})
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gts/Portfile b/math/gts/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 561a1636da7..fa9c8096a43 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gts/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gts/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,6 @@ post-extract {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
# Find architectures which will not run on build platform.
if {${os.major} >= 9 && [sysctl hw.cpu64bit_capable] == 1} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/lp_solve/Portfile b/math/lp_solve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8040593342e..9789268d49e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/lp_solve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/lp_solve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,6 @@ master_sites sourceforge:project/lpsolve/lpsolve/${version}
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
set merger_must_run_binaries yes
foreach arch ${configure.universal_archs} {
<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 ef76d5abbd1..367a4f3806e 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;'>@@ -53,10 +53,6 @@ configure.optflags -O3
</span> configure.cflags-append -fPIC
configure.fflags-append -fPIC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # when using a non-GCC compiler, avoid:
# Undefined symbols for architecture i386:
# "___divmoddi4", referenced from:
<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 115fcce3f2a..e579a359262 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;'>@@ -657,9 +657,6 @@ post-destroot {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # generate default octave_packages file so that it is removed if Octave is uninstalled
if {!${universal_possible} || ![variant_isset universal]} {
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/petsc/Portfile b/math/petsc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d0e5db84e88..f7e09f32963 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/petsc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/petsc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,10 +93,6 @@ post-build {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${universal_possible} && [variant_isset universal]} {
merger-post-destroot {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/slepc/Portfile b/math/slepc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0cff60923c2..1dec4cbc376 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/slepc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/slepc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,9 +47,6 @@ depends_build-append port:sowing \
</span> configure.env-append PATH=${frameworks_dir}/Python.framework/Versions/${python_ver_dot}/bin:$env(PATH)
configure.pre_args --prefix=${prefix}/lib/slepc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
configure.env-append PETSC_DIR=${prefix}/lib/petsc
build.env-append PETSC_DIR=${prefix}/lib/petsc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/aom/Portfile b/multimedia/aom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e0883b3842b..72fecb117f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/aom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/aom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,10 +46,6 @@ configure.args-append -DBUILD_SHARED_LIBS=ON \
</span> -DPERL_EXECUTABLE=${prefix}/bin/perl \
-DPYTHON_EXECUTABLE=${prefix}/bin/python${pyver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # a `native` variant is not needed since aom does runtime CPU detection
# see https://github.com/macports/macports-ports/commit/6a1f839833a71be9b6c69d7e6ddca7a039d46673#commitcomment-49053438
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/dav1d/Portfile b/multimedia/dav1d/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b1aaed5ce10..58a01ff4bae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/dav1d/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/dav1d/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,9 +58,6 @@ variant test description {enable tests} {
</span> test.target test
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
lappend merger_configure_env(i386) LDFLAGS=-Wl,-read_only_relocs,suppress,-no_compact_unwind
} elseif {${configure.build_arch} eq "i386"} {
<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 ba2d0effa3a..64ff111a35d 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;'>@@ -271,9 +271,6 @@ platform darwin 8 {
</span>
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
set merger_host($arch) ""
<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 1b9871de163..df902f29c6a 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;'>@@ -278,9 +278,6 @@ platform darwin 8 {
</span>
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
set merger_host($arch) ""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx-devel/Portfile b/multimedia/libvpx-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 443ddcfab84..b367e5e00be 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,10 +86,6 @@ if {"${configure.sdkroot}" eq ""} {
</span> configure.sdkroot "/"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${universal_possible} && [variant_isset universal]} {
# universal build using muniversal portgroup
<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 2b88b8f6bc7..a974bde367b 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;'>@@ -86,10 +86,6 @@ if {"${configure.sdkroot}" eq ""} {
</span> configure.sdkroot "/"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${universal_possible} && [variant_isset universal]} {
# universal build using muniversal portgroup
<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 b8e0ad7797b..4ca56f1f736 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;'>@@ -130,9 +130,6 @@ post-configure {
</span>
build.args-append CC="${configure.cc}" CXX="${configure.cxx}" CPP="${configure.cpp}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
lappend merger_build_env(${arch}) "CFLAGS=${configure.cflags} -arch ${arch}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x264/Portfile b/multimedia/x264/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 081a3d699a8..a5fbe0e737d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/x264/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/x264/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,9 +53,6 @@ configure.args --enable-pic \
</span> # i386 clang build issues remain which break i386 build when asm optimizations are enabled
# assert configure option --disable-asm for all i386 builds
# see https://mailman.videolan.org/pipermail/x264-devel/2014-February/010371.html, #42672.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${os.platform} eq "darwin" && ${configure.build_arch} ne "" && (!${universal_possible} || ![variant_isset universal])} {
if {${configure.build_arch} eq "i386"} {
configure.args-append --host=i686-apple-darwin${os.major} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/libgweather/Portfile b/net/libgweather/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30f3d500ea3..ec8261634f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/libgweather/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/libgweather/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,9 +54,6 @@ platform darwin 8 {
</span> destroot.env-append "DYLD_LIBRARY_PATH=${build_dir}/${name}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gobject3/Portfile b/python/py-gobject3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 78ff88beffc..b7f45486f9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gobject3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gobject3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,9 +67,6 @@ if {${name} ne ${subport}} {
</span>
destroot.cmd ${build.cmd}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> # uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-sip4/Portfile b/python/py-sip4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 203571a7959..4e851594758 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-sip4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-sip4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,9 +94,6 @@ if {${name} ne ${subport}} {
</span> # always add some arch flags, since the user might have overridden
# the default arch build (e.g., ticket #44086).
python.add_archflags no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libsc/Portfile b/science/libsc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c9b20df44f0..306e939b1d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libsc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libsc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,9 +59,6 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
# remove arch flags
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/netcdf-fortran/Portfile b/science/netcdf-fortran/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c68c8831be..bfd07a8ea4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/netcdf-fortran/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/netcdf-fortran/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,9 +57,6 @@ if {${os.arch} eq "i386"} {
</span> set universal_archs_supported "ppc ppc64"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
patchfiles-append patch-Makefile.in.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/netcdf/Portfile b/science/netcdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9661490b919..38d71213253 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/netcdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/netcdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,10 +46,6 @@ configure.args-append -DENABLE_NETCDF_4=OFF \
</span> test.run yes
test.target test
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> default_variants +netcdf4 +dap
if {(!${universal_possible} || ![variant_isset universal]) && (${build_arch} == "x86_64" || ${build_arch} == "ppc64")} {
default_variants-append +cdf5
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/opencascade/Portfile b/science/opencascade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e840ae7b2c..a9283f7c58b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/opencascade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/opencascade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,9 +66,6 @@ variant docs description {Build and install documentation} {
</span> configure.args-delete -DBUILD_DOC_Overview=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
set merger_dont_diff ${prefix}/bin/custom.sh
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/p4est/Portfile b/science/p4est/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ae5e3e6b49..aaed521c4fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/p4est/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/p4est/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +61,6 @@ variant petsc description {build with PETSc support} {
</span> mpi.enforce_variant petsc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
# remove arch flags
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/Portfile b/science/plplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ffdf571ede..0ec0505a5ec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,9 +129,6 @@ post-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\" -DENABLE_fortran:BOOL=OFF
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot510/Portfile b/science/plplot510/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ed051c71924..bac8395c1da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot510/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot510/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,9 +128,6 @@ pre-configure {
</span> file mkdir ${workpath}/build
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\" -DENABLE_f95:BOOL=OFF
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tigervnc/Portfile b/x11/tigervnc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ccd54cc956a..ae564f04e5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tigervnc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tigervnc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +48,6 @@ if {[file exists ${prefix}/include/os/os.h]} {
</span>
build.target translations dmg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
merger-post-destroot {
foreach arch ${universal_archs_to_use} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tk/Portfile b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3330f53f33a..0cae049c693 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,9 +62,6 @@ post-destroot {
</span> ln -s libtk8.6.dylib ${destroot}${prefix}/lib/libtk.dylib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {!${universal_possible} || ![variant_isset universal]} {
if {${configure.build_arch} eq "x86_64" || ${configure.build_arch} eq "ppc64"} {
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-crossover/Portfile b/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b4266782439..953d34a903c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-crossover/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,9 +253,6 @@ if {${build_arch} eq "x86_64" && ${os.major} < 18} {
</span> default_variants +universal
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
supported_archs i386 x86_64
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-devel/Portfile b/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 858cc1ed550..c9da25c73bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,9 +241,6 @@ if {${build_arch} eq "x86_64" && ${os.major} < 18} {
</span> default_variants +universal
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
supported_archs i386 x86_64
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/Portfile b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fa75fc98e94..7efe4c95a1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,9 +241,6 @@ if {${build_arch} eq "x86_64" && ${os.major} < 18} {
</span> default_variants +universal
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> if {${universal_possible} && [variant_isset universal]} {
supported_archs i386 x86_64
} else {
</pre><pre style='margin:0'>
</pre>