22950949 Update help2man to version 1.47.3
authorRich Burridge <rich.burridge@oracle.com>
Mon, 28 Mar 2016 06:24:55 -0700
changeset 5659 b6e2086f646a
parent 5658 b4ad53d98db3
child 5660 21cf5207d6b8
22950949 Update help2man to version 1.47.3
components/help2man/Makefile
components/help2man/help2man.p5m
components/help2man/patches/Makefile.in.patch
--- a/components/help2man/Makefile	Fri Mar 25 06:09:30 2016 -0700
+++ b/components/help2man/Makefile	Mon Mar 28 06:24:55 2016 -0700
@@ -18,31 +18,42 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		help2man
-COMPONENT_VERSION=	1.46.1
+COMPONENT_VERSION=	1.47.3
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/help2man/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:3dfd02a026149aad06887c1cb6062471779c100e00aecb79b8f9d01cf1581c47
+    sha256:c232af6475ef65bee02770862a362f4c4c2e6c9967d39e987eb94cadcfc13856
 COMPONENT_ARCHIVE_URL=	http://mirror.team-cymru.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/help2man
 
-TPNO=			18702
+TPNO=			27415
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+CONFIGURE_ENV +=	PERL=$(PERL.5.22)
+
+# Needed to successfully create the message files.
+COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D));
+
+CC += $(CC_BITS)
+
+CONFIGURE_OPTIONS += --bindir=$(USRBINDIR)
+
 # Needed to get all the localized files.
 COMPONENT_INSTALL_TARGETS = install install_l10n
 
 ASLR_MODE = $(ASLR_ENABLE)
 
+configure:	$(CONFIGURE_64)
+
 build:		$(BUILD_64)
 
 install:	$(INSTALL_64)
@@ -51,4 +62,4 @@
 
 system-test:    $(NO_TESTS)
 
-REQUIRED_PACKAGES +=	runtime/perl-512
+REQUIRED_PACKAGES += runtime/perl-522
--- a/components/help2man/help2man.p5m	Fri Mar 25 06:09:30 2016 -0700
+++ b/components/help2man/help2man.p5m	Mon Mar 28 06:24:55 2016 -0700
@@ -42,14 +42,16 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2014/285
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file usr/bin/$(MACH64)/help2man path=usr/bin/help2man
+file path=usr/bin/help2man
 file path=usr/share/info/help2man-de.info
 file path=usr/share/info/help2man-pl.info
 file path=usr/share/info/help2man-uk.info
 file path=usr/share/info/help2man.info
+file path=usr/share/locale/da/LC_MESSAGES/help2man.mo
 file path=usr/share/locale/de/LC_MESSAGES/help2man.mo
 file path=usr/share/locale/el/LC_MESSAGES/help2man.mo
 file path=usr/share/locale/eo/LC_MESSAGES/help2man.mo
+file path=usr/share/locale/es/LC_MESSAGES/help2man.mo
 file path=usr/share/locale/fi/LC_MESSAGES/help2man.mo
 file path=usr/share/locale/fr/LC_MESSAGES/help2man.mo
 file path=usr/share/locale/hr/LC_MESSAGES/help2man.mo
@@ -64,9 +66,12 @@
 file path=usr/share/locale/sv/LC_MESSAGES/help2man.mo
 file path=usr/share/locale/uk/LC_MESSAGES/help2man.mo
 file path=usr/share/locale/vi/LC_MESSAGES/help2man.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/help2man.mo
+file path=usr/share/man/da/man1/help2man.1
 file path=usr/share/man/de/man1/help2man.1
 file path=usr/share/man/el/man1/help2man.1
 file path=usr/share/man/eo/man1/help2man.1
+file path=usr/share/man/es/man1/help2man.1
 file path=usr/share/man/fi/man1/help2man.1
 file path=usr/share/man/fr/man1/help2man.1
 file path=usr/share/man/hr/man1/help2man.1
@@ -82,5 +87,6 @@
 file path=usr/share/man/sv/man1/help2man.1
 file path=usr/share/man/uk/man1/help2man.1
 file path=usr/share/man/vi/man1/help2man.1
+file path=usr/share/man/zh_CN/man1/help2man.1
 license COPYING license=GPLv3
 depend type=require fmri=library/perl-5/gettext
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/help2man/patches/Makefile.in.patch	Mon Mar 28 06:24:55 2016 -0700
@@ -0,0 +1,17 @@
+The build process uses a nasty preload hack to allow message catalogs to be
+read from the build tree. Now that we've adjusted help2man to use a 64-bit
+only version of Perl, we need to adjust the LD_PRELOAD to be LD_PRELOAD_64.
+
+This change will be reported upstream.
+
+--- help2man-1.47.3/Makefile.in.orig	2016-03-16 10:36:34.427067785 -0700
++++ help2man-1.47.3/Makefile.in	2016-03-16 10:36:54.322893757 -0700
[email protected]@ -168,7 +168,7 @@
+ 	lang=$(patsubst $(target).%.1,%,[email protected]); \
+ 	$(MAKE) $(target) $(preload).so \
+ 	    localetmp/$$lang/LC_MESSAGES/$(target).mo $(target).$$lang.h2m; \
+-	LD_PRELOAD=./$(preload).so LOCALEDIR=localetmp TEXTDOMAIN=help2man \
++	LD_PRELOAD_64=./$(preload).so LOCALEDIR=localetmp TEXTDOMAIN=help2man \
+ 	    ./$(target) --include=$$($(FIND_VPATH) $(target).$$lang.h2m) \
+ 		[email protected] ./$(target)
+