From nobody Mon Jan 30 13:05:47 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P57hq3tdSz3cY66; Mon, 30 Jan 2023 13:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P57hq39V6z4PyH; Mon, 30 Jan 2023 13:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675083947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wSkf3dbO4pN/hEYVm7fRfc0VG20OkdhXeLdDIHRR8fU=; b=c1IhB9RFAVkOLjBmJffgtrDnHIkEoIxOlz0DPXjoV0nohNh3g/fA31yIfBbKl3ijx+sqSz VIq7ioE2ORi/HMg0ng9Q5DSwlD0QoWMUNKUgIcj1nUzfppsMiC+4J5PW+AEM4y6lJRUvcM GAeXbXs5vjdbMMVQ1Xwb3SF92xF3jJrN6D5QOxh8qt+F8ShAcbKUJikEG5hAzIOhMZqKs4 Z4RQgKLLoOLT/0AONsnZoJSfs9IqyyE3SaUFnZ90jWqaDMb6/bMI2400SwLK6keqMavrvI FYNvqQp5Moe9Czjkteis//C9TbyaQrqDrMCCRzUHE4u/HP1C00+VhqSzcpz6ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675083947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wSkf3dbO4pN/hEYVm7fRfc0VG20OkdhXeLdDIHRR8fU=; b=QKRN8MOx0QtWKBKoHcRkBGBNmIJCzKPSDz7+RHBAHiVwXJTN9I2DuoWVftVODImzDEYccL n+x4HNgHWDFInadN22SS4VlhYBRYiIo7/To4A7l1Xvq2y3TYpiF7+lYlPbL+3LO6yPj4Y2 QvtPrZ67Gb2R+78IiHsRsKjsNt/gYgZlrM3/+CImgFXRNjbY0BPkRQ4aL3fP8yx4yAfqf9 7L+tagmR7fHchVjHEoOxZet9Tz42V0CqVXFTYaPIXzBNVaa5zAzkCAO6nA7WOLG/ixSf8T JhWXPt/9Q/e5+8MlN4xBjYKeeqKc0JARzH+u6TBMstF7jNhJG2sTsdt2a59JfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675083947; a=rsa-sha256; cv=none; b=W62kQkfNzSdasCvNRbDFaaCG3IEW+cuq3cCFUXyFuEsruS7ejDqaz0aNzsThgBY4RGisRw xf8ZpKO2jgf780IMUKM23o95sE7vb41YjJ0AWk30JZw/5tgKE4Y8RzfZIS0bdJMPlwHfrW HMtMewozYxZsETp+Stos8E0YaCQnln1K8/pihz9QYFVE05EiitZ73eX955wClUEaGZelK9 b4POPE0KQb57DG1Oj2uPm58+8duaZIZ0PxgOskaTkFdunUSB7HyLM1fWDFUjIa+xeJdzM4 A96sy9RmJxR6T9qreec8IcUaCjnCbkk+okbtmvOhXLNMBPASYsBCT1ornElY1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P57hq2FzVz18Cm; Mon, 30 Jan 2023 13:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30UD5lMQ052640; Mon, 30 Jan 2023 13:05:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UD5lEx052639; Mon, 30 Jan 2023 13:05:47 GMT (envelope-from git) Date: Mon, 30 Jan 2023 13:05:47 GMT Message-Id: <202301301305.30UD5lEx052639@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 5592c5ea0729 - main - dns/libpsl: Change back to make List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5592c5ea0729b53697958bd1f1cc7054123196f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5592c5ea0729b53697958bd1f1cc7054123196f1 commit 5592c5ea0729b53697958bd1f1cc7054123196f1 Author: Po-Chuan Hsieh AuthorDate: 2023-01-30 12:27:24 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-01-30 12:59:03 +0000 dns/libpsl: Change back to make - Readd IDN and NLS options - Do not install psl-make-dafsa because it requires Python - Remove psl-make-dafsa.1 - Bump PORTREVISION for dependency and package change --- dns/libpsl/Makefile | 51 ++++++++++++++++++++++++++++++++++----------------- dns/libpsl/pkg-plist | 2 -- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile index b5a00b907c8a..a42da91d7eeb 100644 --- a/dns/libpsl/Makefile +++ b/dns/libpsl/Makefile @@ -1,7 +1,8 @@ PORTNAME= libpsl -DISTVERSION= 0.21.2 +PORTVERSION= 0.21.2 +PORTREVISION= 1 CATEGORIES= dns -MASTER_SITES= https://github.com/rockdaboot/${PORTNAME}/releases/download/${DISTVERSION}/ +MASTER_SITES= https://github.com/rockdaboot/libpsl/releases/download/${PORTVERSION}/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= C library to handle the Public Suffix List @@ -12,30 +13,46 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= public_suffix_list>=0:dns/public_suffix_list -USES= localbase:ldflags meson pkgconfig python:build shebangfix tar:lz - +USES= libtool localbase:ldflags pathfix pkgconfig python:build shebangfix tar:lz + +CONFIGURE_ARGS= --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --disable-man \ + --enable-builtin \ + --with-psl-file=${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat \ + --with-psl-testfile=${LOCALBASE}/share/public_suffix_list/test_psl.txt +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_LOCALE= en_US.UTF-8 SHEBANG_FILES= src/psl-make-dafsa TEST_TARGET= test -MESON_ARGS= -Ddefault_library=both \ - -Dpsl_file=${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat \ - -Dpsl_testfile=${LOCALBASE}/share/public_suffix_list/test_psl.txt - -OPTIONS_SINGLE= IDNA -OPTIONS_SINGLE_IDNA= ICU IDN2 -OPTIONS_DEFAULT= ICU - -ICU_DESC= Use devel/icu (IDNA2008 UTS\#46 library) -IDN2_DESC= Use dns/libidn2 (IDNA2008 library) +OPTIONS_DEFINE= NLS +OPTIONS_SINGLE= IDNA +OPTIONS_SINGLE_IDNA= ICU IDN IDN2 +OPTIONS_DEFAULT=IDN2 +ICU_DESC= Use devel/icu (IDNA2008 UTS\#46 library) +IDN_DESC= Use dns/libidn (IDNA2003 library) +IDN2_DESC= Use dns/libidn2 (IDNA2008 library) +ICU_CONFIGURE_ON= --enable-runtime=libicu ICU_LIB_DEPENDS= libicuuc.so:devel/icu -ICU_MESON_ON= -Druntime=libicu -IDN2_USES= iconv +IDN_CONFIGURE_ON= --enable-runtime=libidn +IDN_LIB_DEPENDS= libidn.so:dns/libidn \ + libunistring.so:devel/libunistring +IDN_USES= iconv +IDN2_CONFIGURE_ON= --enable-runtime=libidn2 IDN2_LIB_DEPENDS= libidn2.so:dns/libidn2 \ libunistring.so:devel/libunistring -IDN2_MESON_ON= -Druntime=libidn2 +IDN2_USES= iconv +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext +NLS_USES_OFF= gettext-tools + +post-install: + ${RM} ${STAGEDIR}${PREFIX}/man/man1/psl-make-dafsa.1 .include diff --git a/dns/libpsl/pkg-plist b/dns/libpsl/pkg-plist index c60f11d531df..f0e62dd59fe2 100644 --- a/dns/libpsl/pkg-plist +++ b/dns/libpsl/pkg-plist @@ -1,4 +1,3 @@ -bin/psl-make-dafsa bin/psl include/libpsl.h lib/libpsl.a @@ -6,5 +5,4 @@ lib/libpsl.so lib/libpsl.so.5 lib/libpsl.so.5.3.4 libdata/pkgconfig/libpsl.pc -man/man1/psl-make-dafsa.1.gz man/man1/psl.1.gz