Update to 1.40.12

Based on pkg/46548 submitted by Wen Heping(myself)

Upstream changes:
help2man (1.40.12) unstable; urgency=low

  * Update Croatian translation (thanks to Tomislav Krznar).
  * Fix updating of help2man.pot to occur only when help2man.PL is
    changed, not help2man generated.

 -- Brendan O'Dea <bod@debian.org>  Thu, 23 Aug 2012 11:43:05 +1000

help2man (1.40.11) unstable; urgency=low

  * Add Croatian translation (thanks to Tomislav Krznar).

 -- Brendan O'Dea <bod@debian.org>  Sat, 28 Jul 2012 19:29:43 +1000

help2man (1.40.10) unstable; urgency=low

  * Update Greek translation (thanks to Savvas Radevic).
  * Update Serbian translation (thanks to ........ .......).
  * Update German translation (thanks to Arun Persaud).

 -- Brendan O'Dea <bod@debian.org>  Sat, 12 May 2012 13:54:58 +1000

help2man (1.40.9) unstable; urgency=low

  * Update Japanese translation (thanks to Yasumichi Akahoshi).
  * Update Esperanto translation (thanks to Felipe Castro).
  * Update Vietnamese translation (thanks to Tr.. Ng.. Qu.n).
  * Update German translation (thanks to Chris Leick, closes: #669564).

 -- Brendan O'Dea <bod@debian.org>  Fri, 20 Apr 2012 21:35:43 +1000

help2man (1.40.8) unstable; urgency=low

  * Update French translation (thanks to David Pr.vot).
  * Update Italian translation (thanks to Sergio Zanchetta).
  * Update Polish translation (thanks to Jakub Bogusz).
  * Update Russian translation (thanks to Yuri Kozlov).
  * Update Ukranian translation (thanks to Yuri Chornoivan).
  * Modify self-extracting scripts to output to a temporary file.
  * Ensure that help2man exists before building manual pages (as reported
    by Richard Maw).

 -- Brendan O'Dea <bod@debian.org>  Sun, 08 Apr 2012 23:10:20 +1000

help2man (1.40.7) unstable; urgency=low

  * Update Greek translation (thanks to Savvas Radevic).

 -- Brendan O'Dea <bod@debian.org>  Mon, 19 Mar 2012 21:28:41 +1100

help2man (1.40.6) unstable; urgency=low

  * Update years in debian/copyright.
  * Fix FSF address in comments (thanks to Paul Eggert).

 -- Brendan O'Dea <bod@debian.org>  Sun, 12 Feb 2012 22:39:25 +1100

help2man (1.40.5) unstable; urgency=low

  * Clean up some lintian warnings: build-targets, source format and
    standards version.
  * Add Serbian translation (thanks to Miroslav Nikolic).
  * Fix trivial translation changes due to additional copyright year.
  * Minor fix to Italian translation.

 -- Brendan O'Dea <bod@debian.org>  Mon, 02 Jan 2012 20:50:50 +1100

help2man (1.40.4) unstable; urgency=low

  * Update Brazilian Portuguese translation (thanks to Rodolfo Ribeiro
    Gomes).

 -- Brendan O'Dea <bod@debian.org>  Mon, 20 Jun 2011 11:29:04 +1000

help2man (1.40.3) unstable; urgency=low

  * Update Esperanto translation (thanks to Felipe Castro).
  * Update links to git repository.

 -- Brendan O'Dea <bod@debian.org>  Tue, 14 Jun 2011 10:08:53 +1000

help2man (1.40.2) unstable; urgency=low

  * Remove a superfluous period from texinfo doc.
  * Change footnote about supported languages to a simple paragraph.
  * Update Italian translation (thanks to Sergio Zanchetta).
  * Update Ukrainian translation (thanks to Yuri Chornoivan).
  * Update French translation (thanks to David Pr.vot).
  * Update Japanese translation (thanks to Yasumichi Akahoshi).
  * Update Russian translation (thanks to Yuri Kozlov).
  * Update Polish translation (thanks to Jakub Bogusz).

 -- Brendan O'Dea <bod@debian.org>  Wed, 01 Jun 2011 08:04:45 +1000

help2man (1.40.1) unstable; urgency=low

  * Update texinfo docs with recommendations kindly provided by Karl
    Berry.
  * Document --libtool option.
  * Fixup references to GNU Standards.
  * Allow date format to be localised (thanks to Yasumichi Akahoshi).
  * Add Japanese translation (thanks to Yasumichi Akahoshi).

 -- Brendan O'Dea <bod@debian.org>  Sun, 29 May 2011 11:31:14 +1000

help2man (1.39.4) unstable; urgency=low

  * Update Italian translation (thanks to Sergio Zanchetta).

 -- Brendan O'Dea <bod@debian.org>  Wed, 11 May 2011 22:58:55 +1000

help2man (1.39.3) unstable; urgency=low

  * Update French translation (thanks to David Pr.vot, closes: #620250).
  * Update the "Localised man pages" section of the Texinfo docs and note that
    translations are now handled through the Translation Project.
  * Update German translation (thanks to Chris Leick, closes: #624401).
  * Minor update to German translation as suggested by Werner Lemberg in
    http://sourceforge.net/mailarchive/message.php?msg_id=26828512

 -- Brendan O'Dea <bod@debian.org>  Sun, 01 May 2011 10:35:38 +1000

help2man (1.39.2) unstable; urgency=low

  * Update Russian translation (thanks to Yuri Kozlov).
  * Update Ukranian translation (thanks to Yuri Chornoivan).
  * Update Polish translation (thanks to Jakub Bogusz).
  * Add Esperanto translation (thanks to Felipe Castro).
  * Update Finnish translation (thanks to Tommi Vainikainen).

 -- Brendan O'Dea <bod@debian.org>  Tue, 08 Mar 2011 22:33:01 +1100

help2man (1.39.1) unstable; urgency=low

  * Add option to remove `lt-' prefix for libtool programs (thanks to
    Ben Asselstine).
  * Add Ukranian translation (thanks to Yuri Chornoivan).
  * Update Russian translation (thanks to Yuri Kozlov).
  * Update Polish translation (thanks to Jakub Bogusz).

 -- Brendan O'Dea <bod@debian.org>  Mon, 28 Feb 2011 11:15:44 +1100

help2man (1.38.4) unstable; urgency=low

  * Add Italian translation (thanks to Sergio Zanchetta).
  * Don't double encode $date in the header.
  * Use UTF-8 encoding for all manual pages.
  * Add Greek translation (thanks to Michael Kotsarinis).
  * Update French translation (thanks to David Pr.vot, closes: #590580).
  * Update German translation (thanks to Helge Kreutzmann, closes: #590975).
  * Use INSTALL_SCRIPT to install Perl script.
  * Remove deprecated DH_COMPAT in debian/rules, adding debian/compat.
  * Add ${misc:Depends}.
  * Don't ignore errors from distclean.
  * Fix Brazilian, Russian and Italian translations (placement of period was
    causing text to be interpreted as a macro).
  * Update standards version to 3.9.1.
  * Add missing dependency on dpkg/install-info.
  * Strip bindtextdomain.so preload.
  * Install preload into $(libdir)/help2man.

 -- Brendan O'Dea <bod@debian.org>  Tue, 28 Dec 2010 15:43:36 +1100

help2man (1.38.3) unstable; urgency=low

  * Apply patch from Mike Frysinger to allow "make install -j" to work.

 -- Brendan O'Dea <bod@debian.org>  Sun, 04 Jul 2010 12:17:17 +1000

4 files changed, 29 insertions, 40 deletions

diff --git a/converters/help2man/Makefile b/converters/help2man/Makefile
index 1a76696c654..02f6ee39272 100644
--- a/converters/help2man/Makefile
+++ b/converters/help2man/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2012/10/03 21:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/13 12:25:02 wen Exp $
 
-DISTNAME=		help2man-1.38.2
-PKGREVISION=		5
+DISTNAME=		help2man-1.40.12
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_GNU:=help2man/}
 
@@ -16,11 +15,18 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		perl:run msgfmt gmake
 
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	Fixing install lib paths.
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	Makefile.in
+SUBST_SED.paths=	-e 's,(libdir)/help2man,(libdir),g'
+
 INFO_FILES=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS+=		nls
+
 .if ${OPSYS} == "Darwin" && ${OS_VERSION:M8.*} != ""
 CONFIGURE_ARGS+= --disable-nls
 .else
diff --git a/converters/help2man/PLIST b/converters/help2man/PLIST
index 7e955df8f7e..bbf2403e305 100644
--- a/converters/help2man/PLIST
+++ b/converters/help2man/PLIST
@@ -1,21 +1,35 @@
-@comment $NetBSD: PLIST,v 1.4 2010/12/08 20:29:05 abs Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/10/13 12:25:02 wen Exp $
 bin/help2man
 info/help2man.info
 ${PLIST.nls}lib/bindtextdomain.so
 ${PLIST.nls}man/de/man1/help2man.1
+${PLIST.nls}man/el/man1/help2man.1
+${PLIST.nls}man/eo/man1/help2man.1
 ${PLIST.nls}man/fi/man1/help2man.1
 ${PLIST.nls}man/fr/man1/help2man.1
-man/man1/help2man.1
+${PLIST.nls}man/hr/man1/help2man.1
+${PLIST.nls}man/it/man1/help2man.1
+${PLIST.nls}man/ja/man1/help2man.1
+${PLIST.nls}man/man1/help2man.1
 ${PLIST.nls}man/pl/man1/help2man.1
 ${PLIST.nls}man/pt_BR/man1/help2man.1
 ${PLIST.nls}man/ru/man1/help2man.1
+${PLIST.nls}man/sr/man1/help2man.1
 ${PLIST.nls}man/sv/man1/help2man.1
+${PLIST.nls}man/uk/man1/help2man.1
 ${PLIST.nls}man/vi/man1/help2man.1
 ${PLIST.nls}share/locale/de/LC_MESSAGES/help2man.mo
+${PLIST.nls}share/locale/el/LC_MESSAGES/help2man.mo
+${PLIST.nls}share/locale/eo/LC_MESSAGES/help2man.mo
 ${PLIST.nls}share/locale/fi/LC_MESSAGES/help2man.mo
 ${PLIST.nls}share/locale/fr/LC_MESSAGES/help2man.mo
+${PLIST.nls}share/locale/hr/LC_MESSAGES/help2man.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/help2man.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/help2man.mo
 ${PLIST.nls}share/locale/pl/LC_MESSAGES/help2man.mo
 ${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/help2man.mo
 ${PLIST.nls}share/locale/ru/LC_MESSAGES/help2man.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/help2man.mo
 ${PLIST.nls}share/locale/sv/LC_MESSAGES/help2man.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/help2man.mo
 ${PLIST.nls}share/locale/vi/LC_MESSAGES/help2man.mo
diff --git a/converters/help2man/distinfo b/converters/help2man/distinfo
index b8893d1ff1d..ecbbbf8dc8b 100644
--- a/converters/help2man/distinfo
+++ b/converters/help2man/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/07/11 11:49:27 marino Exp $
+$NetBSD: distinfo,v 1.4 2012/10/13 12:25:02 wen Exp $
 
-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) = 1aa015217a81ce58c597a0835e4c5c06ebe328d9
+SHA1 (help2man-1.40.12.tar.gz) = 5773bacc2b455356527fc0bd804c6801142e986d
+RMD160 (help2man-1.40.12.tar.gz) = 33a491af667e97588c0ecd1f3a1cc81b8519e5a6
+Size (help2man-1.40.12.tar.gz) = 190870 bytes
diff --git a/converters/help2man/patches/patch-aa b/converters/help2man/patches/patch-aa
deleted file mode 100644
index 2c9ee191d7d..00000000000
--- a/converters/help2man/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2012/07/11 11:49:27 marino Exp $
-
---- Makefile.in.orig	2010-04-26 10:41:13.000000000 +0000
-+++ Makefile.in
-@@ -23,6 +23,7 @@ PERL = @PERL@
- LIBS = @LIBS@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_INFO = @INSTALL_INFO@
- MAKEINFO = @MAKEINFO@
-@@ -45,7 +46,7 @@ install_base:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
- 	$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
- 
--	$(INSTALL_PROGRAM) $(target) $(DESTDIR)$(bindir)
-+	$(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
-@@ -110,7 +111,7 @@ $(target).h2m: $(srcdir)/$(target).h2m.P
- 
- preload: $(preload).so
- $(preload).so: $(srcdir)/$(preload).c
--	$(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)
-+	$(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS) $(COMPILER_RPATH_FLAG)$(libdir)
- 
- man: $(target).1
- $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL