sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (49ac4a322681e1a9f4806658e69bdf0026d6b1f5)

From: Jaka Kranjc <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (49ac4a322681e1a9f4806658e69bdf0026d6b1f5)
Date: Fri, 2 Mar 2007 15:54:06 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

devel/guile/BUILD | 5 +----
devel/guile/DETAILS | 1 +
devel/guile/HISTORY | 6 ++++++
devel/guile/PRE_BUILD | 4 +---
devel/guile/UP_TRIGGERS | 2 +-
5 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 49ac4a322681e1a9f4806658e69bdf0026d6b1f5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

guile: fix info install path and misc

diff --git a/devel/guile/BUILD b/devel/guile/BUILD
index d2ebc6a..26d6139 100755
--- a/devel/guile/BUILD
+++ b/devel/guile/BUILD
@@ -2,9 +2,6 @@ sedit "s/extern int inet_aton/\/\/ exte
libguile/net_db.c &&

libtoolize -c -f &&
-./configure --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- $OPTS &&
make_single &&
-make &&
+default_build &&
make_normal
diff --git a/devel/guile/DETAILS b/devel/guile/DETAILS
index 68d321f..81b0e79 100755
--- a/devel/guile/DETAILS
+++ b/devel/guile/DETAILS
@@ -4,6 +4,7 @@ then
VERSION=1.8.1
else
VERSION=1.6.8
+ PATCHLEVEL=1
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index ba31cd5..7fbc33e 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,9 @@
+2007-03-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * UP_TRIGGERS: only trigger on the 1.6->1.8 update
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: only patch 1.6; -R makes no sense, it's bad bad bad!
+ * BUILD: use default_build so info pages get installed properly
+
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
diff --git a/devel/guile/PRE_BUILD b/devel/guile/PRE_BUILD
index fa31e83..b07515d 100755
--- a/devel/guile/PRE_BUILD
+++ b/devel/guile/PRE_BUILD
@@ -1,9 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-if [ "$G_18" == "y" ]
+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/devel/guile/UP_TRIGGERS b/devel/guile/UP_TRIGGERS
index d377780..b644f5c 100755
--- a/devel/guile/UP_TRIGGERS
+++ b/devel/guile/UP_TRIGGERS
@@ -4,7 +4,7 @@ then
fi &&

local VE=$(installed_version guile)
-if [ "${VE:0:3}" = "1.6" ]
+if [[ ${VE:0:3} = "1.6" && ${VERSION:0:3} == "1.8" ]]
then
RECAST_UP="guile"
fi

[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (49ac4a322681e1a9f4806658e69bdf0026d6b1f5), Jaka Kranjc, 03/02/2007