--- a/components/git/Makefile	Wed Oct 14 08:57:53 2015 -0700
+++ b/components/git/Makefile	Thu Oct 15 14:14:39 2015 -0700
@@ -40,10 +40,13 @@
 #
 # man pages are a separate archive
 #
-COMPONENT_ARCHIVE_1 =	$(COMPONENT_NAME)-manpages-$(COMPONENT_VERSION).tar.xz
+COMPONENT_SRC_1=        $(COMPONENT_NAME)-manpages-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE_1 =	$(COMPONENT_SRC_1).tar.xz
 COMPONENT_ARCHIVE_HASH_1 = \
     sha256:e4cf64edcecd284d9ef4e6ca7fa0e8556d2414b5d9881a9abfe477f95b416391
 COMPONENT_ARCHIVE_URL_1 = https://www.kernel.org/pub/software/scm/git/$(COMPONENT_ARCHIVE_1)
+UNPACK_ARGS_1 =		-r $(COMPONENT_SRC_1)
+PKG_PROTO_DIRS +=	$(COMPONENT_SRC_1)
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
@@ -99,37 +102,13 @@
 
 build:		$(BUILD_64)
 
-install:	$(INSTALL_64) $(BUILD_DIR)/.manpages
+install:	$(INSTALL_64)
 
 # There are some known issues around I18N.
 test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
-# These man pages come in a separate archive with no Makefile
-# and Solaris likes some of them moved around hence we'll just
-# do it manually here.
-
-$(BUILD_DIR)/.manpages:
-	cd $(BUILD_DIR) ; $(UNPACK) $(UNPACK_ARGS) ../$(COMPONENT_ARCHIVE_1)
-	$(MKDIR) $(PROTOUSRSHAREMAN1DIR)
-	$(MKDIR) $(PROTOUSRSHAREMAN4DIR)
-	$(MKDIR) $(PROTOUSRSHAREMAN5DIR)
-	cd $(BUILD_DIR) ; for manfile in man*/* ; \
-	do \
-		filename=`basename $$manfile`; \
-		fname=$${filename%.*}; \
-		ext=$${filename##*.}; \
-		newext=1; \
-		if [ $$ext = 5 ]; then newext=4; fi; \
-		if [ $$ext = 7 ]; then newext=5; fi; \
-		$(GSED) -e 's/\\m\[blue\]//g' -e 's/\\m\[\]//g' \
-		        -e 's/"5"/"4"/' -e 's/(5)/(4)/g' \
-			-e 's/"7"/"5"/' -e 's/(7)/(5)/g' $$manfile > \
-		   $(PROTOUSRSHAREMANDIR)/man$$newext/$$fname.$$newext; \
-	done
-	$(TOUCH) $@
-
 REQUIRED_PACKAGES += library/expat
 REQUIRED_PACKAGES += library/pcre
 REQUIRED_PACKAGES += library/security/openssl

--- a/components/git/git.p5m	Wed Oct 14 08:57:53 2015 -0700
+++ b/components/git/git.p5m	Thu Oct 15 14:14:39 2015 -0700
@@ -24,6 +24,8 @@
 #
 
 <transform file path=usr/lib/git-core/.* -> default mode 0555>
+# Put the various git man pages in the right directories.
+<transform file path=usr/share/man/man([^/])+/(.+)$ -> set action.hash man%<1>/%<2> >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/perl5/.*/man/(.*) -> emit link \
     path=/usr/share/man/%<1> target=../../../perl5/$(PERL_VERSION)/man/%<1>>
@@ -507,23 +509,23 @@
 file path=usr/share/man/man1/gitremote-helpers.1
 file path=usr/share/man/man1/gitweb.1
 # Autogenerated symlinks to the Git man3 pages go here.
-file path=usr/share/man/man4/gitattributes.4
-file path=usr/share/man/man4/githooks.4
-file path=usr/share/man/man4/gitignore.4
-file path=usr/share/man/man4/gitmodules.4
-file path=usr/share/man/man4/gitrepository-layout.4
-file path=usr/share/man/man4/gitweb.conf.4
-file path=usr/share/man/man5/gitcli.5
-file path=usr/share/man/man5/gitcore-tutorial.5
-file path=usr/share/man/man5/gitcredentials.5
-file path=usr/share/man/man5/gitcvs-migration.5
-file path=usr/share/man/man5/gitdiffcore.5
-file path=usr/share/man/man5/giteveryday.5
-file path=usr/share/man/man5/gitglossary.5
-file path=usr/share/man/man5/gitnamespaces.5
-file path=usr/share/man/man5/gitrevisions.5
-file path=usr/share/man/man5/gittutorial-2.5
-file path=usr/share/man/man5/gittutorial.5
-file path=usr/share/man/man5/gitworkflows.5
+file path=usr/share/man/man5/gitattributes.5
+file path=usr/share/man/man5/githooks.5
+file path=usr/share/man/man5/gitignore.5
+file path=usr/share/man/man5/gitmodules.5
+file path=usr/share/man/man5/gitrepository-layout.5
+file path=usr/share/man/man5/gitweb.conf.5
+file path=usr/share/man/man7/gitcli.7
+file path=usr/share/man/man7/gitcore-tutorial.7
+file path=usr/share/man/man7/gitcredentials.7
+file path=usr/share/man/man7/gitcvs-migration.7
+file path=usr/share/man/man7/gitdiffcore.7
+file path=usr/share/man/man7/giteveryday.7
+file path=usr/share/man/man7/gitglossary.7
+file path=usr/share/man/man7/gitnamespaces.7
+file path=usr/share/man/man7/gitrevisions.7
+file path=usr/share/man/man7/gittutorial-2.7
+file path=usr/share/man/man7/gittutorial.7
+file path=usr/share/man/man7/gitworkflows.7
 #
 license git.license license=GPLv2