<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9a9b9b1fbf26d25242a201995ce33f6c35dba66b">https://github.com/macports/macports-ports/commit/9a9b9b1fbf26d25242a201995ce33f6c35dba66b</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 9a9b9b1fbf2 cdrtools: add +universal variant
</span>9a9b9b1fbf2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a9b9b1fbf26d25242a201995ce33f6c35dba66b
</span>Author: Robert Kennedy <amtor@hotmail.com>
AuthorDate: Wed Oct 4 13:30:26 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> cdrtools: add +universal variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * add +universal variant
</span>---
sysutils/cdrtools/Portfile | 67 ++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 62 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/cdrtools/Portfile b/sysutils/cdrtools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e75aa9a2eef..ad61cce4f17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/cdrtools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/cdrtools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,13 +19,14 @@ license CDDL-1 LGPL-2.1 GPL-2+ GPL-2
</span> description ISO 9660 filesystem and CD creation tools
long_description The cdrtools software includes programs to create \
and/or extract ISO 9660 filesystems, verify their \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- integrity, and write them to a disc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ integrity, and write them to a disc.\nAlso included \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is a cd audio disc ripper.
</span>
checksums rmd160 e154278ecbe7d778bc1d6766ed163c9963b1cc82 \
sha256 a4270cdcca5dd69c0114079277b06e5efad260b0a099c9c09d31e16e99a23ff5 \
size 5896292
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span> reinplace -locale C "s|-noclobber| |g" \
${worksrcpath}/cdrecord/Makefile.dfl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,13 +79,70 @@ proc port_conflict_check {p_port_name p_conflict_ver_min p_conflict_ver_max} {
</span>
port_conflict_check cdrtools 0.0 3.01_1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.blacklist-append \
llvm-gcc-4.2 macports-llvm-gcc-4.2 {clang < 300}
configure.ldflags-append -lintl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { $universal_possible && [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Big Sur and Later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append COPTX="-arch x86_64 -arch arm64" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ C++OPTX="-arch x86_64 -arch arm64" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDOPTX="-arch x86_64 -arch arm64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform arm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append COPTX="-arch x86_64 -arch arm64" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ C++OPTX="-arch x86_64 -arch arm64" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDOPTX="-arch x86_64 -arch arm64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Lion to Catalina
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.platform} eq "darwin" && ${os.major} >=11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append COPTX="-arch x86_64 -arch i386" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ C++OPTX="-arch x86_64 -arch i386" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDOPTX="-arch x86_64 -arch i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Snow Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.platform} eq "darwin" && ${os.major} ==10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append COPTX="-arch x86_64 -arch i386" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ C++OPTX="-arch x86_64 -arch i386" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDOPTX="-arch x86_64 -arch i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: Snow Leopard can only run 32bit ppc apps via Rosetta
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append COPTX="-arch ppc -arch i386" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ C++OPTX="-arch ppc -arch i386" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDOPTX="-arch ppc -arch i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Tiger and Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.platform} eq "darwin" && ${os.major} >= 8 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: One could change ppc to ppc64 if so desired
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append COPTX="-arch ppc -arch i386" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ C++OPTX="-arch ppc -arch i386" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDOPTX="-arch ppc -arch i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# One could change ppc to ppc64 if so desired
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append COPTX="-arch ppc -arch i386" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ C++OPTX="-arch ppc -arch i386" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDOPTX="-arch ppc -arch i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Panther and earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append COPTX="-arch ppc -arch ppc64" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ C++OPTX="-arch ppc -arch ppc64" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDOPTX="-arch ppc -arch ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:smake \
port:gettext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +154,6 @@ build.cmd smake
</span> #
# Must specify INS_BASE and INS_RBASE in both the build and destroot phases
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.args-append INS_BASE="${destroot}${prefix}" \
INS_RBASE="${destroot}${prefix}" \
DEFOSINCDIRS="${prefix}/include" \
</pre><pre style='margin:0'>
</pre>