Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714603363283290"
MIME-Version: 1.0
Date: Wed, 1 May 2024 22:42:43 +0000
From: "Aleksey Cheusov" <cheusov@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/grep
To: pkgsrc-changes@NetBSD.org
Reply-To: cheusov@netbsd.org
Message-Id: <20240501224243.102C6FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714603363283290
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	cheusov
Date:		Wed May  1 22:42:42 UTC 2024

Modified Files:
	pkgsrc/textproc/grep: Makefile PLIST
Added Files:
	pkgsrc/textproc/grep: options.mk

Log Message:
Add option "nls" enabled by default


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/textproc/grep/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/grep/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/grep/options.mk

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


--_----------=_1714603363283290
Content-Disposition: inline
Content-Length: 5899
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/grep/Makefile
diff -u pkgsrc/textproc/grep/Makefile:1.66 pkgsrc/textproc/grep/Makefile:1.67
--- pkgsrc/textproc/grep/Makefile:1.66	Mon Jul 17 14:15:43 2023
+++ pkgsrc/textproc/grep/Makefile	Wed May  1 22:42:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2023/07/17 14:15:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2024/05/01 22:42:42 cheusov Exp $
 
 DISTNAME=	grep-3.11
 CATEGORIES=	textproc
@@ -23,6 +23,7 @@ TEXINFO_REQD=		4.0
 INSTALLATION_DIRS=	${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 .if ${OS_VARIANT} == "SCOOSR5"
 # SCO OpenServer 5.0.7/3.2's pthread is builtin GNU pth.
@@ -38,6 +39,5 @@ post-install:
 	${LN} -sf ${PREFIX}/${g} ${DESTDIR}${PREFIX}/${n}
 .endfor
 
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/grep/PLIST
diff -u pkgsrc/textproc/grep/PLIST:1.11 pkgsrc/textproc/grep/PLIST:1.12
--- pkgsrc/textproc/grep/PLIST:1.11	Mon Sep  5 13:24:27 2022
+++ pkgsrc/textproc/grep/PLIST	Wed May  1 22:42:42 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2022/09/05 13:24:27 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.12 2024/05/01 22:42:42 cheusov Exp $
 bin/gegrep
 bin/gfgrep
 bin/ggrep
@@ -10,48 +10,48 @@ gnu/man/man1/fgrep.1
 gnu/man/man1/grep.1
 info/grep.info
 man/man1/ggrep.1
-share/locale/af/LC_MESSAGES/grep.mo
-share/locale/be/LC_MESSAGES/grep.mo
-share/locale/bg/LC_MESSAGES/grep.mo
-share/locale/ca/LC_MESSAGES/grep.mo
-share/locale/cs/LC_MESSAGES/grep.mo
-share/locale/da/LC_MESSAGES/grep.mo
-share/locale/de/LC_MESSAGES/grep.mo
-share/locale/el/LC_MESSAGES/grep.mo
-share/locale/eo/LC_MESSAGES/grep.mo
-share/locale/es/LC_MESSAGES/grep.mo
-share/locale/et/LC_MESSAGES/grep.mo
-share/locale/eu/LC_MESSAGES/grep.mo
-share/locale/fi/LC_MESSAGES/grep.mo
-share/locale/fr/LC_MESSAGES/grep.mo
-share/locale/ga/LC_MESSAGES/grep.mo
-share/locale/gl/LC_MESSAGES/grep.mo
-share/locale/he/LC_MESSAGES/grep.mo
-share/locale/hr/LC_MESSAGES/grep.mo
-share/locale/hu/LC_MESSAGES/grep.mo
-share/locale/id/LC_MESSAGES/grep.mo
-share/locale/it/LC_MESSAGES/grep.mo
-share/locale/ja/LC_MESSAGES/grep.mo
-share/locale/ka/LC_MESSAGES/grep.mo
-share/locale/ko/LC_MESSAGES/grep.mo
-share/locale/ky/LC_MESSAGES/grep.mo
-share/locale/lt/LC_MESSAGES/grep.mo
-share/locale/nb/LC_MESSAGES/grep.mo
-share/locale/nl/LC_MESSAGES/grep.mo
-share/locale/pa/LC_MESSAGES/grep.mo
-share/locale/pl/LC_MESSAGES/grep.mo
-share/locale/pt/LC_MESSAGES/grep.mo
-share/locale/pt_BR/LC_MESSAGES/grep.mo
-share/locale/ro/LC_MESSAGES/grep.mo
-share/locale/ru/LC_MESSAGES/grep.mo
-share/locale/sk/LC_MESSAGES/grep.mo
-share/locale/sl/LC_MESSAGES/grep.mo
-share/locale/sr/LC_MESSAGES/grep.mo
-share/locale/sv/LC_MESSAGES/grep.mo
-share/locale/ta/LC_MESSAGES/grep.mo
-share/locale/th/LC_MESSAGES/grep.mo
-share/locale/tr/LC_MESSAGES/grep.mo
-share/locale/uk/LC_MESSAGES/grep.mo
-share/locale/vi/LC_MESSAGES/grep.mo
-share/locale/zh_CN/LC_MESSAGES/grep.mo
-share/locale/zh_TW/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/af/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/be/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/bg/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/ca/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/el/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/eo/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/et/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/eu/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/ga/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/gl/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/he/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/hr/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/hu/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/id/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/ka/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/ky/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/lt/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/pa/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/pt/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/sk/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/sl/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/ta/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/th/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/grep.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/grep.mo

Added files:

Index: pkgsrc/textproc/grep/options.mk
diff -u /dev/null pkgsrc/textproc/grep/options.mk:1.1
--- /dev/null	Wed May  1 22:42:43 2024
+++ pkgsrc/textproc/grep/options.mk	Wed May  1 22:42:42 2024
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2024/05/01 22:42:42 cheusov Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.grep
+
+PKG_SUPPORTED_OPTIONS=		nls
+PKG_SUGGESTED_OPTIONS=		nls
+
+PLIST_VARS+=	nls
+
+.include "../../mk/bsd.options.mk"
+
+# nls
+.if !empty(PKG_OPTIONS:Mnls)
+.include "../../devel/gettext-lib/buildlink3.mk"
+PLIST.nls=	yes
+.else
+CONFIGURE_ARGS+= --disable-nls
+.endif


--_----------=_1714603363283290--