Ticket #53712: libarchive_fixes.diff

archivers/libarchive/Portfile

@@ -1 +1 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
-PortSystem 1.0
+PortSystem       1.0
+PortGroup        github 1.0
+
 name             libarchive
-homepage         http://libarchive.org/
-master_sites     ${homepage}downloads/
-version          3.3.1
 categories       archivers
 license          BSD
 maintainers      toby openmaintainer
@@ -16 +15 @@
         also write shar archives.
 platforms        darwin
 
-checksums        rmd160  229d68a81b7b4e5b7b12d5da88522e04974328b4 \
-                 sha256  29ca5bd1624ca5a007aa57e16080262ab4379dbf8797f5c52f7ea74a3b0424e7
+if {${subport} eq ${name}} {
+
+    github.setup    libarchive libarchive 3.2.2 v
+    checksums       rmd160 7a1339b824bed4fac3b2ff5780d6e5b3376194ad \
+                    sha256 c4b361aeac885700da77d243978dab0477f9e5b1e104240190dc28dc19c7f42d
+
+    # original 3.2.2 archive is different from GitHub tagged version,
+    # so do a stealth upgrade hack to make it work
+    # NOTE: remove this on next release update
+    dist_subdir     ${name}/${version}_1
+
+    # bump epoch because we reverted the version from 3.3.1 to 3.2.2
+    epoch           1
+
+    conflicts       libarchive-devel
+
+}
+
+subport libarchive-devel {
+
+    github.setup    libarchive libarchive a300fab1da39c0121027ae42e2d4f26b82c13d18
+    version         20170316
+    checksums       rmd160 333d91894e229a34474066e79dbfe5b4604d15c5 \
+                    sha256 05104194e15500eec3da229c0797ca1286e2d6c920673c0167f7b61d46c78127
 
-depends_lib      port:bzip2 port:zlib port:libxml2 port:xz \
+    long_description ${long_description} \
+        This port is kept up with the libarchive GIT 'master' branch, is typically updated weekly to monthly.
+    conflicts       libarchive
+
+    patchfiles-append patch-Makefile.am.devel.diff
+
+}
+
+homepage         http://libarchive.org/
+
+depends_lib      port:bzip2 port:zlib \
+                 port:libxml2 port:xz \
                  port:lzo2 port:libiconv \
                  port:lz4 port:expat
 
-patchfiles       patch-libarchive__archive_read_support_format_lha.c.diff
+depends_build-append port:autoconf \
+                 port:automake port:libtool
+
+patchfiles-append patch-libarchive__archive_read_support_format_lha.c.diff
+
+post-patch {
+    system -W ${worksrcpath} "build/autogen.sh"
+}
 
 configure.args   --enable-bsdtar=shared --enable-bsdcpio=shared \
                  --disable-silent-rules --without-nettle \
-                 --without-openssl --without-lzmadec
-
-livecheck.type  regex
-livecheck.regex libarchive-(\[0-9.\]+)\\.tar.gz
+                 --without-openssl

new file archivers/libarchive/files/patch-Makefile.am.devel.diff

@@ +1 @@
+--- Makefile.am.orig    2017-03-16 20:31:38.000000000 -0400
++++ Makefile.am 2017-03-16 20:31:42.000000000 -0400
+@@ -23,7 +23,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
+ # The next line is commented out by default in shipping libarchive releases.
+ # It is uncommented by default in trunk.
+-DEV_CFLAGS=-Werror -Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual -g
++DEV_CFLAGS=-Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual -g
+ AM_CFLAGS=$(DEV_CFLAGS)
+ PLATFORMCPPFLAGS = @PLATFORMCPPFLAGS@
+ AM_CPPFLAGS=$(PLATFORMCPPFLAGS)

devel/cmake/Portfile

@@ -90 +90 @@
                     port:expat \
                     port:zlib \
                     port:bzip2 \
-                    port:libarchive \
+                    path:lib/libarchive.dylib:libarchive \
                     port:ncurses
 
 # allow use of libuv or libuv-devel;