- Update security/sudo to 1.8.15

- Remove patch-plugins__sudoers__Makefile.in, unnecessary on stagedir days
- Remove patch-plugins__sudoers__audit.c, sudo_gettext.h is already included
  by sudoers.h
- Rework patch-plugins__sudoers__sudoers.in to replace pkg_* utilities by
  pkg on message

6 files changed, 8 insertions, 27 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 500b9d5d3b3e..ead65e9a414d 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sudo
-PORTVERSION=	1.8.14p3
+PORTVERSION=	1.8.15
 CATEGORIES=	security
 MASTER_SITES=	SUDO
 
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index 7ad6d4165578..db20ac3d32c7 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sudo-1.8.14p3.tar.gz) = a8a697cbb113859058944850d098464618254804cf97961dee926429f00a1237
-SIZE (sudo-1.8.14p3.tar.gz) = 2570892
+SHA256 (sudo-1.8.15.tar.gz) = 4316381708324da8b6cb151f655c1a11855207c7c02244d8ffdea5104d7cc308
+SIZE (sudo-1.8.15.tar.gz) = 2660128
diff --git a/security/sudo/files/patch-plugins__sudoers__Makefile.in b/security/sudo/files/patch-plugins__sudoers__Makefile.in
deleted file mode 100644
index 6ca8dc23ada6..000000000000
--- a/security/sudo/files/patch-plugins__sudoers__Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins/sudoers/Makefile.in.orig	2015-07-15 18:44:07 UTC
-+++ plugins/sudoers/Makefile.in
-@@ -336,8 +336,7 @@ install-plugin: sudoers.la install-dirs
- 
- install-sudoers: install-dirs
- 	$(INSTALL) -d $(INSTALL_OWNER) -m 0750 $(DESTDIR)$(sudoersdir)/sudoers.d
--	test -r $(DESTDIR)$(sudoersdir)/sudoers || \
--	    $(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers
-+	$(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers
- 
- uninstall:
- 	-$(LIBTOOL) $(LTFLAGS) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/sudoers.la
diff --git a/security/sudo/files/patch-plugins__sudoers__audit.c b/security/sudo/files/patch-plugins__sudoers__audit.c
deleted file mode 100644
index 73821c23ca1d..000000000000
--- a/security/sudo/files/patch-plugins__sudoers__audit.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/sudoers/audit.c.orig	2015-07-15 18:44:07 UTC
-+++ plugins/sudoers/audit.c
-@@ -24,6 +24,7 @@
- 
- #ifdef HAVE_BSM_AUDIT
- # include "bsm_audit.h"
-+# include "sudo_gettext.h"
- #endif
- #ifdef HAVE_LINUX_AUDIT
- # include "linux_audit.h"
diff --git a/security/sudo/files/patch-plugins__sudoers__sudoers.in b/security/sudo/files/patch-plugins__sudoers__sudoers.in
index cdc4428cb78b..d98171752380 100644
--- a/security/sudo/files/patch-plugins__sudoers__sudoers.in
+++ b/security/sudo/files/patch-plugins__sudoers__sudoers.in
@@ -5,8 +5,8 @@
  ## Defaults specification
  ##
 +## Uncomment if needed to preserve environmental variables related to the
-+## FreeBSD pkg_* utilities and fetch.
-+# Defaults     env_keep += "PKG_PATH PKG_DBDIR PKG_TMPDIR TMPDIR PACKAGEROOT PACKAGESITE PKGDIR FTP_PASSIVE_MODE"
++## FreeBSD pkg utility and fetch.
++# Defaults     env_keep += "PKG_CACHEDIR PKG_DBDIR FTP_PASSIVE_MODE"
 +##
 +## Additionally uncomment if needed to preserve environmental variables
 +## related to portupgrade
diff --git a/security/sudo/pkg-plist b/security/sudo/pkg-plist
index 7ca905dc795f..000ae600e9e5 100644
--- a/security/sudo/pkg-plist
+++ b/security/sudo/pkg-plist
@@ -60,6 +60,7 @@ sbin/visudo
 %%NLS%%share/locale/gl/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/sudoers.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/it/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/it/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/sudo.mo
@@ -75,6 +76,8 @@ sbin/visudo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/sudoers.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/sudo.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/sudo.mo