[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7e47a5469dfc53b0bb7aa7d33688e9546c224492)

Vlad Glagolev scm at sourcemage.org
Sat Dec 15 07:31:18 EST 2007


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

 archive/p7zip/DETAILS          |    1 +
 archive/p7zip/HISTORY          |    4 ++++
 archive/p7zip/PRE_BUILD        |    5 +++--
 audio-players/sonata/DEPENDS   |   21 +++++----------------
 audio-players/sonata/DETAILS   |    9 +++++----
 audio-players/sonata/HISTORY   |    5 +++++
 audio-players/sonata/PRE_BUILD |    4 ++++
 database/sqlite/DEPENDS        |    7 ++++---
 database/sqlite/DETAILS        |    3 ++-
 database/sqlite/HISTORY        |    3 ++-
 database/sqlite/PRE_BUILD      |    6 +++---
 11 files changed, 38 insertions(+), 30 deletions(-)

New commits:
commit 7e47a5469dfc53b0bb7aa7d33688e9546c224492
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    sqlite: seems tcl is required now.. readline is optional..

commit 358d5a6e43c055421dae19721b7414d2e669b9b8
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    sonata: fixed man installation path, cleaned up

commit 4709ed148294619e5421bb45a66483c300e0de41
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    p7zip: fixed man installation path

diff --git a/archive/p7zip/DETAILS b/archive/p7zip/DETAILS
index 39ddb68..0702a66 100755
--- a/archive/p7zip/DETAILS
+++ b/archive/p7zip/DETAILS
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
         WEB_SITE=http://$SPELL.sourceforge.net/
          ENTERED=20050123
       LICENSE[0]=LGPL
+      PATCHLEVEL=1
         KEYWORDS="archive"
            SHORT='a quick port of command-line tools of 7zip for UNIX'
 cat << EOF
diff --git a/archive/p7zip/HISTORY b/archive/p7zip/HISTORY
index 77c071e..7a14c58 100644
--- a/archive/p7zip/HISTORY
+++ b/archive/p7zip/HISTORY
@@ -1,3 +1,7 @@
+2007-12-15 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: fixed man installation path
+
 2007-09-14 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.55
 
diff --git a/archive/p7zip/PRE_BUILD b/archive/p7zip/PRE_BUILD
index 3be9be0..82158c1 100755
--- a/archive/p7zip/PRE_BUILD
+++ b/archive/p7zip/PRE_BUILD
@@ -1,8 +1,9 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
 
-sed -i "s|/usr/local|$INSTALL_ROOT/usr|g;s|usr/man|usr/share/man|" \
-       makefile install.sh &&
+sed -i "s:/usr/local:$INSTALL_ROOT/usr:g" makefile install.sh &&
+sed -i "s:HOME)/man:HOME)/share/man:" makefile &&
+sed -i "s:HOME}/man:HOME}/share/man:" install.sh &&
 
 # make sure make is using our CFLAGS, see also the sedit below
 sedit "s|CFLAGS=|CFLAGS=$CFLAGS |g" makefile.glb &&
diff --git a/audio-players/sonata/DEPENDS b/audio-players/sonata/DEPENDS
index 81cbbdf..a98b154 100755
--- a/audio-players/sonata/DEPENDS
+++ b/audio-players/sonata/DEPENDS
@@ -1,17 +1,6 @@
-depends           mpd                  &&
-depends           pygtk2               &&
+depends mpd &&
+depends pygtk2 &&
 
-optional_depends  gnome-python-extras  \
-                  ""                   \
-                  ""                   \
-                  "for GNOME support"  &&
-
-optional_depends  soappy                           \
-                  ""                               \
-                  ""                               \
-                  "for automatic lyrics fetching"  &&
-
-optional_depends  tagpy                \
-                  ""                   \
-                  ""                   \
-                  "for editing metadata"
+optional_depends gnome-python-extras "" "" "for GNOME support" &&
+optional_depends soappy "" "" "for automatic lyrics fetching" &&
+optional_depends tagpy "" "" "for editing metadata"
diff --git a/audio-players/sonata/DETAILS b/audio-players/sonata/DETAILS
index f873e0b..798edf0 100755
--- a/audio-players/sonata/DETAILS
+++ b/audio-players/sonata/DETAILS
@@ -1,14 +1,15 @@
            SPELL=sonata
          VERSION=1.3
-          SOURCE=${SPELL}-${VERSION}.tar.bz2
-   SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
      SOURCE_HASH=sha512:5c2219a94751bc337a5387c91a834bda73e8be09c84d2d25da5216646c2864b47e26be81c9340f66916cbd9fb9e209d9200e3685114014bbf80e68cc3777115d
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://sonata.berlios.de/
       LICENSE[0]=GPL
          ENTERED=20061230
+      PATCHLEVEL=1
         KEYWORDS="python player audio"
            SHORT="A lightweight music player for MPD, written in Python"
 cat << EOF
-A lightweight music player for MPD, written in Python
+A lightweight music player for MPD, written in Python.
 EOF
diff --git a/audio-players/sonata/HISTORY b/audio-players/sonata/HISTORY
index a562f89..25ba8b7 100644
--- a/audio-players/sonata/HISTORY
+++ b/audio-players/sonata/HISTORY
@@ -1,3 +1,8 @@
+2007-12-15 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: PATCHLEVEL++, cleaned up
+	* DEPENDS: cleaned up
+	* PRE_BUILD: fixed man installation path
+
 2007-11-23 Pol Vinogradov <vin.public at gmail.com>
 	* DETAILS: Updated to version 1.3
 
diff --git a/audio-players/sonata/PRE_BUILD b/audio-players/sonata/PRE_BUILD
new file mode 100755
index 0000000..e141e21
--- /dev/null
+++ b/audio-players/sonata/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+sed -i "s:man:share/man:" setup.py
diff --git a/database/sqlite/DEPENDS b/database/sqlite/DEPENDS
index eff8121..64d2e40 100755
--- a/database/sqlite/DEPENDS
+++ b/database/sqlite/DEPENDS
@@ -1,3 +1,4 @@
-depends g++      &&
-depends readline &&
-optional_depends tcl '' '' 'for TCL interface'
+depends g++ &&
+depends tcl &&
+
+optional_depends readline "" "--disable-readline" "for Readline support"
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index f636eb2..9b4bd60 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -7,8 +7,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       LICENSE[0]=PD
         WEB_SITE=http://www.sqlite.org/
          ENTERED=20011016
+      PATCHLEVEL=1
         KEYWORDS="sql database"
-           SHORT='An SQL engine in a C library'
+           SHORT="An SQL engine in a C library"
 
 cat << EOF
 SQLite is a C library that implements an SQL database engine. A large
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 472ca73..ca996f8 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,5 +1,6 @@
 2007-12-15 Vlad Glagolev <stealth at sourcemage.org>
-	* DETAILS: updated spell to 3.5.4
+	* DETAILS: updated spell to 3.5.4, cleaned up, PATCHLEVEL++
+	* DEPENDS: readline => optional, tcl => required
 
 2007-11-28 George Sherwood <george at beernabeer.com>
 	* DETAILS: Updated to version 3.5.3
diff --git a/database/sqlite/PRE_BUILD b/database/sqlite/PRE_BUILD
index d1db0a7..07e945b 100755
--- a/database/sqlite/PRE_BUILD
+++ b/database/sqlite/PRE_BUILD
@@ -1,3 +1,3 @@
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
-patch -p1 <$SPELL_DIRECTORY/mk.diff
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/mk.diff



More information about the SM-Commit mailing list