From nobody Sun Feb 12 18:46:19 2023 X-Original-To: dev-commits-ports-main@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 4PFGdm0qYKz3qY5Z; Sun, 12 Feb 2023 18:46:20 +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 4PFGdl5vlcz3r8C; Sun, 12 Feb 2023 18:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676227579; 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=mQ/Rls7Aoni96yWE9DF5SQ9u2IbDEH8fQDI0onO4iA4=; b=M9dMtQGePfg9owndC8oBCTNFM2pfdNhzSVjXH20BABwH4IFCrzzVzvtrHmMXNkTuCGfB7P b+37sjPUUsAovn7WXPw/OJ/OOxBeK6odFHVLfjgLxfSQxjS/t20sbQBmzPrivE/4OcuSie o387aTKMzxcbiqzLjcG9GTmb1Cc9usym+BA8qiClwABaMjvHkAwb7KBR2Km6JpgPYSgA6n Shdg90Jbuo4cozNkM6dga49/4XnkYLnZjTJyePum5cu2P5cEQfJOgIKM4XcA+fclesD/TH 74qO5/6YMzTcKTEnbqyR6kkAV2tZvwyP8tMLuoP+r2RQmg0vJDXNM/RKrgAUPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676227579; 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=mQ/Rls7Aoni96yWE9DF5SQ9u2IbDEH8fQDI0onO4iA4=; b=swQaiMii3ex5nZgVZ9RY5FhL3/mjMzrl126OJtta4JDIAc6u2j7XM0wipG4U3V0k7dDnZc LZ2Je2D0vC2TOyLe8ZyI+Wp4OoD3mJA/80+4V3RWBbq+UqOx3zd3cT4dtdCxpTxoHtWI8e ZKNoZWjywC7SkLGw9Jluv2wqBpoZ7EmbEWovy+y1oPW32qAqxboKFHCFTujaRu/O8qSeZP DHuXKmlak4oyh/05nxVz9DBQd9NRy1IS1osVO9IxvTLWI54kgy7wUsdjZGvbx9CeT9FO4m YuiWNHz5D4WUn2DVvYVqV8gmRKZ9GqKf+88rbEbUZXS+sIQbakjDilOzSoBuBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676227579; a=rsa-sha256; cv=none; b=YITcEgvJxRo5SJD60FWfeDz8vxu+MDybRvOACrKgNxkjqt9BYaFux9yedNyNiiEgLsMNkQ gflygo67bP/l1cIhzChs+oCVZF+tDSyTpJUfEl9XrUs+YGBp9VFqcm1oRqyKB2Hu18TB8R 3GR4fyGaqIzl9XE2o338gX3vPs1gI0W62MxWEudtULPfkaEnHLya67twwFJwqqYka+6GBq i1Fbp7qBZ1y7DWPt4SQxj9qJyHo22j/zB4KMq9Chp1gMk6VQ5EwQ0W+DyErP7CLvikyyi/ YhlWAR+DeOaYh5P3dDR4v7JrMNawz/kX3M9vJJzbvMj9LVCdVz5S2NCiSqieZg== 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 4PFGdl4KYqzpnb; Sun, 12 Feb 2023 18:46:19 +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 31CIkJmS097566; Sun, 12 Feb 2023 18:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31CIkJUT097564; Sun, 12 Feb 2023 18:46:19 GMT (envelope-from git) Date: Sun, 12 Feb 2023 18:46:19 GMT Message-Id: <202302121846.31CIkJUT097564@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: bccc46e0b233 - main - dns/libpsl: Convert to meson List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: bccc46e0b233d89c0db1e5efb50bacfd0da5296f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=bccc46e0b233d89c0db1e5efb50bacfd0da5296f commit bccc46e0b233d89c0db1e5efb50bacfd0da5296f Author: Po-Chuan Hsieh AuthorDate: 2023-02-12 18:36:39 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-02-12 18:36:39 +0000 dns/libpsl: Convert to meson - Remove NLS option - Bump PORTREVISION for package change PR: 269314 --- dns/libpsl/Makefile | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile index a42da91d7eeb..c0eda8c56757 100644 --- a/dns/libpsl/Makefile +++ b/dns/libpsl/Makefile @@ -1,6 +1,6 @@ PORTNAME= libpsl PORTVERSION= 0.21.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns MASTER_SITES= https://github.com/rockdaboot/libpsl/releases/download/${PORTVERSION}/ @@ -13,24 +13,19 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= public_suffix_list>=0:dns/public_suffix_list -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 +USES= localbase:ldflags meson pkgconfig python:build shebangfix tar:lz + +MESON_ARGS= -Dbuiltin=true \ + -Ddefault_library=both \ + -Ddocs=false \ + -Dpsl_file=${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat \ + -Dpsl_testfile=${LOCALBASE}/share/public_suffix_list/test_psl.txt USE_LDCONFIG= yes USE_LOCALE= en_US.UTF-8 SHEBANG_FILES= src/psl-make-dafsa TEST_TARGET= test -OPTIONS_DEFINE= NLS OPTIONS_SINGLE= IDNA OPTIONS_SINGLE_IDNA= ICU IDN IDN2 OPTIONS_DEFAULT=IDN2 @@ -38,21 +33,18 @@ 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 -IDN_CONFIGURE_ON= --enable-runtime=libidn +ICU_MESON_ON= -Druntime=libicu IDN_LIB_DEPENDS= libidn.so:dns/libidn \ libunistring.so:devel/libunistring +IDN_MESON_ON= -Druntime=libidn 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 + ${RM} ${STAGEDIR}${PREFIX}/bin/psl-make-dafsa ${STAGEDIR}${PREFIX}/man/man1/psl-make-dafsa.1 .include