pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/49059: Unbreak converters/help2man on Mac OS X Tiger



>Number:         49059
>Category:       pkg
>Synopsis:       Unbreak converters/help2man on Mac OS X Tiger
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Aug 01 14:00:00 +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



Home | Main Index | Thread Index | Old Index