Date: Tue, 30 Sep 2008 21:27:33 GMT From: Ashish Shukla <wahjava@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/127754: [PATCH] Added documentation in devel/git Message-ID: <200809302127.m8ULRX42070236@www.freebsd.org> Resent-Message-ID: <200809302130.m8ULU1d4052219@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127754
>Category: ports
>Synopsis: [PATCH] Added documentation in devel/git
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 30 21:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Ashish Shukla
>Release: 8.0-CURRENT
>Organization:
N/A
>Environment:
FreeBSD monte-cristo.france 8.0-CURRENT FreeBSD 8.0-CURRENT #9: Sun Sep 28 02:55:38 IST 2008 root@monte-cristo.france:/usr/obj/usr/src/sys/ULE amd64
>Description:
This patch adds support for installing HTML documentation in devel/git port. The maintainer might like to increment the PORTREVISION
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/git/Makefile git/Makefile
--- /usr/ports/devel/git/Makefile 2008-09-23 08:12:22.000000000 +0530
+++ git/Makefile 2008-10-01 01:29:08.000000000 +0530
@@ -187,6 +187,11 @@
.include <bsd.port.pre.mk>
+.ifndef (NOPORTDOCS)
+BUILD_DEPENDS+= ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
+ ${LOCALBASE}/bin/asciidoc:${PORTSDIR}/textproc/asciidoc
+.endif
+
.ifndef (WITHOUT_GUI)
MAN1+= git-citool.1 \
git-gui.1 \
@@ -222,6 +227,9 @@
@${SED} -e'1s|#!/usr/bin/python|#!${PYTHON_CMD}|' \
${WRKSRC}/contrib/p4import/git-p4import.py > \
${WRKSRC}/contrib/p4import/git-p4import
+.ifndef (NOPORTDOCS)
+ @${GMAKE} -C ${WRKSRC} doc
+.endif
post-install:
.for i in ${MAN1}
@@ -234,6 +242,10 @@
${INSTALL_MAN} ${WRKDIR}/man7/${i} ${MANPREFIX}/man/man7/
.endfor
+.ifndef (NOPORTDOCS)
+ ${GMAKE} -C ${WRKSRC} install-html ${MAKE_ENV}
+.endif
+
-${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
diff -urN /usr/ports/devel/git/files/patch-Documentation_Makefile git/files/patch-Documentation_Makefile
--- /usr/ports/devel/git/files/patch-Documentation_Makefile 1970-01-01 05:30:00.000000000 +0530
+++ git/files/patch-Documentation_Makefile 2008-10-01 01:33:10.000000000 +0530
@@ -0,0 +1,35 @@
+
+$FreeBSD$
+
+--- Documentation/Makefile.orig
++++ Documentation/Makefile
+@@ -12,8 +12,6 @@
+ MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
+ MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))
+
+-DOC_HTML=$(MAN_HTML)
+-
+ ARTICLES = howto-index
+ ARTICLES += everyday
+ ARTICLES += git-tools
+@@ -29,9 +27,9 @@
+ DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT))
+ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
+
+-prefix?=$(HOME)
++prefix?=$(PREFIX)
+ bindir?=$(prefix)/bin
+-htmldir?=$(prefix)/share/doc/git-doc
++htmldir?=$(prefix)/share/doc/git
+ mandir?=$(prefix)/share/man
+ man1dir=$(mandir)/man1
+ man5dir=$(mandir)/man5
+@@ -73,7 +71,7 @@
+ # yourself - yes, all 6 characters of it!
+ #
+
+-all: html man
++all: html
+
+ html: $(DOC_HTML)
+
diff -urN /usr/ports/devel/git/files/patch-Makefile git/files/patch-Makefile
--- /usr/ports/devel/git/files/patch-Makefile 2008-09-23 07:02:19.000000000 +0530
+++ git/files/patch-Makefile 2008-10-01 01:33:09.000000000 +0530
@@ -1,5 +1,8 @@
---- ./Makefile.orig 2008-08-24 19:41:58.000000000 -0400
-+++ ./Makefile 2008-09-18 13:32:34.000000000 -0400
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
@@ -164,8 +164,8 @@
# CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -11,9 +14,12 @@
ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
-@@ -182,8 +182,8 @@
+@@ -180,14 +180,14 @@
+ # runtime figures out where they are based on the path to the executable.
+ # This can help installing the suite in a relocatable way.
- prefix = $(HOME)
+-prefix = $(HOME)
++prefix = $(PREFIX)
bindir = $(prefix)/bin
-mandir = $(prefix)/share/man
-infodir = $(prefix)/share/info
@@ -22,6 +28,11 @@
gitexecdir = $(prefix)/libexec/git-core
sharedir = $(prefix)/share
template_dir = $(sharedir)/git-core/templates
+-htmldir=$(sharedir)/doc/git-doc
++htmldir=$(sharedir)/doc/git
+ ifeq ($(prefix),/usr)
+ sysconfdir = /etc
+ else
@@ -217,15 +217,15 @@
export prefix bindir sharedir htmldir sysconfdir
@@ -47,7 +58,7 @@
export TCL_PATH TCLTK_PATH
-@@ -827,9 +827,9 @@
+@@ -833,9 +833,9 @@
endif
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
diff -urN /usr/ports/devel/git/pkg-plist git/pkg-plist
--- /usr/ports/devel/git/pkg-plist 2008-08-28 03:35:12.000000000 +0530
+++ git/pkg-plist 2008-10-01 02:43:39.000000000 +0530
@@ -1,9 +1,14 @@
bin/git
bin/git-p4
bin/git-p4import
-bin/git-upload-pack
bin/git-receive-pack
bin/git-upload-archive
+bin/git-upload-pack
+%%GUI%%bin/gitk
+lib/perl5/site_perl/5.8.8/Git.pm
+lib/perl5/site_perl/5.8.8/mach/auto/Git/.packlist
+lib/xemacs/site-lisp/git/git.el
+lib/xemacs/site-lisp/git/vc-git.el
libexec/git-core/git-add
libexec/git-core/git-add--interactive
libexec/git-core/git-am
@@ -52,7 +57,7 @@
libexec/git-core/git-gc
libexec/git-core/git-get-tar-commit-id
libexec/git-core/git-grep
-%%GUI%%libexec/git-core/git-gui
+%%GUI%%%%GUI%%libexec/git-core/git-gui
libexec/git-core/git-hash-object
libexec/git-core/git-http-fetch
libexec/git-core/git-http-push
@@ -143,13 +148,304 @@
libexec/git-core/git-web--browse
libexec/git-core/git-whatchanged
libexec/git-core/git-write-tree
-%%GUI%%bin/gitk
-%%SITE_PERL%%/Git.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/.packlist
-lib/xemacs/site-lisp/git/git.el
-lib/xemacs/site-lisp/git/vc-git.el
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.6.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.7.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.6.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.6.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.7.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.8.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.6.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/blame-options.txt
+%%PORTDOCS%%%%DOCSDIR%%/config.txt
+%%PORTDOCS%%%%DOCSDIR%%/diff-format.txt
+%%PORTDOCS%%%%DOCSDIR%%/diff-generate-patch.txt
+%%PORTDOCS%%%%DOCSDIR%%/diff-options.txt
+%%PORTDOCS%%%%DOCSDIR%%/docbook-xsl.css
+%%PORTDOCS%%%%DOCSDIR%%/everyday.html
+%%PORTDOCS%%%%DOCSDIR%%/everyday.txt
+%%PORTDOCS%%%%DOCSDIR%%/fetch-options.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-add.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-am.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-annotate.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-apply.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-archimport.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-archive.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-bisect.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-blame.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-branch.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-bundle.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-cat-file.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-check-attr.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-check-ref-format.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-checkout-index.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-checkout.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-cherry-pick.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-cherry.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-citool.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-clean.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-clone.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-commit-tree.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-commit.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-config.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-count-objects.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-cvsexportcommit.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-cvsimport.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-cvsserver.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-daemon.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-describe.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-diff-files.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-diff-index.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-diff-tree.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-diff.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-fast-export.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-fast-import.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-fetch-pack.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-fetch.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-filter-branch.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-fmt-merge-msg.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-for-each-ref.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-format-patch.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-fsck-objects.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-fsck.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-gc.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-get-tar-commit-id.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-grep.txt
+%%GUI%%%%PORTDOCS%%%%DOCSDIR%%/git-gui.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-hash-object.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-help.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-http-fetch.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-http-push.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-imap-send.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-index-pack.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-init-db.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-init.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-instaweb.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-log.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-lost-found.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-ls-files.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-ls-remote.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-ls-tree.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-mailinfo.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-mailsplit.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-merge-base.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-merge-file.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-merge-index.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-merge-one-file.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-merge-tree.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-merge.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-mergetool.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-mktag.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-mktree.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-mv.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-name-rev.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-pack-objects.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-pack-redundant.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-pack-refs.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-parse-remote.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-patch-id.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-peek-remote.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-prune-packed.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-prune.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-pull.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-push.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-quiltimport.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-read-tree.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-rebase.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-receive-pack.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-reflog.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-relink.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-remote.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-repack.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-repo-config.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-request-pull.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-rerere.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-reset.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-rev-list.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-rev-parse.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-revert.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-rm.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-send-email.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-send-pack.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-sh-setup.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-shell.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-shortlog.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-show-branch.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-show-index.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-show-ref.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-show.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-stash.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-status.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-stripspace.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-submodule.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-svn.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-symbolic-ref.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-tag.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-tar-tree.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-tools.html
+%%PORTDOCS%%%%DOCSDIR%%/git-tools.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-unpack-file.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-unpack-objects.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-update-index.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-update-ref.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-update-server-info.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-upload-archive.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-upload-pack.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-var.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-verify-pack.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-verify-tag.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-web--browse.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-whatchanged.txt
+%%PORTDOCS%%%%DOCSDIR%%/git-write-tree.txt
+%%PORTDOCS%%%%DOCSDIR%%/git.txt
+%%PORTDOCS%%%%DOCSDIR%%/gitattributes.txt
+%%PORTDOCS%%%%DOCSDIR%%/gitcli.txt
+%%PORTDOCS%%%%DOCSDIR%%/gitcore-tutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/gitcvs-migration.txt
+%%PORTDOCS%%%%DOCSDIR%%/gitdiffcore.txt
+%%PORTDOCS%%%%DOCSDIR%%/gitglossary.txt
+%%PORTDOCS%%%%DOCSDIR%%/githooks.txt
+%%PORTDOCS%%%%DOCSDIR%%/gitignore.txt
+%%GUI%%%%PORTDOCS%%%%DOCSDIR%%/gitk.txt
+%%PORTDOCS%%%%DOCSDIR%%/gitmodules.txt
+%%PORTDOCS%%%%DOCSDIR%%/gitrepository-layout.txt
+%%PORTDOCS%%%%DOCSDIR%%/gittutorial-2.txt
+%%PORTDOCS%%%%DOCSDIR%%/gittutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/glossary-content.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto-index.html
+%%PORTDOCS%%%%DOCSDIR%%/howto-index.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/maintain-git.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/rebase-and-edit.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/rebase-from-internal-branch.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/rebuild-from-update-hook.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/recover-corrupted-blob-object.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/revert-branch-rebase.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/revert-branch-rebase.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/separating-topic-branches.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/setup-git-server-over-http.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/update-hook-example.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/use-git-daemon.txt
+%%PORTDOCS%%%%DOCSDIR%%/howto/using-merge-subtree.html
+%%PORTDOCS%%%%DOCSDIR%%/howto/using-merge-subtree.txt
+%%PORTDOCS%%%%DOCSDIR%%/i18n.txt
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/merge-config.txt
+%%PORTDOCS%%%%DOCSDIR%%/merge-options.txt
+%%PORTDOCS%%%%DOCSDIR%%/merge-strategies.txt
+%%PORTDOCS%%%%DOCSDIR%%/pretty-formats.txt
+%%PORTDOCS%%%%DOCSDIR%%/pretty-options.txt
+%%PORTDOCS%%%%DOCSDIR%%/pull-fetch-param.txt
+%%PORTDOCS%%%%DOCSDIR%%/rev-list-options.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-builtin.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-builtin.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-decorate.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-decorate.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-diff.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-diff.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-directory-listing.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-directory-listing.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-gitattributes.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-gitattributes.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-grep.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-grep.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-hash.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-hash.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-history-graph.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-history-graph.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-in-core-index.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-in-core-index.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-index-skel.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-index.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-index.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-lockfile.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-lockfile.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-object-access.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-object-access.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-parse-options.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-parse-options.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-quote.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-quote.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-remote.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-remote.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-revision-walking.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-revision-walking.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-run-command.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-run-command.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-setup.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-setup.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-strbuf.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-strbuf.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-string-list.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-string-list.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-tree-walking.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-tree-walking.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.html
+%%PORTDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/pack-format.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/pack-heuristics.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/pack-protocol.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/racy-git.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/shallow.txt
+%%PORTDOCS%%%%DOCSDIR%%/technical/trivial-merge.txt
+%%PORTDOCS%%%%DOCSDIR%%/urls-remotes.txt
+%%PORTDOCS%%%%DOCSDIR%%/urls.txt
+%%PORTDOCS%%%%DOCSDIR%%/user-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual.txt
share/emacs/site-lisp/git/git.el
share/emacs/site-lisp/git/vc-git.el
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-logo.png
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
+%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.css
share/git-core/templates/description
share/git-core/templates/hooks/applypatch-msg.sample
share/git-core/templates/hooks/commit-msg.sample
@@ -162,7 +458,6 @@
share/git-core/templates/hooks/prepare-commit-msg.sample
share/git-core/templates/hooks/update.sample
share/git-core/templates/info/exclude
-%%GUI%%share/git-gui/lib/tclIndex
%%GUI%%share/git-gui/lib/about.tcl
%%GUI%%share/git-gui/lib/blame.tcl
%%GUI%%share/git-gui/lib/branch.tcl
@@ -187,49 +482,47 @@
%%GUI%%share/git-gui/lib/index.tcl
%%GUI%%share/git-gui/lib/logo.tcl
%%GUI%%share/git-gui/lib/merge.tcl
+%%GUI%%share/git-gui/lib/msgs/de.msg
+%%GUI%%share/git-gui/lib/msgs/fr.msg
+%%GUI%%share/git-gui/lib/msgs/hu.msg
+%%GUI%%share/git-gui/lib/msgs/it.msg
+%%GUI%%share/git-gui/lib/msgs/ja.msg
+%%GUI%%share/git-gui/lib/msgs/ru.msg
+%%GUI%%share/git-gui/lib/msgs/sv.msg
+%%GUI%%share/git-gui/lib/msgs/zh_cn.msg
%%GUI%%share/git-gui/lib/option.tcl
%%GUI%%share/git-gui/lib/remote.tcl
%%GUI%%share/git-gui/lib/remote_branch_delete.tcl
%%GUI%%share/git-gui/lib/shortcut.tcl
%%GUI%%share/git-gui/lib/spellcheck.tcl
%%GUI%%share/git-gui/lib/status_bar.tcl
+%%GUI%%share/git-gui/lib/tclIndex
%%GUI%%share/git-gui/lib/transport.tcl
%%GUI%%share/git-gui/lib/win32.tcl
%%GUI%%share/git-gui/lib/win32_shortcut.js
-%%GUI%%share/git-gui/lib/msgs/de.msg
-%%GUI%%share/git-gui/lib/msgs/fr.msg
-%%GUI%%share/git-gui/lib/msgs/hu.msg
-%%GUI%%share/git-gui/lib/msgs/it.msg
-%%GUI%%share/git-gui/lib/msgs/ja.msg
-%%GUI%%share/git-gui/lib/msgs/ru.msg
-%%GUI%%share/git-gui/lib/msgs/sv.msg
-%%GUI%%share/git-gui/lib/msgs/zh_cn.msg
-%%GUI%%share/gitk/lib/msgs/es.msg
%%GUI%%share/gitk/lib/msgs/de.msg
+%%GUI%%share/gitk/lib/msgs/es.msg
%%GUI%%share/gitk/lib/msgs/it.msg
%%GUI%%share/gitk/lib/msgs/sv.msg
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-logo.png
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
-%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.css
-%%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb
-%%GITWEB%%@dirrm %%EXAMPLESDIR%%
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
-@dirrm lib/xemacs/site-lisp/git
-@dirrmtry lib/xemacs/site-lisp
-@dirrmtry lib/xemacs
-@dirrm share/emacs/site-lisp/git
%%GUI%%@dirrm share/gitk/lib/msgs
%%GUI%%@dirrm share/gitk/lib
%%GUI%%@dirrm share/gitk
%%GUI%%@dirrm share/git-gui/lib/msgs
%%GUI%%@dirrm share/git-gui/lib
%%GUI%%@dirrm share/git-gui
-@dirrm libexec/git-core
-@dirrm share/git-core/templates/branches
-@dirrmtry share/git-core/templates/hooks
@dirrm share/git-core/templates/info
+@dirrmtry share/git-core/templates/hooks
+@dirrm share/git-core/templates/branches
@dirrmtry share/git-core/templates
@dirrm share/git-core
+%%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb
+%%GITWEB%%@dirrm %%EXAMPLESDIR%%
+@dirrm share/emacs/site-lisp/git
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/technical
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/howto
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm libexec/git-core
+@dirrm lib/xemacs/site-lisp/git
+@dirrm lib/xemacs/site-lisp
+@dirrm lib/xemacs
+@dirrmtry %SITE_PERL%%/%%PERL_ARCH%%/auto/Git
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809302127.m8ULRX42070236>