Bump the revision because we now install the documentation.

4 files changed, 83 insertions, 11 deletions

diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile
index 464d8c8ee53..5eee446bce3 100644
--- a/devel/stgit/Makefile
+++ b/devel/stgit/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2008/01/30 23:03:50 bjs Exp $
+# $NetBSD: Makefile,v 1.5 2008/02/11 20:18:56 bjs Exp $
 
 DISTNAME=	stgit-20080128
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://homepage.ntlworld.com/cmarinas/stgit/snapshots/
 
@@ -10,28 +11,57 @@ COMMENT=	Stacked GIT
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
+BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
 DEPENDS+=	scmgit-base-[0-9]*:../../devel/scmgit-base
 
-USE_TOOLS+= 	bash:run
+AUTO_MKDIRS=	yes
+USE_TOOLS+= 	bash:run perl gmake
 
+REPLACE_PERL=	Documentation/build-docdep.perl
 REPLACE_BASH= 	contrib/stg-*
 
 PYTHON_VERSIONS_ACCEPTED?=24 23
-PYTHON_PATCH_SCRIPTS=	*.py stgit/*.py
+PYTHON_PATCH_SCRIPTS=	*.py stgit/*.py stg
 PYDISTUTILSPKG=		yes
 PYSETUPINSTALLARGS=	--prefix=${PREFIX}
 
+MAKE_ENV+=	ASCIIDOC=${LOCALBASE}/bin/asciidoc
+MAKE_ENV+=	ASCIIDOC_EXTRA=${ASCIIDOC_EXTRA:M*:Q}
+
+.include "../../mk/bsd.prefs.mk"
+
+.for d in asciidoc docbook-xsl
+GITDOCDEP.${d}=	${${${PKG_INFO} -E ${d} || echo:L:sh}:L:C/[^[0-9]]*/ /g:[1..3]:ts.}
+.endfor
+
+ASCIIDOC_EXTRA=	# empty
+
+.if !empty(GITDOCDEP.asciidoc:M[8]*)
+ASCIIDOC_EXTRA+= -a ascidoc7compatible
+.endif
+
+.if !empty(GITDOCDEP.docbook-xsl:M1.7[2-9]*)
+ASCIIDOC_EXTRA+= -a docbook-xsl-172
+.endif
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 
+pre-build:
+	cd ${WRKSRC}/Documentation && \
+	${SETENV} ${MAKE_ENV} ${GMAKE} all
+
 pre-install:
 	${CHMOD} a-x ${WRKSRC}/contrib/stgbashprompt.sh
 
 post-install:
-	${RM} ${WRKSRC}/contrib/*.orig && \
-	${INSTALL_SCRIPT_DIR} ${DESTDIR}${PREFIX}/bin && \
-	for fn in ${WRKSRC}/contrib/stg-*; do \
-		${INSTALL_SCRIPT} $$fn ${DESTDIR}${PREFIX}/bin; \
-	done;
+	cd ${WRKSRC}/contrib && \
+	${RM} -f *.orig && \
+	${INSTALL_SCRIPT} stg-* ${DESTDIR}${PREFIX}/bin
+	cd ${WRKSRC}/Documentation && \
+	${INSTALL_MAN} *.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && \
+	${INSTALL_DATA} *.html \
+	    ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/stgit/PLIST b/devel/stgit/PLIST
index 8a9eb10204b..cd3b9fb2b92 100644
--- a/devel/stgit/PLIST
+++ b/devel/stgit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/01/30 23:03:50 bjs Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/02/11 20:18:56 bjs Exp $
 bin/stg
 bin/stg-cvs
 bin/stg-dispatch
@@ -191,6 +191,19 @@ ${PYSITELIB}/stgit/utils.pyo
 ${PYSITELIB}/stgit/version.py
 ${PYSITELIB}/stgit/version.pyc
 ${PYSITELIB}/stgit/version.pyo
+man/man1/stg-branch.1
+man/man1/stg-clone.1
+man/man1/stg-init.1
+man/man1/stg-new.1
+man/man1/stg-sink.1
+man/man1/stg.1
+share/doc/stgit/html/stg-branch.html
+share/doc/stgit/html/stg-clone.html
+share/doc/stgit/html/stg-init.html
+share/doc/stgit/html/stg-new.html
+share/doc/stgit/html/stg-sink.html
+share/doc/stgit/html/stg.html
+share/doc/stgit/html/tutorial.html
 share/examples/stgit/gitconfig
 share/stgit/contrib/stgbashprompt.sh
 share/stgit/contrib/stgit-completion.bash
@@ -202,7 +215,6 @@ share/stgit/templates/patchmail.tmpl
 @dirrm share/stgit/contrib
 @dirrm share/stgit
 @dirrm share/examples/stgit
-@exec ${MKDIR} %D/share/doc/stgit
 @dirrm share/doc/stgit
 @dirrm ${PYSITELIB}/stgit/lib
 @dirrm ${PYSITELIB}/stgit/commands
diff --git a/devel/stgit/distinfo b/devel/stgit/distinfo
index 3e8eec6439d..89678795e5b 100644
--- a/devel/stgit/distinfo
+++ b/devel/stgit/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2008/01/30 23:03:50 bjs Exp $
+$NetBSD: distinfo,v 1.5 2008/02/11 20:18:56 bjs Exp $
 
 SHA1 (stgit-20080128.tar.gz) = c66576529c03403c5b2604ed400179c585bff89b
 RMD160 (stgit-20080128.tar.gz) = d1ec1d9b0679745839ae2cb1c8ac01c879d84df5
 Size (stgit-20080128.tar.gz) = 234891 bytes
 SHA1 (patch-aa) = 364103963f8e74eee12dbd548b4ed48b349b662f
 SHA1 (patch-ab) = 423664a988eb1c69c76adc482d74c4e8e227a83f
+SHA1 (patch-ac) = ae316f684e33cca913be25a3f697ee8052218eaf
diff --git a/devel/stgit/patches/patch-ac b/devel/stgit/patches/patch-ac
new file mode 100644
index 00000000000..e3948353181
--- /dev/null
+++ b/devel/stgit/patches/patch-ac
@@ -0,0 +1,29 @@
+--- Documentation/Makefile.orig	2007-07-25 19:49:46.000000000 -0400
++++ Documentation/Makefile	2008-02-11 14:55:30.000000000 -0500
+@@ -20,7 +20,7 @@
+ # DESTDIR=
+ 
+ ASCIIDOC=asciidoc --unsafe
+-ASCIIDOC_EXTRA =
++#ASCIIDOC_EXTRA =
+ INSTALL?=install
+ 
+ #
+@@ -44,9 +44,14 @@
+ man7: $(DOC_MAN7)
+ 
+ install: man
+-	$(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir)
+-	$(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
+-	$(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir) 
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir)
++	for fn in $(DOC_MAN1); do \
++	$(BSD_INSTALL_MAN) $$fn $(DESTDIR)$(man1dir); \
++	done
++	for fn in $(DOC_MAN7); do \
++	$(BSD_INSTALL_MAN) $$fn $(DESTDIR)$(man7dir); \
++	done
+ #
+ # Determine "include::" file references in asciidoc files.
+ #