Add nls as an option, but also fix builds where system gettext gets detected and used.

5 files changed, 70 insertions, 10 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index eb717308e46..3d914a5cfd1 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.148 2016/01/05 17:05:00 adam Exp $
+# $NetBSD: Makefile,v 1.149 2016/01/09 11:22:12 adam Exp $
 
 DISTNAME=	sudo-1.8.15
 CATEGORIES=	security
@@ -48,7 +48,7 @@ CFLAGS+=	-D_INCOMPLETE_XOPEN_C063=1
 
 OWN_DIRS+=		${VARBASE}/run
 BUILD_DEFS+=		VARBASE
-PLIST_VARS+=		ldap noexec
+PLIST_VARS+=		ldap nls noexec
 
 DOCDIR=			share/doc/${PKGBASE}
 EGDIR=			share/examples/${PKGBASE}
diff --git a/security/sudo/PLIST b/security/sudo/PLIST
index 61b4b3da013..66959d6f774 100644
--- a/security/sudo/PLIST
+++ b/security/sudo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/01/01 17:00:49 spz Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/01/09 11:22:12 adam Exp $
 bin/sudo
 bin/sudoedit
 bin/sudoreplay
@@ -34,3 +34,56 @@ share/examples/sudo/pam.conf
 share/examples/sudo/sudo.conf
 share/examples/sudo/sudoers
 share/examples/sudo/syslog.conf
+${PLIST.nls}share/locale/ca/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/ca/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/el/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/eo/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/eo/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/eu/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/eu/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/gl/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/hr/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/hr/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/hu/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/lt/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/sk/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/sk/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/sl/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/sl/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/sudoers.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/sudo.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/sudoers.mo
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index 2a5ffb7e7f0..3aae910d112 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.85 2016/01/05 17:05:00 adam Exp $
+$NetBSD: distinfo,v 1.86 2016/01/09 11:22:12 adam Exp $
 
 SHA1 (sudo-1.8.15.tar.gz) = acb5ff3f38fa9e0365f6a91a6620b9846e2ad843
 RMD160 (sudo-1.8.15.tar.gz) = 676ee3249c2ddacd64de54d6555b820912b56f6f
 SHA512 (sudo-1.8.15.tar.gz) = f2bff92104ddc4cbea8c788da446043cbfe02c977cedf18d46b1c82e98d7227432cb5a61233e7a06af84e3637f906edd5e02bb88c03a2ce4a16df410469a5dab
 Size (sudo-1.8.15.tar.gz) = 2660128 bytes
-SHA1 (patch-aa) = de75d916f2b2ce9ac24c9b69f99df984fd0c41fe
+SHA1 (patch-aa) = 63c89e6d4e530ab92b7452f4025fbbf2a45dad65
 SHA1 (patch-af) = 9ef912344d9cd4c3811a4d705d3424cd88621710
 SHA1 (patch-ag) = c62f063ffc9e8fb3fce7c94a8cba531ecb8b76ff
 SHA1 (patch-plugins_sudoers_Makefile.in) = d8612ac7bf2f5a892d9720c4df91810ca807f4ed
diff --git a/security/sudo/options.mk b/security/sudo/options.mk
index 9963f845ad8..fec0fe8e1c6 100644
--- a/security/sudo/options.mk
+++ b/security/sudo/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.18 2015/07/11 15:12:27 sevan Exp $
-#
+# $NetBSD: options.mk,v 1.19 2016/01/09 11:22:12 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sudo
-PKG_SUPPORTED_OPTIONS=	ldap
+PKG_SUPPORTED_OPTIONS=	ldap nls
 PKG_OPTIONS_OPTIONAL_GROUPS= auth
 PKG_OPTIONS_GROUP.auth=	kerberos pam skey
 
@@ -16,6 +15,14 @@ PKG_SUGGESTED_OPTIONS=	pam
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mnls)
+.  include "../../devel/gettext-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-nls
+PLIST.nls=		yes
+.else
+CONFIGURE_ARGS+=	--disable-nls
+.endif
+
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 DL_AUTO_VARS=		yes
diff --git a/security/sudo/patches/patch-aa b/security/sudo/patches/patch-aa
index 372146b2fb0..b9bcb874c79 100644
--- a/security/sudo/patches/patch-aa
+++ b/security/sudo/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.31 2016/01/01 17:00:49 spz Exp $
+$NetBSD: patch-aa,v 1.32 2016/01/09 11:22:12 adam Exp $
 
 * Don't setuid here.
 
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.31 2016/01/01 17:00:49 spz Exp $
  INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
 -INSTALL_OWNER = -o $(install_uid) -g $(install_gid)
 +#INSTALL_OWNER = -o $(install_uid) -g $(install_gid)
-+INSTALL_OWNER = ""
++INSTALL_OWNER =
  
  ECHO_N = @ECHO_N@
  ECHO_C = @ECHO_C@