NetBSD Problem Report #49059

From www@NetBSD.org  Fri Aug  1 13:58:35 2014
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 5DB52A886F
	for <gnats-bugs@gnats.NetBSD.org>; Fri,  1 Aug 2014 13:58:35 +0000 (UTC)
Message-Id: <20140801135834.13F8BA897A@mollari.NetBSD.org>
Date: Fri,  1 Aug 2014 13:58:34 +0000 (UTC)
From: venture37@geeklan.co.uk
Reply-To: venture37@geeklan.co.uk
To: gnats-bugs@NetBSD.org
Subject: Unbreak converters/help2man on Mac OS X Tiger
X-Send-Pr-Version: www-1.0

>Number:         49059
>Category:       pkg
>Synopsis:       Unbreak converters/help2man on Mac OS X Tiger
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bsiegert
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Aug 01 14:00:00 +0000 2014
>Closed-Date:    Sat Nov 22 15:27:05 +0000 2014
>Last-Modified:  Sat Nov 22 15:27:05 +0000 2014
>Originator:     Sevan Janiyan
>Release:        pkgsrc-current
>Organization:
>Environment:
>Description:
shared libs where disabled on Tiger due to someone not wanting to add the support (Rev 1.4 commit message), shared library support was added but specifically for Leopard (Rev 1.13).
With the update to 1.46.1 of help2man a few days ago, the build was broken because it was assumed that the info files for the new languages introduced in this release would be built, attached patch removes the restriction of building without nls on Tiger & handles shared libraries on Tiger & leopard.
Make the new info files optional so they're only listed if built with NLS support.
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/converters/help2man/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile	29 Jul 2014 11:46:56 -0000	1.24
+++ Makefile	1 Aug 2014 00:24:09 -0000
@@ -27,7 +27,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 +36,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
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/converters/help2man/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- PLIST	29 Jul 2014 11:46:56 -0000	1.6
+++ PLIST	1 Aug 2014 13:52:37 -0000
@@ -1,9 +1,9 @@
 @comment $NetBSD: PLIST,v 1.6 2014/07/29 11:46:56 wiz Exp $
 bin/help2man
-info/help2man-de.info
-info/help2man-pl.info
-info/help2man-uk.info
 info/help2man.info
+${PLIST.nls}info/help2man-de.info
+${PLIST.nls}info/help2man-pl.info
+${PLIST.nls}info/help2man-uk.info
 ${PLIST.nls}lib/bindtextdomain.so
 ${PLIST.nls}man/de/man1/help2man.1
 ${PLIST.nls}man/el/man1/help2man.1

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->darwin-pkg-people
Responsible-Changed-By: wiz@NetBSD.org
Responsible-Changed-When: Fri, 01 Aug 2014 23:51:10 +0000
Responsible-Changed-Why:
OS X problem.


Responsible-Changed-From-To: darwin-pkg-people->macos-pkg-people
Responsible-Changed-By: obache@NetBSD.org
Responsible-Changed-When: Wed, 20 Aug 2014 09:57:25 +0000
Responsible-Changed-Why:
Use new role.


Responsible-Changed-From-To: macos-pkg-people->bsiegert
Responsible-Changed-By: bsiegert@NetBSD.org
Responsible-Changed-When: Sat, 22 Nov 2014 14:49:31 +0000
Responsible-Changed-Why:
Resurrect this from the graveyard of bug reports with a patch but no answer.


From: "Benny Siegert" <bsiegert@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/49059 CVS commit: pkgsrc/converters/help2man
Date: Sat, 22 Nov 2014 14:59:59 +0000

 Module Name:	pkgsrc
 Committed By:	bsiegert
 Date:		Sat Nov 22 14:59:59 UTC 2014

 Modified Files:
 	pkgsrc/converters/help2man: Makefile PLIST

 Log Message:
 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.


 To generate a diff of this commit:
 cvs rdiff -u -r1.27 -r1.28 pkgsrc/converters/help2man/Makefile
 cvs rdiff -u -r1.8 -r1.9 pkgsrc/converters/help2man/PLIST

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->closed
State-Changed-By: bsiegert@NetBSD.org
State-Changed-When: Sat, 22 Nov 2014 15:27:05 +0000
State-Changed-Why:
Patch committed, thanks!


>Unformatted:

Home	PR Database Search