<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/e63f3b5c491829b66e8edf40f9e85cd4d69946d3">https://github.com/macports/macports-ports/commit/e63f3b5c491829b66e8edf40f9e85cd4d69946d3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e63f3b5c491 nomaintainer ports: remove universal_possible compat code
</span>e63f3b5c491 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e63f3b5c491829b66e8edf40f9e85cd4d69946d3
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Oct 10 05:39:07 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> nomaintainer ports: remove universal_possible compat code
</span>---
archivers/ucl/Portfile | 3 ---
audio/mpg123/Portfile | 3 ---
audio/wavpack/Portfile | 3 ---
databases/db53/Portfile | 3 ---
databases/db62/Portfile | 3 ---
databases/leveldb/Portfile | 3 ---
databases/postgresql82/Portfile | 3 ---
databases/postgresql90/Portfile | 3 ---
databases/postgresql91/Portfile | 3 ---
databases/postgresql92/Portfile | 3 ---
devel/atk/Portfile | 3 ---
devel/dparser/Portfile | 3 ---
devel/dub/Portfile | 3 ---
devel/judy/Portfile | 3 ---
devel/libgii/Portfile | 3 ---
devel/liboil/Portfile | 3 ---
devel/nspr/Portfile | 3 ---
devel/openssl10/Portfile | 3 ---
devel/openssl11/Portfile | 3 ---
devel/orbit2/Portfile | 3 ---
devel/pth/Portfile | 3 ---
devel/tbb/Portfile | 3 ---
emulators/mednafen/Portfile | 3 ---
gnome/gcab/Portfile | 3 ---
gnome/gstreamer010-gst-ffmpeg/Portfile | 3 ---
gnome/gstreamer010-gst-plugins-bad/Portfile | 4 ----
gnome/gstreamer010-gst-plugins-base/Portfile | 3 ---
gnome/gstreamer010-gst-plugins-gl/Portfile | 3 ---
gnome/gstreamer010-gst-plugins-good/Portfile | 3 ---
gnome/gstreamer010-gst-plugins-ugly/Portfile | 3 ---
gnome/gstreamer010/Portfile | 3 ---
gnome/gstreamer1-gst-libav/Portfile | 3 ---
gnome/gstreamer1-gst-plugins-bad/Portfile | 4 ----
gnome/gstreamer1-gst-plugins-base/Portfile | 4 ----
gnome/gstreamer1-gst-plugins-good/Portfile | 3 ---
gnome/gstreamer1-gst-plugins-ugly/Portfile | 3 ---
gnome/gstreamer1/Portfile | 3 ---
gnome/libdazzle/Portfile | 3 ---
graphics/lcms2/Portfile | 3 ---
graphics/libggi/Portfile | 3 ---
graphics/libggiwmh/Portfile | 4 +---
graphics/povray/Portfile | 3 ---
lang/chicken/Portfile | 3 ---
lang/guile18/Portfile | 3 ---
lang/spidermonkey/Portfile | 3 ---
lang/squeak/Portfile | 3 ---
math/DSDP/Portfile | 3 ---
math/arpack/Portfile | 3 ---
multimedia/XviD/Portfile | 3 ---
multimedia/libass/Portfile | 3 ---
net/nss/Portfile | 3 ---
python/py27-gobject3/Portfile | 3 ---
security/botan/Portfile | 3 ---
security/botan1/Portfile | 3 ---
sysutils/augeas/Portfile | 3 ---
sysutils/findutils/Portfile | 3 ---
sysutils/memcached/Portfile | 3 ---
textproc/juman6/Portfile | 3 ---
www/webkit-gtk-2.0/Portfile | 4 ----
www/webkit-gtk/Portfile | 4 ----
60 files changed, 1 insertion(+), 185 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/ucl/Portfile b/archivers/ucl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6916e96661b..941310277a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/ucl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/ucl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +42,6 @@ configure.env F77=no
</span> # Because the configure script doesn't save the LDFLAGS MacPorts sets.
merger_arch_flag no
merger_arch_compiler 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> if {!${universal_possible} || ![variant_isset universal]} {
configure.cc-append [get_canonical_archflags]
}
<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 353e5e6b791..ab26e27bb07 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/audio/wavpack/Portfile b/audio/wavpack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 838c137ce27..9079c94b403 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/wavpack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/wavpack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,9 +46,6 @@ lappend merger_configure_args(arm64) --disable-asm
</span> # if host is not set in 32-bit mode, wrong assembly code is used
lappend merger_configure_args(i386) --host=i686-apple-${os.platform}${os.version}
<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/databases/db53/Portfile b/databases/db53/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0029e88b18..ea10abcf68d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/db53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/db53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,9 +103,6 @@ variant umrw description {Mask harmless uninitialized memory read/writes for the
</span> configure.args-append --enable-umrw
}
<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 fails with aarch64 but it seems to work fine with arm
set merger_host(arm64) arm-apple-${os.platform}${os.version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/db62/Portfile b/databases/db62/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d36af071a65..52d360ab564 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/db62/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/db62/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,9 +96,6 @@ variant tcl description {build Tcl API} {
</span> configure.args-append --enable-tcl --with-tcl=${prefix}/lib
}
<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 fails with aarch64 but it seems to work fine with arm
set merger_host(arm64) arm-apple-${os.platform}${os.version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/leveldb/Portfile b/databases/leveldb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 780a6e25116..3eca39beda4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/leveldb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/leveldb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,6 @@ if {[string match *clang* ${configure.cxx}]} {
</span> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![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}) \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql82/Portfile b/databases/postgresql82/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f79bdeb225c..712bb3e559e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql82/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql82/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,9 +54,6 @@ configure.args --sysconfdir=${prefix}/etc/${name} \
</span> --enable-thread-safety \
--enable-integer-datetimes
<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]} {
post-patch {
xinstall -m 755 ${filespath}/ldfat.sh ${workpath}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql90/Portfile b/databases/postgresql90/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d8db4ef009..ab8455a5ba0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql90/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql90/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,9 +68,6 @@ configure.cppflags-append -I${prefix}/include/ossp
</span> # building psql with clang from Xcode prior to 4.4 causes segfault on query; see #31717
compiler.blacklist-append {clang < 421}
<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.cflags-append -DAC_APPLE_UNIVERSAL_BUILD
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql91/Portfile b/databases/postgresql91/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e5df2f20579..6d80dfa8b68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql91/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql91/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,9 +68,6 @@ configure.cppflags-append -I${prefix}/include/ossp
</span> # building psql with clang from Xcode prior to 4.4 causes segfault on query; see #31717
compiler.blacklist-append {clang < 421}
<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.cflags-append -DAC_APPLE_UNIVERSAL_BUILD
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgresql92/Portfile b/databases/postgresql92/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f9a35c1106..16bba3255cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgresql92/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgresql92/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,9 +69,6 @@ configure.ldflags-append -headerpad_max_install_names
</span> # building psql with clang from Xcode prior to 4.4 causes segfault on query; see #31717
compiler.blacklist-append {clang < 421}
<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.cflags-append -DAC_APPLE_UNIVERSAL_BUILD
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/atk/Portfile b/devel/atk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4859a5cb83a..1f5b56b2900 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/atk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/atk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +37,6 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span>
configure.args -Ddocs=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/devel/dparser/Portfile b/devel/dparser/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f8fdf96a67..daf969dcf70 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/dparser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/dparser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,6 @@ patchfiles patch-Makefile-put-man-in-share.diff
</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]} {
build.args-append CC="${configure.cc} ${configure.cflags} [get_canonical_archflags cc]" PREFIX=${prefix}
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/dub/Portfile b/devel/dub/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33799d257e7..92a82d98721 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/dub/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/dub/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,9 +45,6 @@ patchfiles-append patch-dub.d.diff
</span> post-patch {
reinplace "s|__MACPORTS_PREFIX__|${prefix}|g" source/dub/dub.d
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![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.env-append "DMD=${prefix}/bin/dmd -m64"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/judy/Portfile b/devel/judy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df4a2d92698..d6ab2f317a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/judy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/judy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,6 @@ set merger_configure_args(ppc) --enable-32-bit
</span> set merger_configure_args(ppc64) --enable-64-bit
set merger_configure_args(x86_64) --enable-64-bit
<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/libgii/Portfile b/devel/libgii/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a409ac223ec..dc8449855ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libgii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libgii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +40,6 @@ configure.args --mandir=${prefix}/share/man
</span> if {${build_arch} eq "x86_64" && ${os.platform} eq "darwin"} {
configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
}
<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] && [string match *64* ${configure.universal_archs}])
|| ((!${universal_possible} || ![variant_isset universal]) && [string match *64 ${configure.build_arch}])} {
# uses carbon event manager functions with no 64-bit version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/liboil/Portfile b/devel/liboil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a5a28b98fdf..ec4fd19ae17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/liboil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/liboil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,6 @@ patchfiles patch-liboil_liboilcpu-x86.c.diff automake.patch
</span> use_autoreconf yes
autoreconf.args -fvi
<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(i386) i686-apple-${os.platform}${os.major}
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nspr/Portfile b/devel/nspr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96282b10cf2..7e3d79a4392 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nspr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nspr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,6 @@ configure.args \
</span> --enable-optimize='${configure.optflags}' \
--libdir=${prefix}/lib/nspr
<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} in [list arm64 ppc64 x86_64]} {
configure.args-append --enable-64bit
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl10/Portfile b/devel/openssl10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e88c57b9917..723634b3f49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,9 +81,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/devel/openssl11/Portfile b/devel/openssl11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ecc5258dfbf..6101ef9c37f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,9 +90,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/devel/orbit2/Portfile b/devel/orbit2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9743d3cb6b9..2e38443aec4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/orbit2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/orbit2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,9 +43,6 @@ set merger_dont_diff "${prefix}/include/orbit-2.0/orbit/orbit-config.h"
</span> test.run yes
test.target check
<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.arch} eq "i386" } {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/pth/Portfile b/devel/pth/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 683f0844bc9..10a9b23f4e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/pth/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/pth/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,6 @@ post-configure {
</span> use_parallel_build no
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> # makecontext/setcontext (the default) is leading to infinite loops in programs on PPC-platforms.
# Switch to setjmp/longjmp when building for one of these platforms.
# Latter should work equally well on x86(_64).
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tbb/Portfile b/devel/tbb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3725d3bee37..08dcff0c04c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tbb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tbb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,9 +71,6 @@ test.run yes
</span> test.target test
test.args-append ${build.args}
<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_build_args(${arch}) arch=$tbb_arch(${arch})
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/mednafen/Portfile b/emulators/mednafen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 76f332b2ddb..6ed5ba963b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/mednafen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/mednafen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,9 +89,6 @@ lappend merger_configure_args(ppc) --host=powerpc-apple-darwin${os.version}
</span> lappend merger_configure_args(ppc64) --host=powerpc-apple-darwin${os.version}
lappend merger_configure_args(x86_64) --host=x86_64-apple-darwin${os.version}
<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/gcab/Portfile b/gnome/gcab/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 04717416df1..6bf6ad50b7d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gcab/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gcab/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,9 +37,6 @@ patchfiles dont-use-version-script.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> # 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/gstreamer010-gst-ffmpeg/Portfile b/gnome/gstreamer010-gst-ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 01df862746e..9d2d8b5bb88 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer010-gst-ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer010-gst-ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,9 +55,6 @@ if {[lsearch [get_canonical_archs] i386] != -1} {
</span> compiler.blacklist-append gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
}
<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/gnome/gstreamer010-gst-plugins-bad/Portfile b/gnome/gstreamer010-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86d4cdb07fd..59500ac6fca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer010-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer010-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,10 +127,6 @@ variant faac description {Enable faac AAC plugin} {
</span> notes-append "Use of the +faac variant may affect licensing due to the restrictive license of port faac itself."
}
<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> # osxvideosrc is disabled by configure on 64 bit archs so disable if universal variant is set
if {${universal_possible} && [variant_isset universal]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer010-gst-plugins-base/Portfile b/gnome/gstreamer010-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 509c7689dfe..8fc925587e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer010-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer010-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,9 +101,6 @@ variant cdparanoia description {Enable (currently broken) cdparanoia plugin} {
</span>
default_variants +gnome_vfs +ogg +x11
<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> #-fgcse (from -O2) causes build failures, but -O2 -fno-gcse doesn't seem to work
if {[string match "*gcc-4.2" ${configure.compiler}]} {
lappend merger_configure_cflags(i386) -O1 -fexpensive-optimizations
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer010-gst-plugins-gl/Portfile b/gnome/gstreamer010-gst-plugins-gl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a1056bfe3c6..8f1047a9dce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer010-gst-plugins-gl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer010-gst-plugins-gl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,9 +56,6 @@ post-patch {
</span> ${worksrcpath}/gst-libs/gst/gl/Makefile.am
}
<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/gnome/gstreamer010-gst-plugins-good/Portfile b/gnome/gstreamer010-gst-plugins-good/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 77f82271614..2faf959d869 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer010-gst-plugins-good/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer010-gst-plugins-good/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,9 +88,6 @@ variant pulseaudio description {Enable PulseAudio plugin} {
</span>
default_variants +pulseaudio
<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/gnome/gstreamer010-gst-plugins-ugly/Portfile b/gnome/gstreamer010-gst-plugins-ugly/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 190e3ff2aaa..da5f2cdedda 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer010-gst-plugins-ugly/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer010-gst-plugins-ugly/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,9 +55,6 @@ post-extract {
</span> ${worksrcpath}/configure
}
<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/gnome/gstreamer010/Portfile b/gnome/gstreamer010/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f570404d4ad..47c8e3f3934 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer010/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer010/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,9 +55,6 @@ configure.args-append \
</span> --disable-examples \
--disable-silent-rules
<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/gnome/gstreamer1-gst-libav/Portfile b/gnome/gstreamer1-gst-libav/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 429bf29ea3d..3781b2bbe1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-libav/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-libav/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,9 +47,6 @@ configure.args-append \
</span> --disable-fatal-warnings \
--disable-silent-rules
<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/gnome/gstreamer1-gst-plugins-bad/Portfile b/gnome/gstreamer1-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b8b52164e4c..25193c2dc05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,10 +159,6 @@ variant x11 {
</span>
default_variants +x11
<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> platform macosx {
if {![variant_isset x11] && (!${universal_possible} || ![variant_isset universal]) && ${os.major} >= 13} {
# Apple_Media requires CGL, which can only be provided on newer platforms and without X11 enabled.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1-gst-plugins-base/Portfile b/gnome/gstreamer1-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a3f8630a5e..fafe7b36b9c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,10 +110,6 @@ variant x11 {
</span> # Prefer X11 implementation.
default_variants +x11
<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> # Cocoa-GL
# Only enable on OS X 10.9 or later, if the x11 variant is not enabled.
# Requires ARC (automatic reference counting, a clang feature enabled by
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1-gst-plugins-good/Portfile b/gnome/gstreamer1-gst-plugins-good/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e02f2a00597..ab1052e010e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-good/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-good/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,9 +138,6 @@ variant qt description {Enable QT5 MAC windowing elements } {
</span> configure.cxxflags-append -std=c++11
}
<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/gnome/gstreamer1-gst-plugins-ugly/Portfile b/gnome/gstreamer1-gst-plugins-ugly/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0fc528cc44b..c2e161c6a4e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-ugly/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-ugly/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,9 +44,6 @@ configure.args-append \
</span>
configure.cflags-append -funroll-loops -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> 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/gnome/gstreamer1/Portfile b/gnome/gstreamer1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a30c2ed3ca..c30e50108f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,9 +73,6 @@ configure.args-append \
</span> --without-dw \
--without-unwind
<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/gnome/libdazzle/Portfile b/gnome/libdazzle/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9cfe09c2d09..ca303cac0a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libdazzle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libdazzle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,9 +39,6 @@ depends_lib-append port:gobject-introspection \
</span>
compiler.c_standard 2011
<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/lcms2/Portfile b/graphics/lcms2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc18c9126f3..c71bf351682 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/lcms2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/lcms2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,6 @@ depends_lib path:include/turbojpeg.h:libjpeg-turbo \
</span>
# the i386 warning causes the universal build to fail
# https://trac.macports.org/ticket/60656
<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 {[vercmp ${xcodeversion} 10.0] >= 0 && ${universal_possible} && [variant_isset universal]} {
configure.ldflags-append -w
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libggi/Portfile b/graphics/libggi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a573df4034b..f487df85954 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libggi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libggi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,6 @@ post-patch {
</span> }
configure.args --mandir=${prefix}/share/man
<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] && [string match *64* ${configure.universal_archs}])
|| ((!${universal_possible} || ![variant_isset universal]) && [string match *64 ${configure.build_arch}])} {
# actually uses a lot of old QuickDraw stuff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libggiwmh/Portfile b/graphics/libggiwmh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e540bdabfb..fb58c35eaea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libggiwmh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libggiwmh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,7 @@ post-patch {
</span> }
configure.args --mandir=${prefix}/share/man
<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] && [string match *64* ${configure.universal_archs}])
|| ((!${universal_possible} || ![variant_isset universal]) && [string match *64 ${configure.build_arch}])} {
# uses carbon window manager functions with no 64-bit version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/povray/Portfile b/graphics/povray/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 579a05e072b..005ac778a9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/povray/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/povray/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,9 +108,6 @@ platform darwin {
</span> set merger_configure_args(${arch}) --build=$merger_host(${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_configure_args(${configure.build_arch})]} {
configure.args-append --host=$merger_host(${configure.build_arch}) $merger_configure_args(${configure.build_arch})
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/chicken/Portfile b/lang/chicken/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a1ca37f99f5..239e8517563 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/chicken/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/chicken/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,6 @@ build.args C_COMPILER=${configure.cc} \
</span> # Upstream does not support parallel builds.
use_parallel_build 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> # Correctly identify selected arch(s) to build system.
array set archs {ppc ppc.darwin ppc64 ppc.darwin i386 x86 x86_64 x86-64}
if {${universal_possible} && [variant_isset universal]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/guile18/Portfile b/lang/guile18/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd3aafced81..166e5df350e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/guile18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/guile18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,9 +94,6 @@ if {${os.arch} eq "i386" && ${os.major} >= 11} {
</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]} {
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/spidermonkey/Portfile b/lang/spidermonkey/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a7dc712770c..97effa3e541 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/spidermonkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/spidermonkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,9 +51,6 @@ build.args -f Makefile.ref \
</span> JS_THREADSAFE=1 \
JS_READLINE=1
<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 CC='${configure.cc} -arch ${build_arch}'
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/squeak/Portfile b/lang/squeak/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 32b3c4ef814..44ab3d4aa35 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/squeak/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/squeak/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,9 +101,6 @@ post-destroot {
</span> system "cd ${destroot}${datadir} && ln -s ${squeak_img_changes}.gz squeak.changes.gz"
}
<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> # "quartz" support uses NSQuickDrawView
if {${os.subplatform} eq "macosx" &&
((!(${universal_possible} && [variant_isset universal]) && ![string match *64 ${configure.build_arch}]) ||
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/DSDP/Portfile b/math/DSDP/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dc921e06f9a..478dbf4449c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/DSDP/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/DSDP/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +34,6 @@ patchfiles patch-make.include.diff \
</span> use_configure no
build.target dsdpapi
<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.env-append \
DSDPROOT=${worksrcpath} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/arpack/Portfile b/math/arpack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f9c600ad01b..21a7208dcba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/arpack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/arpack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,6 @@ configure.args home=${worksrcpath} --disable-mpi
</span> # add missing arch flags to one Makefile
patchfiles-append patch-Makefile.am.diff
<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]} {
post-configure {
if {${build_arch} eq "arm64" || ${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/XviD/Portfile b/multimedia/XviD/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6a507a51f0..c4f8403b7d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/XviD/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/XviD/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,9 +57,6 @@ platform darwin {
</span> # See https://trac.macports.org/ticket/32802
lappend merger_configure_args(${arch}) --disable-assembly
}
<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 {[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/multimedia/libass/Portfile b/multimedia/libass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8896c2923f8..c257bea3843 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,6 @@ configure.args --enable-fontconfig \
</span> # ass.h:421: error: wrong number of arguments specified for 'deprecated' attribute
compiler.blacklist-append *gcc-3.* *gcc-4.*
<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]} {
# Needed by configure to correctly set the yasm build flags.
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nss/Portfile b/net/nss/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd6dd4822fe..430691ecb56 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nss/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,9 +117,6 @@ array set cpu_arch_map [list \
</span> i386 x86 \
x86_64 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]} {
if {${configure.build_arch} in [list arm64 ppc64 x86_64]} {
build.args-append USE_64=1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py27-gobject3/Portfile b/python/py27-gobject3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96219ecc2c2..1eaff3a5ca6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py27-gobject3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py27-gobject3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,9 +56,6 @@ configure.cppflags-append \
</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/security/botan/Portfile b/security/botan/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a6862250901..6c6e2865e15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,9 +88,6 @@ array set merger_configure_args {
</span> x86_64 --cpu=amd64
}
<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/security/botan1/Portfile b/security/botan1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7984adb06d1..aef2d5ce932 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/botan1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/botan1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,9 +80,6 @@ array set merger_configure_args {
</span> x86_64 --cpu=amd64
}
<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/sysutils/augeas/Portfile b/sysutils/augeas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff7a38a7d24..3fdfe1b919c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/augeas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/augeas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +34,6 @@ configure.args --disable-silent-rules \
</span>
#use_parallel_build 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> # this port doesn't build the examples as 32 bit <https://trac.macports.org/ticket/57897>
if {(!(${universal_possible} && [variant_isset universal]) && ${configure.build_arch} in "i386 ppc") ||
(${universal_possible} && [variant_isset universal] &&
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/findutils/Portfile b/sysutils/findutils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b23feba0643..b0ff9848b8c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/findutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/findutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,6 @@ use_parallel_build yes
</span> test.run yes
test.target check
<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_configure_args(i386) TIME_T_32_BIT_OK=yes
set merger_configure_args(ppc) TIME_T_32_BIT_OK=yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/memcached/Portfile b/sysutils/memcached/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 65d94cdddc1..29c183b79e0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/memcached/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/memcached/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +34,6 @@ patchfiles-append patch-configure.diff
</span> startupitem.create yes
startupitem.executable ${prefix}/bin/memcached -u nobody -m 64 -c 10240 -p 11211
<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_configure_args(x86_64) --enable-64bit
set merger_configure_args(ppc64) --enable-64bit
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/juman6/Portfile b/textproc/juman6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b22df17e630..f7d5d0e8d34 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/juman6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/juman6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,6 @@ if {${os.major} >= 12 && ${os.platform} eq "darwin"} {
</span> patchfiles-append patch-sed.diff
}
<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-automake-1.13.diff
use_autoreconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk-2.0/Portfile b/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 247859b4ab1..0e08c4596e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,10 +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><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport webkit-gtk3-2.0 {
conflicts webkit-gtk3 webkit-gtk3-devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk/Portfile b/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c2dd6761775..3601e1d2060 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,10 +103,6 @@ configure.args --disable-webkit2 \
</span> --enable-webgl \
--disable-jit
<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> subport webkit-gtk3 {
conflicts webkit-gtk3-devel webkit-gtk3-2.0
depends_lib-append port:gtk3
</pre><pre style='margin:0'>
</pre>