<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/428accda29b3a1965ede5b142bf8ca76925569ca">https://github.com/macports/macports-ports/commit/428accda29b3a1965ede5b142bf8ca76925569ca</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 428accda29b simg2img: update to 1.1.4
</span>428accda29b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 428accda29b3a1965ede5b142bf8ca76925569ca
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Jun 18 13:30:08 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> simg2img: update to 1.1.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Replace simg2img-devel with simg2img
</span>---
sysutils/simg2img/Portfile | 33 +++++++++++++------------
sysutils/simg2img/files/Makefile.patch | 44 ++++++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/simg2img/Portfile b/sysutils/simg2img/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c3494b4a38..cc7572f235a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/simg2img/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/simg2img/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,10 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup anestisb android-simg2img 1.1.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#github.setup anestisb android-simg2img 1.1.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 2807b36 is 3 commits after 1.1.4: includes minor cleanup and build flag fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup anestisb android-simg2img 2807b36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.4
</span> name simg2img
categories sysutils
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,35 +17,35 @@ description Tool to convert Android sparse images to raw images
</span>
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 39da89cefc9040c07288cba3cab62874cc74473d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2a441cdf8d7f1e378098d2da548d472bd31a312ecc17310f50a9ca2e01b8018f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23263
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 54a3457aa795a3f73aa383a6c2f98fa6b056152d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 df878f928fd6e6f8d7d990b56412adc8afbc08f7822f05a843d326461bee71e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23968
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Avoid rebuilding during destroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append Makefile.patch
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:zlib
</span>
variant universal {}
destroot.args-append PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove after 2022-06-18
</span> subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup anestisb android-simg2img a8514caa7ccdc5f1a03c2a88b0d38b7e6bdc421d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name simg2img-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191105
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f7410710330f468ecef1e563298c4af2274a5bef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 adb34203a4872296de953e1d6e32d07c8357af967923cc702fabca5ff933d50c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23938
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts simg2img
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191105
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}
</span> }
if {${subport} eq ${name}} {
conflicts simg2img-devel
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.args-append CC="${configure.cc} [get_canonical_archflags cc]" \
CXX="${configure.cxx} [get_canonical_archflags cxx]"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/simg2img/files/Makefile.patch b/sysutils/simg2img/files/Makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..95b7eab1e66
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/simg2img/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The $(LIB_NAME) target does not output a file called $(LIB_NAME),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+so it and any dependents are always rebuilt, such as during
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+`make install`. Using the output file $(SLIB) as the target name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and in dependents avoids this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Submitted (https://github.com/anestisb/android-simg2img/pull/33)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2020-06-19 10:02:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2021-06-18 13:02:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,7 +69,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: default all clean install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default: all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-all: $(LIB_NAME) simg2img simg2simg img2simg append2simg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++all: $(SLIB) simg2img simg2simg img2simg append2simg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -d $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/include/sparse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,20 +77,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -m 0755 $(SLIB) $(PREFIX)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -m 0644 $(HEADERS) $(PREFIX)/include/sparse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$(LIB_NAME): $(LIB_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(SLIB): $(LIB_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(AR) rc $(SLIB) $(LIB_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(RANLIB) $(SLIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-simg2img: $(SIMG2IMG_SRCS) $(LIB_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++simg2img: $(SIMG2IMG_SRCS) $(SLIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) $(CPPFLAGS) $(LIB_INCS) -o simg2img $< $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-simg2simg: $(SIMG2SIMG_SRCS) $(LIB_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++simg2simg: $(SIMG2SIMG_SRCS) $(SLIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) $(CPPFLAGS) $(LIB_INCS) -o simg2simg $< $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-img2simg: $(IMG2SIMG_SRCS) $(LIB_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++img2simg: $(IMG2SIMG_SRCS) $(SLIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) $(CPPFLAGS) $(LIB_INCS) -o img2simg $< $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-append2simg: $(APPEND2SIMG_SRCS) $(LIB_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++append2simg: $(APPEND2SIMG_SRCS) $(SLIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) $(CPPFLAGS) $(LIB_INCS) -o append2simg $< $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %.o: %.cpp .depend
</span></pre><pre style='margin:0'>
</pre>