Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A431584F26 for ; Thu, 29 Jun 2023 08:24:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id FbJd0-1ZXFY9 for ; Thu, 29 Jun 2023 08:24:19 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D872C84EF0 for ; Thu, 29 Jun 2023 08:24:19 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D1CB8FA89; Thu, 29 Jun 2023 08:24:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1688027059154300" MIME-Version: 1.0 Date: Thu, 29 Jun 2023 08:24:19 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel/gettext-lib To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20230629082419.D1CB8FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1688027059154300 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Jun 29 08:24:19 UTC 2023 Modified Files: pkgsrc/devel/gettext-lib: buildlink3.mk builtin.mk distinfo Added Files: pkgsrc/devel/gettext-lib/patches: patch-gettext-runtime_intl_configure Log Message: gettext-lib: fix relocatable for libintl; apply some pkglint suggestions To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/gettext-lib/buildlink3.mk cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/gettext-lib/builtin.mk cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/gettext-lib/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_intl_configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1688027059154300 Content-Disposition: inline Content-Length: 5442 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/gettext-lib/buildlink3.mk diff -u pkgsrc/devel/gettext-lib/buildlink3.mk:1.42 pkgsrc/devel/gettext-lib/buildlink3.mk:1.43 --- pkgsrc/devel/gettext-lib/buildlink3.mk:1.42 Thu Aug 11 13:37:24 2022 +++ pkgsrc/devel/gettext-lib/buildlink3.mk Thu Jun 29 08:24:19 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.42 2022/08/11 13:37:24 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.43 2023/06/29 08:24:19 adam Exp $ BUILDLINK_TREE+= gettext @@ -22,7 +22,7 @@ BUILDLINK_LDADD.gettext+= ${BUILDLINK_LD # to LIBS to workaround this brokenness. # BROKEN_GETTEXT_DETECTION?= no -.if !empty(BROKEN_GETTEXT_DETECTION:M[yY][eE][sS]) +.if ${BROKEN_GETTEXT_DETECTION:tl} == yes BUILDLINK_LIBS.gettext+= ${BUILDLINK_LDADD.gettext} CONFIGURE_ENV+= INTLLIBS="${BUILDLINK_LDADD.gettext}" .endif @@ -50,7 +50,7 @@ CHECK_BUILTIN.gettext:= yes CHECK_BUILTIN.gettext:= no # A built-in gettext is always going to use a built-in iconv. -.if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) +.if ${USE_BUILTIN.gettext:tl} == yes USE_BUILTIN.iconv= yes .else #BUILDLINK_INCDIRS.gettext+= include/gettext Index: pkgsrc/devel/gettext-lib/builtin.mk diff -u pkgsrc/devel/gettext-lib/builtin.mk:1.49 pkgsrc/devel/gettext-lib/builtin.mk:1.50 --- pkgsrc/devel/gettext-lib/builtin.mk:1.49 Thu Oct 15 23:32:07 2020 +++ pkgsrc/devel/gettext-lib/builtin.mk Thu Jun 29 08:24:19 2023 @@ -1,12 +1,12 @@ -# $NetBSD: builtin.mk,v 1.49 2020/10/15 23:32:07 mcf Exp $ +# $NetBSD: builtin.mk,v 1.50 2023/06/29 08:24:19 adam Exp $ .include "../../mk/bsd.fast.prefs.mk" BUILTIN_PKG:= gettext BUILTIN_FIND_LIBS:= intl -BUILTIN_FIND_HEADERS_VAR:= H_GETTEXT H_GENTOO_GETTEXT \ - H_NGETTEXT_GETTEXT \ +BUILTIN_FIND_HEADERS_VAR:= H_GETTEXT H_GENTOO_GETTEXT \ + H_NGETTEXT_GETTEXT \ H_OPNSVR5_GETTEXT BUILTIN_FIND_HEADERS.H_GETTEXT= libintl.h BUILTIN_FIND_GREP.H_GETTEXT= \#define[ ]*__USE_GNU_GETTEXT @@ -60,12 +60,12 @@ USE_BUILTIN.gettext= no . else USE_BUILTIN.gettext= ${IS_BUILTIN.gettext} . if defined(BUILTIN_PKG.gettext) && \ - !empty(IS_BUILTIN.gettext:M[yY][eE][sS]) + ${IS_BUILTIN.gettext:tl} == yes USE_BUILTIN.gettext= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.gettext} -. if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) +. if ${USE_BUILTIN.gettext:tl} == yes USE_BUILTIN.gettext!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gettext:Q}; then \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gettext}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ @@ -91,7 +91,7 @@ MAKEVARS+= USE_BUILTIN.gettext # Define BUILTIN_LIBNAME.gettext to be the base name of the built-in # gettext library. # -.if !empty(BUILTIN_LIB_FOUND.intl:M[yY][eE][sS]) +.if ${BUILTIN_LIB_FOUND.intl:U:tl} == yes BUILTIN_LIBNAME.gettext= intl .else BUILTIN_LIBNAME.gettext= # empty (part of the C library) @@ -102,11 +102,11 @@ BUILTIN_LIBNAME.gettext= # empty (part o ### solely to determine whether a built-in implementation exists. ### CHECK_BUILTIN.gettext?= no -.if !empty(CHECK_BUILTIN.gettext:M[nN][oO]) +.if ${CHECK_BUILTIN.gettext:tl} == no -. if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) +. if ${USE_BUILTIN.gettext:tl} == yes BUILDLINK_LIBNAME.gettext= ${BUILTIN_LIBNAME.gettext} -. if !empty(OS_VARIANT:MSCOOSR5) +. if ${OS_VARIANT} == SCOOSR5 BUILDLINK_PREFIX.gettext= /usr/gnu . endif . if empty(BUILTIN_LIBNAME.gettext) @@ -119,8 +119,8 @@ BUILDLINK_TRANSFORM+= rm:-lintl # so that it will detect "GNU gettext" in the existing libintl. # . if defined(GNU_CONFIGURE) -. if !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) -. if !empty(BUILTIN_LIB_FOUND.intl:M[yY][eE][sS]) +. if ${USE_BUILTIN.gettext:tl} == yes +. if ${BUILTIN_LIB_FOUND.intl:U:tl} == yes CONFIGURE_ENV+= gt_cv_func_gnugettext_libintl="yes" CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl="yes" . if empty(H_NGETTEXT_GETTEXT:M__nonexistent__) && \ Index: pkgsrc/devel/gettext-lib/distinfo diff -u pkgsrc/devel/gettext-lib/distinfo:1.40 pkgsrc/devel/gettext-lib/distinfo:1.41 --- pkgsrc/devel/gettext-lib/distinfo:1.40 Wed Jun 28 21:14:11 2023 +++ pkgsrc/devel/gettext-lib/distinfo Thu Jun 29 08:24:19 2023 @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.40 2023/06/28 21:14:11 wiz Exp $ +$NetBSD: distinfo,v 1.41 2023/06/29 08:24:19 adam Exp $ BLAKE2s (gettext-0.22.tar.gz) = 6b3b0b9824a6c8d58b28717b2d9089ed4895bbf4a1f7b0979117d8449a28b4ba SHA512 (gettext-0.22.tar.gz) = e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04 Size (gettext-0.22.tar.gz) = 26105696 bytes +SHA1 (patch-gettext-runtime_intl_configure) = 6b873572ad946e069f2a999c5795c9618688d7a1 Added files: Index: pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_intl_configure diff -u /dev/null pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_intl_configure:1.1 --- /dev/null Thu Jun 29 08:24:19 2023 +++ pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_intl_configure Thu Jun 29 08:24:19 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-gettext-runtime_intl_configure,v 1.1 2023/06/29 08:24:19 adam Exp $ + +Do not force relocatable. + +--- gettext-runtime/intl/configure.orig 2023-06-29 07:43:54.000000000 +0000 ++++ gettext-runtime/intl/configure +@@ -6695,7 +6695,6 @@ fi + + + +-enable_relocatable=yes + + ac_header= ac_cache= + for ac_item in $ac_header_c_list --_----------=_1688027059154300--