libpsl: Now that we are using release tarballs, get rid of hacks.

[Benny Siegert <bsiegert%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Sat Jul 28 11:11:03 2018 +0000
Changeset:	49a5e87ee5643e4fc204fad77eda8858ac84d53f

Modified Files:
	libpsl/Makefile
	libpsl/distinfo
Removed Files:
	libpsl/patches/patch-autogen.sh

Log Message:
libpsl: Now that we are using release tarballs, get rid of hacks.

- the patch can go
- the release does include the actual PSL, no more DIST_SUBDIR
- actually set the Python path correctly for the build

This is now ready for import, I think.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=49a5e87ee5643e4fc204fad77eda8858ac84d53f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libpsl/Makefile                 | 19 ++++++++-----------
 libpsl/distinfo                 | 13 ++++---------
 libpsl/patches/patch-autogen.sh | 23 -----------------------
 3 files changed, 12 insertions(+), 43 deletions(-)

diffs:
diff --git a/libpsl/Makefile b/libpsl/Makefile
index 4ae02a460c..fa8e73000b 100644
--- a/libpsl/Makefile
+++ b/libpsl/Makefile
@@ -4,29 +4,26 @@ DISTNAME=	libpsl-0.20.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=rockdaboot/}
 GITHUB_RELEASE=	${DISTNAME}
-DIST_SUBDIR=	${PKGNAME_NOREV}
-DISTFILES=	${DEFAULT_DISTFILES} public_suffix_list.dat
-SITES.public_suffix_list.dat=	https://raw.githubusercontent.com/publicsuffix/list/c45eff1c741d197778430e64e5d6f8bb0d7e9c8d/
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/rockdaboot/libpsl/
 COMMENT=	Library to handle the Public Suffix List
 LICENSE=	mit
 
-BUILD_DEPENDS+=	gettext-m4-[0-9]*:../../devel/gettext-m4
-BUILD_DEPENDS+=	gettext-tools-[0-9]*:../../devel/gettext-tools
-
-USE_TOOLS+=	gmake pkg-config autoconf automake
+USE_TOOLS+=	gmake pkg-config
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
 
-PKGCONFIG_OVERRIDE+=	libpsl.pc.in
+PYTHON_FOR_BUILD_ONLY=	yes
+REPLACE_PYTHON=		src/psl-make-dafsa
 
-pre-configure:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/public_suffix_list.dat ${WRKSRC}/list/
-	cd ${WRKSRC} && ${CONFIG_SHELL} autogen.sh
+CONFIGURE_ARGS+=	--disable-gtk-doc
+CONFIGURE_ARGS+=	--enable-runtime=libicu
+
+PKGCONFIG_OVERRIDE+=	libpsl.pc.in
 
+.include "../../lang/python/application.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libpsl/distinfo b/libpsl/distinfo
index dce7b80625..a24c37343c 100644
--- a/libpsl/distinfo
+++ b/libpsl/distinfo
@@ -1,11 +1,6 @@
 $NetBSD: distinfo,v 1.2 2014/10/28 15:33:55 thomasklausner Exp $
 
-SHA1 (libpsl-0.20.2/libpsl-0.20.2.tar.gz) = 890376d6038652911cfa853ccfb5b993ae0743ee
-RMD160 (libpsl-0.20.2/libpsl-0.20.2.tar.gz) = 418230d331d2976c111263f3c1280d47929f48cb
-SHA512 (libpsl-0.20.2/libpsl-0.20.2.tar.gz) = fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
-Size (libpsl-0.20.2/libpsl-0.20.2.tar.gz) = 9228099 bytes
-SHA1 (libpsl-0.20.2/public_suffix_list.dat) = 10874c9b721d6c812aebbdd29008acfea9e8ecb9
-RMD160 (libpsl-0.20.2/public_suffix_list.dat) = eb156a05ff2f8f25e3f24459a12bc4b5020f46f2
-SHA512 (libpsl-0.20.2/public_suffix_list.dat) = 2a220da79699c31c01cd72ead7f8024e36ac826afd3f0742def463f83da5f227749523a75dfabf97ac2236765d845330607f017eeb2f7c451d9b9a55c67b99a1
-Size (libpsl-0.20.2/public_suffix_list.dat) = 202091 bytes
-SHA1 (patch-autogen.sh) = 23520b372ab58f217fba371318a66cec88128403
+SHA1 (libpsl-0.20.2.tar.gz) = 890376d6038652911cfa853ccfb5b993ae0743ee
+RMD160 (libpsl-0.20.2.tar.gz) = 418230d331d2976c111263f3c1280d47929f48cb
+SHA512 (libpsl-0.20.2.tar.gz) = fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
+Size (libpsl-0.20.2.tar.gz) = 9228099 bytes
diff --git a/libpsl/patches/patch-autogen.sh b/libpsl/patches/patch-autogen.sh
deleted file mode 100644
index 16b28a4504..0000000000
--- a/libpsl/patches/patch-autogen.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Skip use of gtk-doc.
---- autogen.sh.orig	2018-04-26 18:18:39.000000000 +0000
-+++ autogen.sh
-@@ -15,17 +15,12 @@ fi
- #  create m4 before gtkdocize
- mkdir -p m4 2>/dev/null
- 
--GTKDOCIZE=$(which gtkdocize 2>/dev/null)
--if test $? -ne 0; then
-   echo "No gtk-doc support found. You can't build the docs."
-   # rm because gtk-doc.make might be a link to a protected file
-   rm -f gtk-doc.make 2>/dev/null
-   echo "EXTRA_DIST =" >gtk-doc.make
-   echo "CLEANFILES =" >>gtk-doc.make
-   GTKDOCIZE=""
--else
--  $GTKDOCIZE
--fi
- 
- $GIT submodule init
- $GIT submodule update