Ticket #55440: libpsl.diff

Portfile

@@ -4 +4 @@
 PortGroup           github 1.0
 
 github.setup        rockdaboot libpsl 0.19.1 libpsl-
-revision            1
+revision            2
 license             MIT
 description         A C library and utility to handle the Public Suffix List
 long_description    ${description}
@@ -12 +12 @@
 categories          net
 platforms           darwin
 
-checksums           rmd160  d0002fc6c4e2cd65e5659d817b4eb72c2c05c384 \
-                    sha256  fd4dba59846928bcc6f030719ae38b7480523d1be94db135be505263357992ee
+# Delete this line when updating to the next version.
+dist_subdir         ${name}/${version}_1
 
+github.tarball_from releases
+
+checksums           rmd160  a9e5d338db0a58d1de496dfce6f7f4273cf854da \
+                    sha256  735146b51bbd3dcb6b0f87819c64bf3115f7fb9fa2e3a7fe9966e3346a8abc79 \
+                    size    9072973
+
 depends_build-append \
                     port:pkgconfig \
-                    port:automake \
-                    port:autoconf \
-                    port:libtool \
                     port:gtk-doc \
                     port:python27
 
@@ -29 +32 @@
                     port:libidn2 \
                     port:libunistring
 
-# latest Public Suffix List data is referenced as a git submodule
-# in the libpsl git repo but not included in the libpsl tarball itself
-# download separately to enable generation of built-in PSL data
-# PSL data is current as of 20171028
-
-set psl_data_dir        ${workpath}
-set psl_data_commit     85fa8fbdf73a0f2fcf5f4790c204394557dfbaf3
-set psl_data_archive    ${psl_data_commit}.zip
-set psl_data_url        https://github.com/publicsuffix/list/archive
-
-post-extract {
-    curl fetch ${psl_data_url}/${psl_data_archive} ${psl_data_dir}/${psl_data_archive}
-    system "/usr/bin/unzip -d ${worksrcpath} ${psl_data_dir}/${psl_data_archive}"
-    delete ${worksrcpath}/list
-    move ${worksrcpath}/list-${psl_data_commit} ${worksrcpath}/list
-}
-
-# we're not building from a git clone so remove references to git in autogen.sh
-patchfiles          disable-unnecessary-git-processing.patch
-
 post-patch {
     reinplace "s|^#!.*|#!${prefix}/bin/python2.7|" \
         ${worksrcpath}/src/psl-make-dafsa
@@ -55 +38 @@
 }
 
 configure.python    ${prefix}/bin/python2.7
-configure.cmd       ./autogen.sh && ./configure
 
 configure.args      --enable-builtin=libidn2 \
                     --enable-gtk-doc \

files/disable-unnecessary-git-processing.patch

@@ -1 @@
---- autogen.sh.orig     2017-11-19 19:01:02.000000000 -0800
-+++ autogen.sh  2017-11-19 19:01:32.000000000 -0800
-@@ -6,12 +6,6 @@
-   exit 1
- fi
- 
--GIT=$(which git 2>/dev/null)
--if test $? -ne 0; then
--  echo "No 'git' found. You must install the git package."
--  exit 1
--fi
--
- #  create m4 before gtkdocize
- mkdir -p m4 2>/dev/null
- 
-@@ -27,8 +21,6 @@
-   $GTKDOCIZE
- fi
- 
--$GIT submodule init
--$GIT submodule update
- $AUTORECONF --install --force --symlink
- 
- echo