Update to 1.38.2:

Version 1.38		April 26, 2010

  * Support ENVIRONMENT and FILES sections.
  * Move all translated text into .po files (previously .h2m include
    files were handled seperately).
  * Submit package to the Translation Project (translationproject.org).
  * Add Vietnamese translation.
  * Add some comments for translators.

Version 1.37		November 14, 2009

  * Update GPL to v3.
  * Add --version-string option.
  * Add --no-discard-stderr option.
  * Add line breaks into bug reporting section.
  * Add Brazilian Portuguese and German translations.
  * Select a reasonable configure default for --enable-nls.
  * Revise preload mechanism to not require preloadable libintl.

6 files changed, 26 insertions, 91 deletions

diff --git a/converters/help2man/Makefile b/converters/help2man/Makefile
index 5748be3aeaa..d91ea2d1a7f 100644
--- a/converters/help2man/Makefile
+++ b/converters/help2man/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/01/17 20:43:27 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/02 11:25:29 wiz Exp $
 #
 
-DISTNAME=		help2man-1.36.4
+DISTNAME=		help2man-1.38.2
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_GNU:=help2man/}
 
 MAINTAINER=		arved@arved.at
 HOMEPAGE=		http://www.gnu.org/software/help2man/
 COMMENT=		Generate simple manual pages from program output
+LICENSE=		gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/converters/help2man/PLIST b/converters/help2man/PLIST
index 6cfd8fa3a9b..80f30a537b3 100644
--- a/converters/help2man/PLIST
+++ b/converters/help2man/PLIST
@@ -1,13 +1,21 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:39:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/05/02 11:25:29 wiz Exp $
 bin/help2man
 info/help2man.info
-lib/hacklocaledir.so
+lib/bindtextdomain.so
+man/de/man1/help2man.1
 man/fi/man1/help2man.1
 man/fr/man1/help2man.1
 man/man1/help2man.1
 man/pl/man1/help2man.1
+man/pt_BR/man1/help2man.1
+man/ru/man1/help2man.1
 man/sv/man1/help2man.1
+man/vi/man1/help2man.1
+share/locale/de/LC_MESSAGES/help2man.mo
 share/locale/fi/LC_MESSAGES/help2man.mo
 share/locale/fr/LC_MESSAGES/help2man.mo
 share/locale/pl/LC_MESSAGES/help2man.mo
+share/locale/pt_BR/LC_MESSAGES/help2man.mo
+share/locale/ru/LC_MESSAGES/help2man.mo
 share/locale/sv/LC_MESSAGES/help2man.mo
+share/locale/vi/LC_MESSAGES/help2man.mo
diff --git a/converters/help2man/distinfo b/converters/help2man/distinfo
index 5451b910757..cd60b0e75b8 100644
--- a/converters/help2man/distinfo
+++ b/converters/help2man/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/17 20:43:27 wiz Exp $
+$NetBSD: distinfo,v 1.2 2010/05/02 11:25:29 wiz Exp $
 
-SHA1 (help2man-1.36.4.tar.gz) = f3ffd89d50ee158589f2d0ccdc476d2ac3ebff70
-RMD160 (help2man-1.36.4.tar.gz) = 1c2e18f86c2d689dbc4bbc1d85e60a2273308c42
-Size (help2man-1.36.4.tar.gz) = 85630 bytes
-SHA1 (patch-aa) = d285c85af63fe4477203a532814b0d22f3710191
-SHA1 (patch-ab) = 0f37b43ee53dfad50de340082c8b1684fb18b8c5
-SHA1 (patch-ac) = 71ddc4490430f972b3be44049117edfb0d314daa
+SHA1 (help2man-1.38.2.tar.gz) = 6f0109589eca3286c2619b03efd3f85433696039
+RMD160 (help2man-1.38.2.tar.gz) = 8edf87341eef27195006a264d29685b0f85ae099
+Size (help2man-1.38.2.tar.gz) = 136509 bytes
+SHA1 (patch-aa) = 4adc2686570056d8839698a9243ba8c516729e0a
diff --git a/converters/help2man/patches/patch-aa b/converters/help2man/patches/patch-aa
index 9c4e9ce1624..360a77472f1 100644
--- a/converters/help2man/patches/patch-aa
+++ b/converters/help2man/patches/patch-aa
@@ -1,5 +1,5 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/17 20:43:27 wiz Exp $
---- Makefile.in.orig	2005-10-29 02:50:33.000000000 -0400
+$NetBSD: patch-aa,v 1.2 2010/05/02 11:25:29 wiz Exp $
+--- Makefile.in.orig	2010-04-26 10:41:13.000000000 +0000
 +++ Makefile.in
 @@ -23,6 +23,7 @@ PERL = @PERL@
  LIBS = @LIBS@
