<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/701147acdf2b6246f58e7c9f359179065d600d4c">https://github.com/macports/macports-ports/commit/701147acdf2b6246f58e7c9f359179065d600d4c</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 701147acdf2 smake: update to version 1.7-2023-09-28; speedup +universal variant
</span>701147acdf2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 701147acdf2b6246f58e7c9f359179065d600d4c
</span>Author: Robert Kennedy <amtor@hotmail.com>
AuthorDate: Sun Nov 12 16:11:25 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> smake: update to version 1.7-2023-09-28; speedup +universal variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove "muniversal 1.1" PortGroup from Portfile
</span><span style='display:block; white-space:pre;color:#404040;'> * Add pre-build {} code block needed for +universal variant
</span><span style='display:block; white-space:pre;color:#404040;'> * Clean up destroot {} code block code
</span><span style='display:block; white-space:pre;color:#404040;'> * Add "-r" flag to the smake commands in the Gmake.smake script
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix formatting in Portfile
</span>---
devel/smake/Portfile | 119 +++++++++++++++++++++++++++++++++++++--------------
1 file changed, 88 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/smake/Portfile b/devel/smake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 62f4a89b385..4e408d1a909 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/smake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/smake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,10 +5,9 @@ PortGroup makefile 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup conflicts_build 1.0
PortGroup codeberg 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.1
</span>
name smake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-codeberg.setup schilytools schilytools 2023-04-19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+codeberg.setup schilytools schilytools 2023-09-28
</span> version 1.7-${codeberg.version}
revision 0
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,38 +19,39 @@ long_description Smake is a highly portable make program with automake \
</span> features. It is currently mainly targeted to be used \
with the Schily SING makefile system.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e154278ecbe7d778bc1d6766ed163c9963b1cc82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a4270cdcca5dd69c0114079277b06e5efad260b0a099c9c09d31e16e99a23ff5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5896292
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://codeberg.org/schilytools/schilytools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}/archive/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c9d662b84c1a013cd68d38050020e112a9a0b2a7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c813cc19a320f8d3b5d82f5b1ca6a93ab1bb5f4c50f86fdac58101fe472d2143 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5891733
</span>
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/Gmake.smake ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/Gmake.smake ${worksrcpath}
</span> }
patchfiles-append 001-Makefile-Patch.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|/opt/schily|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/DEFAULTS/Defaults.darwin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/DEFAULTS/Defaults.mac-os10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/DEFAULTS_ENG/Defaults.darwin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/DEFAULTS_ENG/Defaults.mac-os10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/libfind/find.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/libfind/find_main.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/librscg/scsi-remote.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/patch/tests/random/cmptest.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/patch/tests/random/gentest.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/smake/job.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/smake/make.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/smake/smake.1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/TEMPLATES/Defaults.gcc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/TEMPLATES/Defaults.clang \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/TEMPLATES/Defaults.xcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C "s|/opt/schily|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/DEFAULTS/Defaults.darwin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/DEFAULTS/Defaults.mac-os10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/DEFAULTS_ENG/Defaults.darwin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/DEFAULTS_ENG/Defaults.mac-os10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libfind/find.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/libfind/find_main.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/librscg/scsi-remote.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/patch/tests/random/cmptest.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/patch/tests/random/gentest.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/smake/job.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/smake/make.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/smake/smake.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/TEMPLATES/Defaults.gcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/TEMPLATES/Defaults.clang \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/TEMPLATES/Defaults.xcc
</span> }
proc port_conflict_check {p_port_name p_conflict_ver_min p_conflict_ver_max} {
ui_info "Checking for conflict against port: ${p_port_name}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if { ![catch {set port_conflict_ver_info [lindex [registry_active ${p_port_name}] 0]}] } {
set port_conflict_ver [lindex ${port_conflict_ver_info} 1]_[lindex ${port_conflict_ver_info} 2]
ui_info "${p_port_name} active version: ${port_conflict_ver}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,6 +74,65 @@ compiler.blacklist-append\
</span>
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;'>+# Note: 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:gmake \
port:gettext
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,15 +159,13 @@ destroot.destdir INS_BASE="${destroot}${prefix}" \
</span> use_parallel_build no
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 {*}[glob ${worksrcpath}/smake/OBJ/*/smake] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 {*}[glob ${worksrcpath}/smake/OBJ/*/smake] \
</span> ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 {*}[glob ${worksrcpath}/smake/OBJ/*/*/smake.1] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 {*}[glob ${worksrcpath}/smake/OBJ/*/*/smake.1] \
</span> ${destroot}${prefix}/share/man/man1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 {*}[glob ${worksrcpath}/man/man5/OBJ/*/*/makefiles.5] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/man/man5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 {*}[glob ${worksrcpath}/man/man5/OBJ/*/*/makerules.5] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 {*}[glob ${worksrcpath}/man/man5/OBJ/*/*/makefiles.5] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${worksrcpath}/man/man5/OBJ/*/*/makerules.5] \
</span> ${destroot}${prefix}/share/man/man5
}
</pre><pre style='margin:0'>
</pre>