Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (a53be2fd14e8f9b9b8264e062a44d1ce9c0f7915)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (a53be2fd14e8f9b9b8264e062a44d1ce9c0f7915)
  • Date: Mon, 22 Jan 2007 15:26:10 -0600

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

devel/guile/CONFIGURE | 1 -
devel/guile/DEPENDS | 8 +++++++-
devel/guile/HISTORY | 9 +++++++++
devel/guile/POST_REMOVE | 5 +----
devel/guile/PREPARE | 1 +
devel/guile/PRE_BUILD | 8 +++++++-
utils/mcron/DETAILS | 8 ++------
utils/mcron/HISTORY | 4 ++++
8 files changed, 31 insertions(+), 13 deletions(-)

New commits:
commit 6322d99a5aa525c3ab3b78d56193ad6dd21d9524
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

utils/mcron:

DETAILS: switched to installed_version guile to get its version,
removed UPDATED

commit 63a3ebff7cbfb4755482d815ae2dfda79f1bd5a1
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

devel/guile:

CONFIGURE: removed, the code must be in PREPARE
DEPENDS: gmp is required for 1.8 branch
POST_REMOVE: removed if checking, rm -rf do this as well, track_rootifying
PRE_BUILD: patch needs -R option for 1.8 branch to avoid user confirmation
PREPARE: added

diff --git a/devel/guile/CONFIGURE b/devel/guile/CONFIGURE
deleted file mode 100755
index 4ca95c3..0000000
--- a/devel/guile/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query G_18 "Use guile 1.8?" n
diff --git a/devel/guile/DEPENDS b/devel/guile/DEPENDS
index bddbf9b..c3c0ebb 100755
--- a/devel/guile/DEPENDS
+++ b/devel/guile/DEPENDS
@@ -1,2 +1,8 @@
depends libtool &&
-optional_depends gmp "" "" "for bignums support"
+
+if [ "$G_18" == "y" ]
+then
+ depends gmp
+else
+ optional_depends gmp "" "" "for bignums support"
+fi
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index afea734..3b85f76 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,12 @@
+2007-01-22 Pol Vinogradov <vin.public AT gmail.com>
+ * CONFIGURE: removed, the code must be in PREPARE
+ * DEPENDS: gmp is required for 1.8 branch
+ * POST_REMOVE: removed if checking, rm -rf do this as well,
+ track_rootifying
+ * PRE_BUILD: patch needs -R option for 1.8 branch to avoid user
+ confirmation
+ * PREPARE: added
+
2007-01-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD, use-syntax.patch: fixes guile for lilypond

diff --git a/devel/guile/POST_REMOVE b/devel/guile/POST_REMOVE
index e11f674..4f064b0 100755
--- a/devel/guile/POST_REMOVE
+++ b/devel/guile/POST_REMOVE
@@ -1,4 +1 @@
-if [ -d /usr/share/guile ]; then
- rm -r /usr/share/guile
-fi
-
+rm -rf ${TRACK_ROOT}/usr/share/guile
diff --git a/devel/guile/PREPARE b/devel/guile/PREPARE
new file mode 100755
index 0000000..4ca95c3
--- /dev/null
+++ b/devel/guile/PREPARE
@@ -0,0 +1 @@
+config_query G_18 "Use guile 1.8?" n
diff --git a/devel/guile/PRE_BUILD b/devel/guile/PRE_BUILD
index 5b76326..fa31e83 100755
--- a/devel/guile/PRE_BUILD
+++ b/devel/guile/PRE_BUILD
@@ -1,3 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/use-syntax.patch
+
+if [ "$G_18" == "y" ]
+then
+ patch -R -p0 < $SPELL_DIRECTORY/use-syntax.patch
+else
+ patch -p0 < $SPELL_DIRECTORY/use-syntax.patch
+fi
diff --git a/utils/mcron/DETAILS b/utils/mcron/DETAILS
index 0538254..459563a 100755
--- a/utils/mcron/DETAILS
+++ b/utils/mcron/DETAILS
@@ -1,9 +1,6 @@
SPELL=mcron
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-if [ "$G_18" = "y" ]
+ GUILE_VERSION=$(installed_version guile)
+if [[ "${GUILE_VERSION:0:3}" == "1.8" ]]
then
VERSION=1.0.3
else
@@ -18,7 +15,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE2_IGNORE=signature
WEB_SITE=http://www.gnu.org/software/mcron/
ENTERED=20040515
- UPDATED=20041122
LICENSE[0]=GPL
KEYWORDS="utils"
SHORT="Vixie cron replacement"
diff --git a/utils/mcron/HISTORY b/utils/mcron/HISTORY
index be00b64..eeab231 100644
--- a/utils/mcron/HISTORY
+++ b/utils/mcron/HISTORY
@@ -1,3 +1,7 @@
+2007-01-22 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: switched to installed_version guile to get its version,
+ removed UPDATED
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* DETAILS: Use version 1.0.2 for guile 1.6 and 1.0.3 for
guile 1.8.



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (a53be2fd14e8f9b9b8264e062a44d1ce9c0f7915), Pol Vinogradov, 01/22/2007

Archive powered by MHonArc 2.6.24.

Top of Page