Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (6a5c5a20b3284bec95531601e4ce2e00ff4a686a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (6a5c5a20b3284bec95531601e4ce2e00ff4a686a)
  • Date: Sat, 8 Jul 2006 05:49:49 -0500

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

devel/gcl/BUILD | 2 ++
devel/gcl/DEPENDS | 11 ++++++-----
devel/gcl/DETAILS | 4 +---
devel/gcl/HISTORY | 7 +++++++
devel/gcl/PRE_BUILD | 3 +++
devel/gcl/configure.patch | 40
++++++++++++++++++++++++++++++++++++++++
python-devel/pygame/HISTORY | 3 +++
python-devel/pygame/SUB_DEPENDS | 2 +-
8 files changed, 63 insertions(+), 9 deletions(-)

New commits:
commit 6a5c5a20b3284bec95531601e4ce2e00ff4a686a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

pygame: return 1 on uknown/bogus subdep

commit fc48f5ee07556894f93e5faac3cfa1cfd3b765a4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gcl intermidiate commit

diff --git a/devel/gcl/BUILD b/devel/gcl/BUILD
new file mode 100755
index 0000000..1533bba
--- /dev/null
+++ b/devel/gcl/BUILD
@@ -0,0 +1,2 @@
+LDFLAGS=${LDFLAGS/-s/} &&
+default_build
diff --git a/devel/gcl/DEPENDS b/devel/gcl/DEPENDS
index 2cd1f05..16fa71a 100755
--- a/devel/gcl/DEPENDS
+++ b/devel/gcl/DEPENDS
@@ -3,12 +3,13 @@ depends libpcap &&
optional_depends "gmp" \
"" \
"--enable-gmp=no" \
- "To use GMP (gnu multiprecision arithmetic)" &&
+ "For system GMP" &&
optional_depends "tcl" \
- "--enable-tclconfig=$(gaze from tclConfig.sh | cut -d/
-f2-3)" \
- "" \
+ "--enable-tclconfig=/usr/lib/tclConfig.sh" \
+ "--disable-tclconfig" \
"For a GCL connection with the windowing tools of TCL"
&&
optional_depends "tk" \
- "--enable-tkconfig=$(gaze from tkConfig.sh | cut -d/ -f2-3)"
\
- "" \
+ "--enable-tkconfig=/usr/lib/tkConfig.sh" \
+ "--disable-tkconfig" \
"For a GCL connection with the windowing tools of TK"
+#optional_depends X11-LIBS "" "" "for?"
diff --git a/devel/gcl/DETAILS b/devel/gcl/DETAILS
index 4bf4886..1db2e11 100755
--- a/devel/gcl/DETAILS
+++ b/devel/gcl/DETAILS
@@ -1,5 +1,5 @@
SPELL=gcl
- VERSION=2.6.6
+ VERSION=2.6.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -8,9 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_GPG=gnu-verified.gpg:$SOURCE2
SOURCE2_IGNORE=signature
WEB_SITE=http://www.gnu.org/software/gcl/gcl.html
- BUILD_API=2
ENTERED=20020312
- UPDATED=20030907
MAKE_NJOBS=1
LICENSE[0]=GPL
SHORT="GNU Compiler and interpreter for Common Lisp"
diff --git a/devel/gcl/HISTORY b/devel/gcl/HISTORY
index 16a2b1e..6229b6c 100644
--- a/devel/gcl/HISTORY
+++ b/devel/gcl/HISTORY
@@ -1,4 +1,11 @@
2006-07-06 Jaka Kranjc <lynx AT mages.ath.cx>
+ * DETAILS: bumped version
+ * BUILD: added, remove -s from LDFLAGS so it builds with tcl/tk
+ * PRE_BUILD, configure.patch: added to make it build again
+ * DEPENDS: cleaned up tcl/tk optionals
+ * USEGCC2: removed
+
+2006-07-06 Jaka Kranjc <lynx AT mages.ath.cx>
* DEPENDS: added libpcap #11463

2005-08-25 Jeremy Blosser <jblosser-smgl AT firinn.org>
diff --git a/devel/gcl/PRE_BUILD b/devel/gcl/PRE_BUILD
new file mode 100755
index 0000000..68adf61
--- /dev/null
+++ b/devel/gcl/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/configure.patch
diff --git a/devel/gcl/USEGCC2 b/devel/gcl/USEGCC2
deleted file mode 100644
index e69de29..0000000
diff --git a/devel/gcl/configure.patch b/devel/gcl/configure.patch
new file mode 100644
index 0000000..b4f21ad
--- /dev/null
+++ b/devel/gcl/configure.patch
@@ -0,0 +1,40 @@
+--- gcl-2.6.7/configure~ 2005-01-15 19:17:17.000000000 +0000
++++ gcl-2.6.7/configure 2006-01-13 18:13:29.000000000 +0000
+@@ -1697,11 +1697,9 @@
+ done
+ test -n "$MAKEINFO" || MAKEINFO=""false""
+
+-
+-
+-if test -f /usr/lib/NextStep/software_version; then
+- system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
+-else
++# if test -f /usr/lib/NextStep/software_version; then
++# system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
++# else
+ system=`uname -s`-`uname -r`
+ if test "$?" -ne 0 ; then
+ echo "$ac_t""unknown (can't find uname command)" 1>&6
+@@ -1710,15 +1708,15 @@
+ # Special check for weird MP-RAS system (uname returns weird
+ # results, and the version is kept in special file).
+
+- if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+- system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
+- fi
+- if test "`uname -s`" = "AIX" ; then
+- system=AIX-`uname -v`.`uname -r`
+- fi
++ # if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
++ # system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
++ # fi
++ # if test "`uname -s`" = "AIX" ; then
++ # system=AIX-`uname -v`.`uname -r`
++ # fi
+ echo "$ac_t""$system" 1>&6
+ fi
+-fi
++# fi
+
+ # sysconf
+
diff --git a/python-devel/pygame/HISTORY b/python-devel/pygame/HISTORY
index ecc28ed..6732301 100644
--- a/python-devel/pygame/HISTORY
+++ b/python-devel/pygame/HISTORY
@@ -1,3 +1,6 @@
+2006-07-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * SUB_DEPENDS: return 1 on uknown/bogus subdep
+
2005-12-05 Sergey Lipnevich <sergey AT sourcemage.org>
* SUB_DEPENDS: numeric doesn't have sub-dependencies defined;
* DETAILS: use patch level as intended by sqweek.
diff --git a/python-devel/pygame/SUB_DEPENDS b/python-devel/pygame/SUB_DEPENDS
index 04d4ec9..fabfa2c 100755
--- a/python-devel/pygame/SUB_DEPENDS
+++ b/python-devel/pygame/SUB_DEPENDS
@@ -4,5 +4,5 @@ case "$THIS_SUB_DEPENDS" in
MIXER) depends sdl_mixer;;
SMPEG) depends smpeg;;
NUMERIC) depends numeric NUMERIC;;
- *) echo "bogus sub_depends: pygame $THIS_SUB_DEPENDS";;
+ *) echo "bogus sub_depends: pygame $THIS_SUB_DEPENDS"; return 1;;
esac



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (6a5c5a20b3284bec95531601e4ce2e00ff4a686a), Jaka Kranjc, 07/08/2006

Archive powered by MHonArc 2.6.24.

Top of Page