[SM-Commit] GIT changes to master grimoire by Arjan Bouter (4625a08cfe3ec2a802e16b874ccebcde02311e54)

Arjan Bouter scm at sourcemage.org
Thu Apr 10 16:54:56 EDT 2008


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 windowmanagers/fluxbox/DEPENDS  |    2 -
 windowmanagers/fluxbox/DETAILS  |    6 ++---
 windowmanagers/fluxbox/DOWNLOAD |   47 ----------------------------------------
 windowmanagers/fluxbox/HISTORY  |    4 +++
 windowmanagers/fluxbox/INSTALL  |    2 -
 windowmanagers/fluxbox/PREPARE  |    4 +--
 6 files changed, 11 insertions(+), 54 deletions(-)

New commits:
commit 4625a08cfe3ec2a802e16b874ccebcde02311e54
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    fluxbox: upstream replaced svn by git

diff --git a/windowmanagers/fluxbox/DEPENDS b/windowmanagers/fluxbox/DEPENDS
index eff5f34..d3f1857 100755
--- a/windowmanagers/fluxbox/DEPENDS
+++ b/windowmanagers/fluxbox/DEPENDS
@@ -3,7 +3,7 @@ depends  freetype2  &&
 depends  g++        &&
 
 if  [  "$FLUXBOX_SVN"  ==  "y"  ]
-then depends SVN
+then depends git
 fi  &&
 
 optional_depends  kdelibs         \
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index 4453ea9..fbe0108 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -6,9 +6,9 @@ if [  "$FLUXBOX_SVN"  ==  "y"  ];  then
   else   VERSION=svn
   fi
 
-          SOURCE=$SPELL-svn.tar.bz2
-   SOURCE_URL[0]=svn://svn.berlios.de/fluxbox/trunk:fluxbox
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+          SOURCE=$SPELL-git.tar.bz2
+   SOURCE_URL[0]=git://git.fluxbox.org/fluxbox.git:fluxbox.git
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
    SOURCE_IGNORE=volatile
 else
          VERSION=1.0.0
diff --git a/windowmanagers/fluxbox/DOWNLOAD b/windowmanagers/fluxbox/DOWNLOAD
deleted file mode 100755
index 36ac7e1..0000000
--- a/windowmanagers/fluxbox/DOWNLOAD
+++ /dev/null
@@ -1,47 +0,0 @@
-function url_r_svn_crack() {
-
-  URL=`url_strip_prefix "$1" svn`
-  R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
-  local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
-  R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
-  local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
-  R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
-
-}
-if [[ $FLUXBOX_SVN == y ]]
-then
-url_r_svn_crack ${SOURCE_URL}                                                 &&
-message "${MESSAGE_COLOR}Starting SVN checkout of"                            \
-        "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"           &&
-if [[ -f $SOURCE_CACHE/${SOURCE} ]]
-then
-  message "${MESSAGE_COLOR}Previous source found unpacking...${DEFAULT_COLOR}" &&
-  tar -jxf $SOURCE_CACHE/${SOURCE}                                            &&
-  cd $R_SVN_MODULE                                                            &&
-  message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}"             &&
-  svn                                                                         \
-      --non-interactive                                                       \
-      update                                                                  \
-      -r${R_SVN_TAG}                                                          &&
-  cd ..                                                                       &&
-  message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-else
-  message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}"   &&
-  svn                                                                         \
-      --non-interactive                                                       \
-      checkout                                                                \
-      -r${R_SVN_TAG}                                                          \
-      svn://${R_SVN_ROOT}                                                     \
-      ${R_SVN_MODULE}                                                         &&
-  message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
-fi                                                                            &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}"               &&
-tar -jcf                                                                      \
-    ${SOURCE}                                                                 \
-    ${R_SVN_MODULE}                                                           &&
-cp  ${SOURCE} ${SOURCE_CACHE}/${SOURCE}                                       &&
-rm  ${SOURCE}                                                                 &&
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
-else
-acquire_src ''
-fi
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index d69f647..e5a01a9 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,7 @@
+2008-04-10 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS, DEPENDS, PREPARE: dev version moved from svn to git
+	* DOWNLOAD: removed, no longer needed
+
 2007-11-30 Elisamuel Resto <ryuji at mages.ath.cx>
 	* DOWNLOAD: #13828 fix didnt work properly, file from valgrind spell does
 
diff --git a/windowmanagers/fluxbox/INSTALL b/windowmanagers/fluxbox/INSTALL
index c514af8..ea39e30 100755
--- a/windowmanagers/fluxbox/INSTALL
+++ b/windowmanagers/fluxbox/INSTALL
@@ -1,2 +1,2 @@
-default_install                                         &&
+default_install  &&
 install_wmfiles
diff --git a/windowmanagers/fluxbox/PREPARE b/windowmanagers/fluxbox/PREPARE
index 7bf5311..de916b5 100755
--- a/windowmanagers/fluxbox/PREPARE
+++ b/windowmanagers/fluxbox/PREPARE
@@ -1,4 +1,4 @@
-config_query  FLUXBOX_SVN  "Build the SVN version?"  n
+config_query  FLUXBOX_SVN  "Build the GIT version?"  n
 if [[ "${FLUXBOX_SVN}" == "y" ]]
-then config_query FLUXBOX_SVN_AUTOUPDATE "Update svn repo on every update?" n
+then config_query FLUXBOX_SVN_AUTOUPDATE "Update git repo on every update?" n
 fi



More information about the SM-Commit mailing list