Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (487a7d718fa4e28995120c583b1d184a56eaea3f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (487a7d718fa4e28995120c583b1d184a56eaea3f)
  • Date: Mon, 18 Aug 2008 03:45:10 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

devel/git/BUILD | 7 ---
devel/git/CONFIGURE | 24 ++++-------
devel/git/DEPENDS | 96
++++++++++++++------------------------------
devel/git/DETAILS | 8 +--
devel/git/HISTORY | 10 ++++
devel/git/INSTALL | 31 ++++++--------
devel/git/PRE_BUILD | 12 +++--
devel/git/init.d/git-daemon | 15 +++---
8 files changed, 83 insertions(+), 120 deletions(-)

New commits:
commit 487a7d718fa4e28995120c583b1d184a56eaea3f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

git: cleanup commit for fixing some stuff for new 1.6 version/removed
obsolete definitions, renewed a spell

diff --git a/devel/git/BUILD b/devel/git/BUILD
deleted file mode 100755
index 9a7ce36..0000000
--- a/devel/git/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-#GIT_MAKE_OPTS="$GIT_MAKE_OPTS $OPTS" &&
-#
-#make HOME="${TRACK_ROOT}/usr" $GIT_MAKE_OPTS
-
-make configure &&
-
-default_build
diff --git a/devel/git/CONFIGURE b/devel/git/CONFIGURE
index 8593701..c137253 100755
--- a/devel/git/CONFIGURE
+++ b/devel/git/CONFIGURE
@@ -1,18 +1,12 @@
-config_query_list GIT_SHA_OPT \
- "Which sha option would you like to use?" \
- openssl \
- mozilla &&
+config_query_list GIT_SHA_OPT \
+ "Which sha option would you like to use?" \
+ openssl \
+ mozilla &&

-persistent_add GIT_MAKE_OPTS &&
-
-if [[ $GIT_SHA_OPT != openssl ]] ; then
- GIT_MAKE_OPTS="$GIT_MAKE_OPTS NO_OPENSSL=true"
-fi &&
-
-if spell_ok uri &&
- spell_ok term-readkey &&
- spell_ok lwp ; then
- config_query GIT_SVN "Enable Subversion import support?" y
+if spell_ok uri &&
+ spell_ok term-readkey &&
+ spell_ok lwp; then
+ config_query GIT_SVN "Enable Subversion import support?" y
else
- config_query GIT_SVN "Enable Subversion import support?" n
+ config_query GIT_SVN "Enable Subversion import support?" n
fi
diff --git a/devel/git/DEPENDS b/devel/git/DEPENDS
index 1ebb241..a3779a9 100755
--- a/devel/git/DEPENDS
+++ b/devel/git/DEPENDS
@@ -1,64 +1,32 @@
-depends autoconf &&
-
-if [[ $GIT_SHA_OPT == openssl ]] ; then
- depends openssl
-fi &&
-
-if [[ "$GIT_SVN" == "y" ]]; then
- depends lwp &&
- depends term-readkey &&
- depends uri
-fi &&
-
-optional_depends bash-completion \
- '' \
- '' \
- 'for bash completion of Git commands' &&
-
-optional_depends curl \
- '--with-curl' \
- '--without-curl' \
- 'For http pull' &&
-
-optional_depends expat \
- '--with-expat' \
- '--without-expat' \
- 'for http push' &&
-
-optional_depends python \
- '' \
- '--without-python' \
- 'For the recursive merge strategy' &&
-
-# these should become suggest_depends when possible
-optional_depends perl \
- '' \
- '' \
- 'For arch/cvs/svn import and other advanced commands' &&
-optional_depends rsync \
- '' \
- '' \
- 'For syncing repos with rsync' &&
-optional_depends rcs \
- '' \
- '' \
- 'For RCS-based simple merge support' &&
-optional_depends dbd-sqlite \
- '' \
- '' \
- 'For git-cvsserver' &&
-optional_depends tk \
- '--with-tcltk' \
- '' \
- 'For interactive GUI and graphical history browser' &&
-
-
-if is_depends_enabled $SPELL perl
-then
- depends perl-error
-fi &&
-
-optional_depends vim \
- '' \
- '' \
- 'for Git commit message syntax highlighting'
+depends perl-error &&
+
+if [[ $GIT_SHA_OPT == openssl ]]; then
+ depends openssl "--with-openssl"
+fi &&
+
+if [[ $GIT_SVN == y ]]; then
+ depends lwp &&
+ depends term-readkey &&
+ depends uri
+fi &&
+
+optional_depends curl \
+ "--with-curl" \
+ "--without-curl" \
+ "for http pull" &&
+
+optional_depends expat \
+ "--with-expat" \
+ "--without-expat" \
+ "for http push" &&
+
+optional_depends tk \
+ "--with-tcltk" \
+ "--without-tcltk" \
+ "for interactive GUI and graphical history browser" &&
+
+suggest_depends dbd-sqlite "" "" "for git-cvsserver" &&
+suggest_depends python "" "" "for recursive merge strategy" &&
+suggest_depends bash-completion "" "" "for bash completion of Git commands"
&&
+suggest_depends vim "" "" "for Git commit message syntax highlighting" &&
+suggest_depends rsync "" "" "for syncing repos with rsync"
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index f2b569d..c33e07a 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -7,18 +7,18 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE
SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
SOURCE2_IGNORE=signature
-if [[ "$GIT_DOC" == "manpages" || "$GIT_DOC" == "both" ]]; then
+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_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
+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_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
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 9cd7097..1fedccf 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,5 +1,13 @@
2008-08-18 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 1.6.0
+ * DETAILS: updated spell to 1.6.0, added some more bashism
+ * BUILD: default_build OK
+ * CONFIGURE: GIT_MAKE_OPTS became useless, cleaned up
+ * PRE_BUILD: cleaned up, quoting the paths!
+ * INSTALL: use verbose `install' instead of plain `cp', cleaned up
+ * DEPENDS: fixed deps, some set as suggested, perl is _required_, it's
+ not optional, corrected flags, cleaned up: now useless git-* stuff
+ isn't installed if not really needed
+ * init.d/git-daemon: cleaned up

2008-08-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.5.6.5
diff --git a/devel/git/INSTALL b/devel/git/INSTALL
index 2554243..664b521 100755
--- a/devel/git/INSTALL
+++ b/devel/git/INSTALL
@@ -1,17 +1,18 @@
function git_install_manpages() {
for FF in man*; do
- cp -ra $FF $INSTALL_ROOT/usr/share/man
+ install -vm 755 -d "$INSTALL_ROOT/usr/share/man/$FF"
+ install -vm 644 $FF/* "$INSTALL_ROOT/usr/share/man/$FF"
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
+ local GIT_HTML &&
+ GIT_HTML="$INSTALL_ROOT/usr/share/doc/git/html" &&
+ install -vm 755 -d $GIT_HTML &&
+ install -vm 644 *.html howto $GIT_HTML
}

-make HOME="$INSTALL_ROOT/usr" install &&
+make HOME="$INSTALL_ROOT/usr" install &&

case $GIT_DOC in
manpages)
@@ -24,17 +25,15 @@ case $GIT_DOC in
git_install_manpages &&
git_install_htmldocs
;;
-esac &&
+esac &&

-if is_depends_enabled $SPELL bash-completion
-then
- cp $SOURCE_DIRECTORY/contrib/completion/git-completion.bash \
- $INSTALL_ROOT/etc/bash_completion.d/git-completion
-fi &&
+if is_depends_enabled $SPELL bash-completion; then
+ install -vm 755 "$SOURCE_DIRECTORY/contrib/completion/git-completion.bash"
\
+ "$INSTALL_ROOT/etc/bash_completion.d/git-completion"
+fi &&

-if is_depends_enabled $SPELL vim
-then
+if is_depends_enabled $SPELL vim; then
VIM_VERSION=$(installed_version vim)
- cp $SOURCE_DIRECTORY/contrib/vim/syntax/gitcommit.vim \
- $INSTALL_ROOT/usr/share/vim/vim${VIM_VERSION/./}/syntax
+ install -vm 644 "$SOURCE_DIRECTORY/contrib/vim/syntax/gitcommit.vim" \
+ "$INSTALL_ROOT/usr/share/vim/vim${VIM_VERSION/./}/syntax"
fi
diff --git a/devel/git/PRE_BUILD b/devel/git/PRE_BUILD
index a4749c8..d0f73c7 100755
--- a/devel/git/PRE_BUILD
+++ b/devel/git/PRE_BUILD
@@ -1,8 +1,10 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [[ "$GIT_DOC" == "manpages" || "$GIT_DOC" == "both" ]]; then
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
unpack_file 3
-fi &&
-if [[ "$GIT_DOC" == "htmldocs" || "$GIT_DOC" == "both" ]]; then
+fi &&
+
+if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
unpack_file 5
fi
diff --git a/devel/git/init.d/git-daemon b/devel/git/init.d/git-daemon
index bbf4a66..cc4b126 100755
--- a/devel/git/init.d/git-daemon
+++ b/devel/git/init.d/git-daemon
@@ -15,24 +15,23 @@ create_args()
[[ $PORT ]] && ARGS="$ARGS --port=$PORT"
[[ $STRICT_PATHS ]] && ARGS="$ARGS --strict-paths"
[[ $BASE_PATH ]] && ARGS="$ARGS --base-path=$BASE_PATH"
- if [ -z $EXPORTED_DIRECTORIES ] ; then
+ if [ -z $EXPORTED_DIRECTORIES ]; then
ARGS="$ARGS --export-all"
else
ARGS="$ARGS $EXPORTED_DIRECTORIES"
- fi
- if [ -z $LOG_FILE ] ; then
+ fi
+ if [ -z $LOG_FILE ]; then
LOG_FILE="/var/log/git-daemon.log"
fi
}

start()
{
- echo "Starting Git Daemon:"
- create_args
- (
+ echo "Starting Git Daemon:"
+ create_args
+ (
unset -f echo &&
- su -c "$PROGRAM $ARGS >> ${LOG_FILE} 2>&1" $USER
+ su -c "$PROGRAM $ARGS >> ${LOG_FILE} 2>&1" $USER
) &
evaluate_retval
}
-



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (487a7d718fa4e28995120c583b1d184a56eaea3f), Vlad Glagolev, 08/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page