Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (221dbda681a3a6fe77b1dd2ddafe51065acdb70f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (221dbda681a3a6fe77b1dd2ddafe51065acdb70f)
  • Date: Tue, 27 Jun 2006 03:14:20 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

devel/git/BUILD | 6 +-----
devel/git/CONFIGURE | 4 ----
devel/git/DEPENDS | 9 +--------
devel/git/DETAILS | 8 ++++++++
devel/git/HISTORY | 8 ++++++++
devel/git/INSTALL | 15 ++++++++++++---
devel/git/PREPARE | 1 +
devel/git/PRE_BUILD | 5 +++++
8 files changed, 36 insertions(+), 20 deletions(-)

New commits:
commit 221dbda681a3a6fe77b1dd2ddafe51065acdb70f
Merge: 47b6653dc7cd3284d9da5a049b520c880fa1f87b
edeb9ba3b48c3b51b231355d557b2b3aa34a35d9
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

commit 47b6653dc7cd3284d9da5a049b520c880fa1f87b
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

git - change installation for docs (download, don't build)

diff --git a/devel/git/BUILD b/devel/git/BUILD
index 6ccd144..e4512da 100755
--- a/devel/git/BUILD
+++ b/devel/git/BUILD
@@ -1,7 +1,3 @@
GIT_MAKE_OPTS="$GIT_MAKE_OPTS $OPTS" &&

-make HOME="${TRACK_ROOT}/usr" $GIT_MAKE_OPTS &&
-
-if [[ $GIT_DOCS == "y" ]]; then
- make -C Documentation
-fi
+make HOME="${TRACK_ROOT}/usr" $GIT_MAKE_OPTS
diff --git a/devel/git/CONFIGURE b/devel/git/CONFIGURE
index b4affcd..8446126 100755
--- a/devel/git/CONFIGURE
+++ b/devel/git/CONFIGURE
@@ -1,7 +1,3 @@
-config_query GIT_DOCS \
- "Would you like to make documentation?" \
- y &&
-
config_query_list GIT_SHA_OPT \
"Which sha option would you like to use?" \
openssl \
diff --git a/devel/git/DEPENDS b/devel/git/DEPENDS
index 53d8e97..e1e3624 100755
--- a/devel/git/DEPENDS
+++ b/devel/git/DEPENDS
@@ -31,11 +31,4 @@ optional_depends rcs
optional_depends dbd-sqlite \
'' \
'' \
- 'For git-cvsserver' &&
-
-# these should become build_depends when possible
-if [[ $GIT_DOCS == "y" ]]
-then
- depends xmlto &&
- depends asciidoc
-fi
+ 'For git-cvsserver'
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 8c3ad9b..e7300bf 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -7,6 +7,14 @@ 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
+ SOURCE4=$SOURCE3.sign
+ 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
LICENSE[0]=GPL
BUILD_API=2
PATCHLEVEL=2
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index e14671d..c1ca9e4 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,11 @@
+2006-06-25 Treeve Jelbert <treeve01 AT pi.be>
+ * PREPARE, PRE_BUILD: add
+ * CONFIGURE: remove query for docs
+ * DEPENDS: remove doc related depends
+ * BUILD: don't build docs
+ in general just download prepared docs (manpages or htmldocs) from
website,
+ as suggested in bug #12693
+
2006-06-12 Eric Sandall <eric AT sandall.us>
* DETAILS: Updated to 1.4.0

diff --git a/devel/git/INSTALL b/devel/git/INSTALL
index 19c7e45..cc6082a 100755
--- a/devel/git/INSTALL
+++ b/devel/git/INSTALL
@@ -1,4 +1,13 @@
make HOME="$INSTALL_ROOT/usr" install &&
-if [[ $GIT_DOCS == "y" ]]; then
- make -C Documentation HOME="$INSTALL_ROOT/usr/share" install
-fi
+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
+ ;;
+esac
diff --git a/devel/git/PREPARE b/devel/git/PREPARE
new file mode 100755
index 0000000..eb88129
--- /dev/null
+++ b/devel/git/PREPARE
@@ -0,0 +1 @@
+config_query_list GIT_DOC "which documentation" manpages htmldocs none
diff --git a/devel/git/PRE_BUILD b/devel/git/PRE_BUILD
new file mode 100755
index 0000000..688c117
--- /dev/null
+++ b/devel/git/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+if [ $GIT_DOC != none ]; then
+ unpack_file 3
+fi



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (221dbda681a3a6fe77b1dd2ddafe51065acdb70f), Treeve Jelbert, 06/27/2006

Archive powered by MHonArc 2.6.24.

Top of Page