[pkgsrc/trunk]: pkgsrc/converters/help2man Unbreak help2man build on Mac OS X...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86bbf23a57cc
branches:  trunk
changeset: 641987:86bbf23a57cc
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Nov 22 14:59:59 2014 +0000

description:
Unbreak help2man build on Mac OS X Tiger. Put the localized info pages
into the "nls" option.

PKGREVISION++.

Patch provided by Sevan Janiyan in PR pkg/49059.

diffstat:

 converters/help2man/Makefile |  11 ++++-------
 converters/help2man/PLIST    |  10 +++++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

diffs (53 lines):

diff -r 27c5f7ec4bfb -r 86bbf23a57cc converters/help2man/Makefile
--- a/converters/help2man/Makefile      Sat Nov 22 14:58:51 2014 +0000
+++ b/converters/help2man/Makefile      Sat Nov 22 14:59:59 2014 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2014/10/12 15:21:28 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2014/11/22 14:59:59 bsiegert Exp $
 
 DISTNAME=      help2man-1.46.4
+PKGREVISION=   1
 CATEGORIES=    converters
 MASTER_SITES=  ${MASTER_SITE_GNU:=help2man/}
 EXTRACT_SUFX=  .tar.xz
@@ -27,7 +28,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 # XXX: will undoubtedly include more versions
-.if ${OPSYS} == "Darwin" && !empty(OS_VERSION:M9.*)
+.if ${OPSYS} == "Darwin" && !empty(OS_VERSION:M8.*) || !empty(OS_VERSION:M9.*)
 SUBST_CLASSES+=                shlibarg
 SUBST_STAGE.shlibarg=  pre-configure
 SUBST_FILES.shlibarg=  Makefile.in
@@ -36,12 +37,8 @@
 
 PLIST_VARS+=           nls
 
-.if ${OPSYS} == "Darwin" && ${OS_VERSION:M8.*} != ""
-CONFIGURE_ARGS+=       --disable-nls
-.else
-.  if ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin"
 _STRIPFLAG_INSTALL=
-.  endif
 USE_PKGLOCALEDIR=      yes
 PLIST.nls=             yes
 .endif
diff -r 27c5f7ec4bfb -r 86bbf23a57cc converters/help2man/PLIST
--- a/converters/help2man/PLIST Sat Nov 22 14:58:51 2014 +0000
+++ b/converters/help2man/PLIST Sat Nov 22 14:59:59 2014 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2014/10/01 12:12:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/11/22 14:59:59 bsiegert Exp $
 bin/help2man
-info/help2man-de.info
-info/help2man-fr.info
-info/help2man-pl.info
-info/help2man-uk.info
+${PLIST.nls}info/help2man-de.info
+${PLIST.nls}info/help2man-fr.info
+${PLIST.nls}info/help2man-pl.info
+${PLIST.nls}info/help2man-uk.info
 info/help2man.info
 ${PLIST.nls}lib/bindtextdomain.so
 ${PLIST.nls}man/de/man1/help2man.1