[SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (a076dea3f52f426bf55c531b2d0700bb2b6d6068)

Jaka Kranjc scm at mail.sourcemage.org
Mon Jan 29 15:33:04 EST 2007


GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 cluster/parmetis/DETAILS                   |    2 +-
 cluster/parmetis/HISTORY                   |    3 +++
 libs/libpathan/DETAILS                     |    6 +++---
 libs/libpathan/HISTORY                     |    3 +++
 shell-term-fm/zhcon/BUILD                  |    7 ++-----
 shell-term-fm/zhcon/DETAILS                |    7 +++----
 shell-term-fm/zhcon/HISTORY                |    7 +++++++
 shell-term-fm/zhcon/gcc-3.3.patch          |   22 ----------------------
 shell-term-fm/zhcon/zhcon-smglcompat.patch |    6 +++---
 9 files changed, 25 insertions(+), 38 deletions(-)

New commits:
commit a076dea3f52f426bf55c531b2d0700bb2b6d6068
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    fix #11098

commit 3e195384cb424fe3ec9142a18428e9ee7582c033
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    libpathan: fix #11070

commit c9f90282ec582aca22b3b03808f4fb89242489af
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    zhcon: update fixes #11064

diff --git a/cluster/parmetis/DETAILS b/cluster/parmetis/DETAILS
index c180f38..7290ed2 100755
--- a/cluster/parmetis/DETAILS
+++ b/cluster/parmetis/DETAILS
@@ -3,7 +3,7 @@
           SOURCE=ParMetis-$VERSION.tar.gz
      SOURCE_HASH=sha512:115723741f810c404511b4e15f71f8ebf013cb541b793f95ad93f2a57a773f48177495e1d70cc25a45b566a14909d766f3c256e953daf3e3e9acd3e2b436f303
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/ParMetis-$VERSION
-   SOURCE_URL[0]=http://www-users.cs.umn.edu/~karypis/metis/$SPELL/files/$SOURCE
+   SOURCE_URL[0]=http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/$SOURCE
       LICENSE[0]=UNKNOWN
         WEB_SITE=http://www-users.cs.umn.edu/~karypis/metis/parmetis
         KEYWORDS="graph cluster"
diff --git a/cluster/parmetis/HISTORY b/cluster/parmetis/HISTORY
index ccf9507..a75a2e0 100644
--- a/cluster/parmetis/HISTORY
+++ b/cluster/parmetis/HISTORY
@@ -1,3 +1,6 @@
+2007-01-29 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DETAILS: fixed source url #11098
+
 2006-06-29 Eric Sandall <eric at sandall.us>
 	* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
 	  Changed LICENSE to LICENSE[0]
diff --git a/libs/libpathan/DETAILS b/libs/libpathan/DETAILS
index dc9c122..dd26e77 100755
--- a/libs/libpathan/DETAILS
+++ b/libs/libpathan/DETAILS
@@ -1,9 +1,9 @@
            SPELL=libpathan
-         VERSION=1.2-1
+         VERSION=1.2-2
           SOURCE=$SPELL-$VERSION-src.tar.gz
-     SOURCE_HASH=sha512:6ada4251c2d80a6146afd05ef211ad063350859843578f6265be72dbac972ad27bff4d0c5373d1e4f90f0ae0f5f37b67405beaa2b3dedefa2aa5f46b800f7041
+     SOURCE_HASH=sha512:7dbeb5ee2d6756198bacd05822366762e20738bd59edc195a8e59f26c2b27acddd42abeb6e0b7f6511b3894834015891d8c0dd061bc896c0177647a645debd50
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
-   SOURCE_URL[0]=http://software.decisionsoft.com/software/pathan-${VERSION%-*}/$SOURCE
+   SOURCE_URL[0]=http://software.decisionsoft.com/software/pathan-${VERSION%-*}r2/$SOURCE
         WEB_SITE=http://software.decisionsoft.com/pathanIntro.html
          ENTERED=20030718
       LICENSE[0]=http://software.decisionsoft.com/pathanLicence.html
diff --git a/libs/libpathan/HISTORY b/libs/libpathan/HISTORY
index 49702e8..b70050f 100644
--- a/libs/libpathan/HISTORY
+++ b/libs/libpathan/HISTORY
@@ -1,3 +1,6 @@
+2007-01-29 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* DETAILS: updated spell to 1.2-2; fixes #11070
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/shell-term-fm/zhcon/BUILD b/shell-term-fm/zhcon/BUILD
index 4d06e0a..a8a045b 100755
--- a/shell-term-fm/zhcon/BUILD
+++ b/shell-term-fm/zhcon/BUILD
@@ -1,5 +1,2 @@
-  patch  -p0  <  ${SCRIPT_DIRECTORY}/zhcon-smglcompat.patch  &&
-  patch  -p0  <  ${SCRIPT_DIRECTORY}/gcc-3.3.patch           &&
-
-  ./configure  --prefix=/usr  &&
-  make
+patch -p0 < $SCRIPT_DIRECTORY/zhcon-smglcompat.patch &&
+default_build
diff --git a/shell-term-fm/zhcon/DETAILS b/shell-term-fm/zhcon/DETAILS
index 5e78f91..5f4275c 100755
--- a/shell-term-fm/zhcon/DETAILS
+++ b/shell-term-fm/zhcon/DETAILS
@@ -1,13 +1,12 @@
            SPELL=zhcon
-         VERSION=0.2.3
+         VERSION=0.2.5
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-        WEB_SITE=http://zhcon.gnuchina.org/
-     SOURCE_HASH=sha512:9c2fd6a5947167ee8de378db326328cea47ceb89aecc1ec370ca8fc224538540e72ea7007646ae1f1fd0a015f665996b3981c621564b256299fb5808811ad709
+        WEB_SITE=http://zhcon.sourceforge.net/
+     SOURCE_HASH=sha512:35f1517b649e5afe3156eb1aa7735f3d3a988fad08c433b8f343df6ba3fdef89493afe61488a76059e4bfa1db4455d21d0bde7041bab37eb50e5ab0b622218fa
       LICENSE[0]=GPL
          ENTERED=20021012
-         UPDATED=20030506
         KEYWORDS="console"
            SHORT="A fast CJK frambuffer console"
 cat << EOF
diff --git a/shell-term-fm/zhcon/HISTORY b/shell-term-fm/zhcon/HISTORY
index d8bc6c7..c22e750 100644
--- a/shell-term-fm/zhcon/HISTORY
+++ b/shell-term-fm/zhcon/HISTORY
@@ -1,3 +1,10 @@
+2007-01-29 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* zhcon-smglcompat.patch: updated
+	* gcc3*.patch: removed
+	* BUILD: removed patch; use default_build
+	* DETAILS: updated spell to 0.2.5, fixes #11064
+	  fixed WEB_SITE
+
 2006-06-28 Eric Sandall <eric at sandall.us>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/shell-term-fm/zhcon/gcc-3.3.patch b/shell-term-fm/zhcon/gcc-3.3.patch
deleted file mode 100644
index 1f67352..0000000
--- a/shell-term-fm/zhcon/gcc-3.3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -uprN src.old/inputclient.h src/inputclient.h
---- src.old/inputclient.h	2003-09-20 21:41:59.219052200 -0700
-+++ src/inputclient.h	2003-09-20 21:42:09.611472312 -0700
-@@ -19,6 +19,7 @@
- #ifndef INPUTCLIENT_H
- #define INPUTCLIENT_H
- 
-+#include <assert.h>
- #include <string>
- #include "console.h"
- 
-diff -uprN src.old/mouse.cpp src/mouse.cpp
---- src.old/mouse.cpp	2003-09-20 21:41:59.220052048 -0700
-+++ src/mouse.cpp	2003-09-20 21:42:18.347144288 -0700
-@@ -19,6 +19,7 @@
- #include "debug.h"
- #include "mouse.h"
- #include <sys/signal.h>
-+#include <assert.h>
- 
- #if defined(__FreeBSD__)
- Mouse* Mouse::pMouse = NULL;
diff --git a/shell-term-fm/zhcon/zhcon-smglcompat.patch b/shell-term-fm/zhcon/zhcon-smglcompat.patch
index 06e867d..6268d56 100644
--- a/shell-term-fm/zhcon/zhcon-smglcompat.patch
+++ b/shell-term-fm/zhcon/zhcon-smglcompat.patch
@@ -8,6 +8,6 @@ diff -Naur /tmp/zhcon-0.2.1/src/zhcon.cp
 -        strncmp("/dev/vc/", TtyName, 8) == 0)) {
 +        strncmp("/dev/vc/", TtyName, 8) == 0||
 +        strncmp("/devices/vc/", TtyName, 12) == 0)) {
-         printf("%s is not real tty or vc. Please exit current tty and try again.\r\n", TtyName);
-         exit(1);
-     }
+         fprintf(stderr, "warning!!!\n");
+         fprintf(stderr, "%s is not real tty or vc, are your running under X-Window?\n", TtyName);
+     #ifndef HAVE_GGI_LIB



More information about the SM-Commit mailing list