@@ -9,43 +9,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/01/17 20:43:27 wiz Exp $
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_INFO = @INSTALL_INFO@
  MAKEINFO = @MAKEINFO@
-@@ -36,14 +37,14 @@ all: $(target) man info @extra_make_all@
+@@ -45,7 +46,7 @@ install_base:
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
  
- install: all install_base @extra_make_install@
- install_base:
--	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
--	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
--	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
--	$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
--
 -	$(INSTALL_PROGRAM) $(target) $(DESTDIR)$(bindir)
--	$(INSTALL_DATA) $(srcdir)/$(target).1 $(DESTDIR)$(mandir)/man1
--	$(INSTALL_DATA) $(srcdir)/$(target).info \
-+	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
-+	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(libdir)
-+	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(infodir)
-+
-+	$(BSD_INSTALL_SCRIPT) $(target) $(DESTDIR)$(bindir)
-+	$(BSD_INSTALL_DATA) $(srcdir)/$(target).1 $(DESTDIR)$(mandir)/man1
-+	$(BSD_INSTALL_DATA) $(srcdir)/$(target).info \
++	$(INSTALL_SCRIPT) $(target) $(DESTDIR)$(bindir)
+ 	$(INSTALL_DATA) $(call vpath_file,$(target).1) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_DATA) $(call vpath_file,/$(target).info) \
  	    $(DESTDIR)$(infodir)/$(target).info
- 
- 	if test -f $(DESTDIR)$(infodir)/dir; \
-@@ -53,13 +54,13 @@ install_base:
- 	fi
- 
- install_preload: preload
--	$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(libdir)
-+	$(BSD_INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(libdir)
- 
- install_l10n: man_l10n
- 	for lang in $(LINGUAS); \
- 	do \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/$$lang/man1; \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
-+	    $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/$$lang/man1; \
-+	    $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- 	    $(INSTALL_DATA) $(srcdir)/$(target).$$lang.1 \
- 		$(DESTDIR)$(mandir)/$$lang/man1/$(target).1; \
- 	    $(INSTALL_DATA) $(srcdir)/po/$$lang.gmo \
diff --git a/converters/help2man/patches/patch-ab b/converters/help2man/patches/patch-ab
deleted file mode 100644
index 41b0deb36f2..00000000000
--- a/converters/help2man/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/01/17 20:43:27 wiz Exp $
---- hacklocaledir.c.orig	2003-07-08 10:23:53.000000000 -0400
-+++ hacklocaledir.c
-@@ -40,12 +40,21 @@ int __open(char const *path, int flags, 
-     static size_t matchlen;
-     char *newpath = 0;
-     int r;
--
-+#ifdef RTLD_NEXT
-     if (!open && !(open = dlsym(RTLD_NEXT, "open")))
-     {
- 	fprintf(stderr, PRELOAD ": can't find open(): %s\n", dlerror());
- 	return -1;
-     }
-+#else
-+    void *handle = dlopen(NULL, DL_LAZY);
-+    if (!open && !(open = dlsym(handle, "open")))
-+    {
-+        fprintf(stderr, PRELOAD ": can't find open(): %s\n", dlerror());
-+        return -1;
-+    }
-+    dlclose(handle);
-+#endif
- 
-     if (textdomain || (textdomain = getenv("TEXTDOMAIN")))
-     {
diff --git a/converters/help2man/patches/patch-ac b/converters/help2man/patches/patch-ac
deleted file mode 100644
index 018e7e7f1b3..00000000000
--- a/converters/help2man/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/01/17 20:43:27 wiz Exp $
-
---- configure.orig	2006-02-27 09:05:49.000000000 -0500
-+++ configure
-@@ -2415,10 +2415,6 @@ echo $ECHO_N "checking for pre-loadable 
-     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'