diff --git a/sysutils/simg2img/Portfile b/sysutils/simg2img/Portfile index 9ab1094f919..5dbfd5c73ae 100644 --- a/sysutils/simg2img/Portfile +++ b/sysutils/simg2img/Portfile @@ -2,38 +2,30 @@ PortSystem 1.0 PortGroup github 1.0 +PortGroup makefile 1.0 -#github.setup anestisb android-simg2img 1.1.4 -# 2807b36 is 3 commits after 1.1.4: includes minor cleanup and build flag fix -github.setup anestisb android-simg2img 2807b36 -# Change github.tarball_from to 'releases' or 'archive' next update -github.tarball_from tarball -version 1.1.4 +github.setup anestisb android-simg2img 1.1.5 +github.tarball_from archive name simg2img +revision 0 categories sysutils maintainers nomaintainer license Apache-2 -description Tool to convert Android sparse images to raw images +description Convert Android sparse images to raw images (and vise-versa) long_description {*}${description} -checksums rmd160 54a3457aa795a3f73aa383a6c2f98fa6b056152d \ - sha256 df878f928fd6e6f8d7d990b56412adc8afbc08f7822f05a843d326461bee71e8 \ - size 23968 - -# Avoid rebuilding during destroot -patchfiles-append Makefile.patch - -use_configure no +checksums rmd160 99c44b33f810f025866fd471cfcbc59c50e63dad \ + sha256 d9e9ec2c372dbbb69b9f90b4da24c89b092689e45cd5f74f0e13003bc367f3fc \ + size 23971 depends_lib-append port:zlib -variant universal {} +makefile.has_destdir \ + no -destroot.args-append PREFIX=${destroot}${prefix} +makefile.override-append \ + PREFIX compiler.cxx_standard 2017 - -build.args-append CC="${configure.cc} [get_canonical_archflags cc]" \ - CXX="${configure.cxx} [get_canonical_archflags cxx]" diff --git a/sysutils/simg2img/files/Makefile.patch b/sysutils/simg2img/files/Makefile.patch deleted file mode 100644 index 95b7eab1e66..00000000000 --- a/sysutils/simg2img/files/Makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ -The $(LIB_NAME) target does not output a file called $(LIB_NAME), -so it and any dependents are always rebuilt, such as during -`make install`. Using the output file $(SLIB) as the target name -and in dependents avoids this. - -Upstream-Status: Submitted (https://github.com/anestisb/android-simg2img/pull/33) - ---- Makefile.orig 2020-06-19 10:02:43.000000000 -0500 -+++ Makefile 2021-06-18 13:02:09.000000000 -0500 -@@ -69,7 +69,7 @@ - .PHONY: default all clean install - - default: all --all: $(LIB_NAME) simg2img simg2simg img2simg append2simg -+all: $(SLIB) simg2img simg2simg img2simg append2simg - - install: all - install -d $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/include/sparse -@@ -77,20 +77,20 @@ - install -m 0755 $(SLIB) $(PREFIX)/lib - install -m 0644 $(HEADERS) $(PREFIX)/include/sparse - --$(LIB_NAME): $(LIB_OBJS) -+$(SLIB): $(LIB_OBJS) - $(AR) rc $(SLIB) $(LIB_OBJS) - $(RANLIB) $(SLIB) - --simg2img: $(SIMG2IMG_SRCS) $(LIB_NAME) -+simg2img: $(SIMG2IMG_SRCS) $(SLIB) - $(CXX) $(CPPFLAGS) $(LIB_INCS) -o simg2img $< $(LDFLAGS) - --simg2simg: $(SIMG2SIMG_SRCS) $(LIB_NAME) -+simg2simg: $(SIMG2SIMG_SRCS) $(SLIB) - $(CXX) $(CPPFLAGS) $(LIB_INCS) -o simg2simg $< $(LDFLAGS) - --img2simg: $(IMG2SIMG_SRCS) $(LIB_NAME) -+img2simg: $(IMG2SIMG_SRCS) $(SLIB) - $(CXX) $(CPPFLAGS) $(LIB_INCS) -o img2simg $< $(LDFLAGS) - --append2simg: $(APPEND2SIMG_SRCS) $(LIB_NAME) -+append2simg: $(APPEND2SIMG_SRCS) $(SLIB) - $(CXX) $(CPPFLAGS) $(LIB_INCS) -o append2simg $< $(LDFLAGS) - - %.o: %.cpp .depend