CVS commit: pkgsrc/www/libpsl

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov  7 09:27:39 UTC 2020

Modified Files:
        pkgsrc/www/libpsl: Makefile buildlink3.mk

Log Message:
libpsl: Switch to default runtime (not-icu-based, libidn2-based)

- Dependencies never needed icu to link and run (according to the .pc file)
- Use tool.mk for python as a tool.
- Add missing gettext tools.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/libpsl/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/libpsl/buildlink3.mk

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

Modified files:

Index: pkgsrc/www/libpsl/Makefile
diff -u pkgsrc/www/libpsl/Makefile:1.11 pkgsrc/www/libpsl/Makefile:1.12
--- pkgsrc/www/libpsl/Makefile:1.11     Thu Nov  5 09:07:13 2020
+++ pkgsrc/www/libpsl/Makefile  Sat Nov  7 09:27:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/11/05 09:07:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2020/11/07 09:27:38 nia Exp $
 
 DISTNAME=      libpsl-0.21.1
 PKGREVISION=   1
@@ -15,16 +15,17 @@ LICENSE=    mit
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
+USE_TOOLS+=            msgfmt msgmerge xgettext
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-gtk-doc
-CONFIGURE_ARGS+=       --enable-runtime=libicu
+CONFIGURE_ARGS+=       --enable-runtime=libidn2
 PKGCONFIG_OVERRIDE+=   libpsl.pc.in
 TEST_TARGET=           check
 
-PYTHON_FOR_BUILD_ONLY= yes
-REPLACE_PYTHON=                src/psl-make-dafsa
+PYTHON_FOR_BUILD_ONLY= tool
 
-.include "../../lang/python/application.mk"
+.include "../../lang/python/tool.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
+.include "../../devel/libidn2/buildlink3.mk"
+.include "../../textproc/libunistring/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/libpsl/buildlink3.mk
diff -u pkgsrc/www/libpsl/buildlink3.mk:1.8 pkgsrc/www/libpsl/buildlink3.mk:1.9
--- pkgsrc/www/libpsl/buildlink3.mk:1.8 Thu Nov  5 09:07:13 2020
+++ pkgsrc/www/libpsl/buildlink3.mk     Sat Nov  7 09:27:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2020/11/05 09:07:13 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2020/11/07 09:27:38 nia Exp $
 
 BUILDLINK_TREE+=       libpsl
 
@@ -8,8 +8,6 @@ LIBPSL_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libpsl+= libpsl>=0.20.2
 BUILDLINK_ABI_DEPENDS.libpsl+= libpsl>=0.21.1nb1
 BUILDLINK_PKGSRCDIR.libpsl?=   ../../www/libpsl
-
-.include "../../textproc/icu/buildlink3.mk"
 .endif # LIBPSL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libpsl