Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Kowis (725503f71467b201d2e45968fc90034a8f8a1ce7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Kowis (725503f71467b201d2e45968fc90034a8f8a1ce7)
  • Date: Fri, 26 Jan 2007 09:18:29 -0600

GIT changes to master grimoire by David Kowis <dkowis@melchiah.(none)>:

devel/git/DETAILS | 16 ++++++++++++----
devel/git/HISTORY | 3 +++
devel/git/INSTALL | 34 ++++++++++++++++++++++++----------
devel/git/PREPARE | 2 +-
devel/git/PRE_BUILD | 5 ++++-
5 files changed, 44 insertions(+), 16 deletions(-)

New commits:
commit 725503f71467b201d2e45968fc90034a8f8a1ce7
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis@melchiah.(none)>

git

Modified git to be able to install both kinds of documentations
fixes bug 12693

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index be7a18a..0f3d1ed 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -7,14 +7,22 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE
SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
SOURCE2_IGNORE=signature
-if [[ "$GIT_DOC" != "none" ]]; then
- SOURCE3=$SPELL-$GIT_DOC-$VERSION.tar.bz2
+if [[ "$GIT_DOC" == "manpages" || "$GIT_DOC" == "both" ]]; then
+ SOURCE3=$SPELL-manpages-$VERSION.tar.bz2
SOURCE4=$SOURCE3.sign
- SOURCE3_GPG="kernel.gpg:${SOURCE3}.sign:UPSTREAM_KEY"
- SOURCE3_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE3
+ SOURCE3_GPG="kernel.gpg:${SOURCE3}.sign:UPSTREAM_KEY"
+ SOURCE3_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE3
SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
SOURCE4_IGNORE=signature
fi
+if [[ "$GIT_DOC" == "htmldocs" || "$GIT_DOC" == "both" ]]; then
+ SOURCE5=$SPELL-htmldocs-$VERSION.tar.bz2
+ SOURCE6=$SOURCE5.sign
+ SOURCE5_GPG="kernel.gpg:${SOURCE5}.sign:UPSTREAM_KEY"
+ SOURCE5_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE5
+ SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
+ SOURCE6_IGNORE=signature
+fi
LICENSE[0]=GPL
WEB_SITE=http://git.or.cz/
KEYWORDS="scm devel"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 9e43a65..25d5928 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,6 +1,9 @@
2007-01-26 David Kowis <dkowis AT shlrm.org>
* DEPENDS: made curl and expat not optional
bugs 12975 and 12976
+ * DETAILS, PREPARE, INSTALL: Modified to be able to install both sets
+ of documentations. Tweaked the manpage installing to catch man*.
Modified
+ the html install to include everything in the howto dir.

2007-01-08 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 1.4.4.4
diff --git a/devel/git/INSTALL b/devel/git/INSTALL
index cc6082a..6230496 100755
--- a/devel/git/INSTALL
+++ b/devel/git/INSTALL
@@ -1,13 +1,27 @@
+function git_install_manpages() {
+ for FF in man*; do
+ cp -ra $FF $INSTALL_ROOT/usr/share/man
+ done
+}
+
+function git_install_htmldocs() {
+ local GIT_HTML &&
+ GIT_HTML=$INSTALL_ROOT/usr/share/doc/git/html &&
+ mkdir -p $GIT_HTML &&
+ cp -a *.html howto $GIT_HTML
+}
+
make HOME="$INSTALL_ROOT/usr" install &&
+
case $GIT_DOC in
- manpages)
- for FF in man1 man7;do
- cp -ra $FF $INSTALL_ROOT/usr/share/man
- done
- ;;
- htmldocs)
- GIT_HTML=$INSTALL_ROOT/usr/share/doc/git/html &&
- mkdir -p $GIT_HTML &&
- cp -a *.html howto/*.html $GIT_HTML
- ;;
+ manpages)
+ git_install_manpages
+ ;;
+ htmldocs)
+ git_install_htmldocs
+ ;;
+ both)
+ git_install_manpages &&
+ git_install_htmldocs
+ ;;
esac
diff --git a/devel/git/PREPARE b/devel/git/PREPARE
index eb88129..31a214c 100755
--- a/devel/git/PREPARE
+++ b/devel/git/PREPARE
@@ -1 +1 @@
-config_query_list GIT_DOC "which documentation" manpages htmldocs none
+config_query_list GIT_DOC "which documentation" manpages htmldocs both none
diff --git a/devel/git/PRE_BUILD b/devel/git/PRE_BUILD
index d0a0516..5388277 100755
--- a/devel/git/PRE_BUILD
+++ b/devel/git/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-if [ $GIT_DOC != none ]; then
+if [[ "$GIT_DOC" == "manpages" || "$GIT_DOC" == "both" ]]; then
unpack_file 3
fi &&
+if [[ "$GIT_DOC" == "htmldocs" || "$GIT_DOC" == "both" ]]; then
+ unpack_file 5
+fi &&
patch -p0 < $SCRIPT_DIRECTORY/curl_fix.patch




Archive powered by MHonArc 2.6.24.

Top of Page