5 files changed, 14 insertions, 40 deletions

diff --git a/misc/help2man/Makefile b/misc/help2man/Makefile
index b443e3c7607e..5ca0f42632d2 100644
--- a/misc/help2man/Makefile
+++ b/misc/help2man/Makefile
@@ -7,25 +7,26 @@
 #
 
 PORTNAME=	help2man
-PORTVERSION=	1.36.4
-PORTREVISION=	3
+PORTVERSION=	1.37.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	arved@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically generating simple manual pages from program output
 
 .if !defined(WITHOUT_NLS)
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext
 
-MANLANG=	"" pl fr fi sv
+MANLANG=	"" de fi fr pl pt_BR sv
 PLIST_SUB+=	NLS=""
 USE_GETTEXT=	yes
+INSTALL_TARGET=	install install_l10n
 .else
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
+INSTALL_TARGET=	install
 .endif
 
 GNU_CONFIGURE=	yes
diff --git a/misc/help2man/distinfo b/misc/help2man/distinfo
index df9fb3a8077c..b5f36ad7efb9 100644
--- a/misc/help2man/distinfo
+++ b/misc/help2man/distinfo
@@ -1,3 +1,3 @@
-MD5 (help2man-1.36.4.tar.gz) = d31a0a38c2ec71faa06723f6b8bd3076
-SHA256 (help2man-1.36.4.tar.gz) = a4adadf76b496a6bc50795702253ecfcb6f0d159b68038f31a5362009340bca2
-SIZE (help2man-1.36.4.tar.gz) = 85630
+MD5 (help2man-1.37.1.tar.gz) = 371b5cc74fe9c2ea3ee1ca23c19b19a8
+SHA256 (help2man-1.37.1.tar.gz) = 3b44a91ef8e722c570a2a2d0e3f1cd249aac25dd2b2692c7792d87b30ed61561
+SIZE (help2man-1.37.1.tar.gz) = 107414
diff --git a/misc/help2man/files/patch-Makefile.in b/misc/help2man/files/patch-Makefile.in
deleted file mode 100644
index 051159cb4ae2..000000000000
--- a/misc/help2man/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	Tue Mar  2 17:59:55 2004
-+++ Makefile.in	Tue Mar  2 18:00:28 2004
-@@ -23,6 +23,7 @@
- LIBS = @LIBS@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_INFO = @INSTALL_INFO@
- MAKEINFO = @MAKEINFO@
-@@ -41,7 +42,7 @@
- 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
- 	$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
- 
--	$(INSTALL_PROGRAM) $(target) $(DESTDIR)$(bindir)
-+	$(INSTALL_SCRIPT) $(target) $(DESTDIR)$(bindir)
- 	$(INSTALL_DATA) $(srcdir)/$(target).1 $(DESTDIR)$(mandir)/man1
- 	$(INSTALL_DATA) $(srcdir)/$(target).info \
- 	    $(DESTDIR)$(infodir)/$(target).info
diff --git a/misc/help2man/files/patch-configure b/misc/help2man/files/patch-configure
deleted file mode 100644
index 0f91e78552e8..000000000000
--- a/misc/help2man/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Wed Mar  3 10:56:35 2004
-+++ configure	Wed Mar  3 10:56:54 2004
-@@ -2307,10 +2307,6 @@
-     preload=`LD_PRELOAD="preloadable_libintl.so" sh -c 'echo yes' 2>/dev/null`
-     echo "$as_me:$LINENO: result: ${preload:=no}" >&5
- echo "${ECHO_T}${preload:=no}" >&6
--    test "$preload" = no && \
--	{ { echo "$as_me:$LINENO: error: libpreloadable_libintl.so required (gettext 0.12+)" >&5
--echo "$as_me: error: libpreloadable_libintl.so required (gettext 0.12+)" >&2;}
--   { (exit 1); exit 1; }; }
- 
-     extra_make_all='preload man_l10n'
-     extra_make_install='install_preload install_l10n'
diff --git a/misc/help2man/pkg-plist b/misc/help2man/pkg-plist
index 76529d747647..f652a3d4d2d0 100644
--- a/misc/help2man/pkg-plist
+++ b/misc/help2man/pkg-plist
@@ -1,14 +1,19 @@
 bin/help2man
-%%NLS%%lib/hacklocaledir.so
+%%NLS%%share/locale/de/LC_MESSAGES/help2man.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/help2man.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/help2man.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/help2man.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/help2man.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/help2man.mo
+%%NLS%%@dirrmtry man/de/man1
+%%NLS%%@dirrmtry man/de
 %%NLS%%@dirrmtry man/fi/man1
 %%NLS%%@dirrmtry man/fi
 %%NLS%%@dirrmtry man/fr/man1
 %%NLS%%@dirrmtry man/fr
 %%NLS%%@dirrmtry man/pl/man1
 %%NLS%%@dirrmtry man/pl
+%%NLS%%@dirrmtry man/pt_BR/man1
+%%NLS%%@dirrmtry man/pt_BR
 %%NLS%%@dirrmtry man/sv/man1
 %%NLS%%@dirrmtry man/sv