diff --git a/ftp/amule/DETAILS b/ftp/amule/DETAILS
index 042bfc3..98f4575 100755
--- a/ftp/amule/DETAILS
+++ b/ftp/amule/DETAILS
@@ -1,15 +1,16 @@
SPELL=amule
- VERSION=2.2.5
+ VERSION=2.2.6
SOURCE=aMule-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/aMule-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/amule/$SOURCE
LICENSE[0]=GPL
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-
SOURCE_HASH=sha512:18509992177d805e468ee1be568a79464989862974ad800ad88927f54f140cb966c8c2254f3acf0c0cc3c55e320cd7c1d839a990ad96219885af7b34adcecd1b
+
SOURCE_HASH=sha512:a85f65f218c6c1702d7854219ef248bdc1b5f46affc2ee77a5767080a9914f4e9ca2b449c7461c5287b83b8db4fe60351fc52c376d70ac41b8453806cff53988
WEB_SITE=http://amule.sourceforge.net/
ENTERED=20031213
KEYWORDS="ftp"
SHORT="GPL-2 licensed eMule-client for Linux"
cat << EOF
-aMule is a multi-platform clone of the popular eMule client for the eDonkey
filesharing network. aMule is a fork of xMule.
+aMule is a multi-platform clone of the popular eMule client for the eDonkey
+filesharing network. aMule is a fork of xMule.
EOF
diff --git a/ftp/amule/HISTORY b/ftp/amule/HISTORY
index 596e877..8f0e545 100644
--- a/ftp/amule/HISTORY
+++ b/ftp/amule/HISTORY
@@ -1,3 +1,7 @@
+2010-03-24 Peng Chang (Charles) <chp AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.6
+ fixed long description wrap
+
2009-05-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.2.5
diff --git a/gnome2-apps/glade3/DEPENDS b/gnome2-apps/glade3/DEPENDS
index bb1c92b..ee756e5 100755
--- a/gnome2-apps/glade3/DEPENDS
+++ b/gnome2-apps/glade3/DEPENDS
@@ -4,4 +4,8 @@ depends gtk+2 &&
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "Use gtk-doc to build documentation?"
+ "Use gtk-doc to build documentation?" &&
+
+optional_depends rarian \
+ '' '--disable-scrollkeeper' \
+ 'Register docs with rarian?'
diff --git a/gnome2-apps/glade3/HISTORY b/gnome2-apps/glade3/HISTORY
index c7fc59b..f687ce0 100644
--- a/gnome2-apps/glade3/HISTORY
+++ b/gnome2-apps/glade3/HISTORY
@@ -1,3 +1,6 @@
+2010-04-07 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: made rarian optional
+
2009-06-30 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.6.7
diff --git a/gnu/gcc33/BUILD b/gnu/gcc33/BUILD
index 6785c23..44de4a4 100755
--- a/gnu/gcc33/BUILD
+++ b/gnu/gcc33/BUILD
@@ -4,6 +4,7 @@ sedit 's:#!/bin/sh:#!/bin/bash:'
$SOURCE_DIRECTORY/configure &&
# GCC 3.3 doesn't know arch=pentium4m, replace with pentium4,
# same for pentium3m
# Doesn't know core2, replace with nocona, nor does it no -mssse3, remove it
+# Doesn't know native -march nor -mtune (GCC 4.2+)
# See http://gcc.gnu.org/onlinedocs/gcc-3.3.6/gcc/i386-and-x86_002d64-Options.html
CFLAGS=${CFLAGS/pentium4m/pentium4} &&
CXXFLAGS=${CXXFLAGS/pentium4m/pentium4} &&
@@ -14,6 +15,24 @@ CXXFLAGS=${CFLAGS/core2/nocona} &&
CFLAGS=${CFLAGS/-mssse3/} &&
CXXFLAGS=${CXXFLAGS/-mssse3/} &&
+echo ARCHITECTURE = $ARCHITECTURE > /tmp/gcc33.opt &&
+echo CFLAGS = $CFLAGS >> /tmp/gcc33.opt &&
+echo CXXFLAGS = $CXXFLAGS >> /tmp/gcc33.opt &&
+
+case $ARCHITECTURE in
+ native-x86_64-64)
+ CFLAGS=${CFLAGS/-march=native -mtune=native/-march=x86-64 -fPIC -DPIC}
&&
+ CXXFLAGS=${CXXFLAGS/-march=native -mtune=native/-march=x86-64 -fPIC
-DPIC}
+ ;;
+ cative-x86_64-32)
+ CFLAGS=${CFLAGS/-march=native -mtune=native/-march=i486 -m32} &&
+ CXXFLAGS=${CXXFLAGS/-march=native -mtune=native/-march=i486 -m32}
+ ;;
+esac &&
+
+echo CFLAGS = $CFLAGS >> /tmp/gcc33.opt &&
+echo CXXFLAGS = $CXXFLAGS >> /tmp/gcc33.opt &&
+
cd $SOURCE_DIRECTORY.bld &&
$SOURCE_DIRECTORY/configure \
--host=$HOST \
diff --git a/gnu/gcc33/HISTORY b/gnu/gcc33/HISTORY
index c87fa22..5ca5dc3 100644
--- a/gnu/gcc33/HISTORY
+++ b/gnu/gcc33/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Doesn't know native -march nor -mtune (GCC 4.2+)
+
2009-10-03 Eric Sandall <sandalle AT sourcemage.org>
* INSTALL: We should have no lib64 to need linking
diff --git a/gnu/gcc34/BUILD b/gnu/gcc34/BUILD
index b37a065..b4846e0 100755
--- a/gnu/gcc34/BUILD
+++ b/gnu/gcc34/BUILD
@@ -1,10 +1,22 @@
# Doesn't know core2, replace with nocona, nor does it no -mssse3, remove it
+# Doesn't know native -march nor -mtune (GCC 4.2+)
# See http://gcc.gnu.org/onlinedocs/gcc-3.4.6/gcc/i386-and-x86_002d64-Options.html
CFLAGS=${CFLAGS/core2/nocona} &&
CXXFLAGS=${CFLAGS/core2/nocona} &&
CFLAGS=${CFLAGS/-mssse3/} &&
CXXFLAGS=${CXXFLAGS/-mssse3/} &&
+case $ARCHITECTURE in
+ native-x86_64-64)
+ CFLAGS=${CFLAGS/-march=native -mtune=native/-march=x86-64 -fPIC -DPIC}
&&
+ CXXFLAGS=${CXXFLAGS/-march=native -mtune=native/-march=x86-64 -fPIC
-DPIC}
+ ;;
+ cative-x86_64-32)
+ CFLAGS=${CFLAGS/-march=native -mtune=native/-march=i486 -m32} &&
+ CXXFLAGS=${CXXFLAGS/-march=native -mtune=native/-march=i486 -m32}
+ ;;
+esac &&
+
cd $SOURCE_DIRECTORY.bld &&
$SOURCE_DIRECTORY/configure \
--host=$HOST \
diff --git a/gnu/gcc34/HISTORY b/gnu/gcc34/HISTORY
index 20d876a..6fc46a4 100644
--- a/gnu/gcc34/HISTORY
+++ b/gnu/gcc34/HISTORY
@@ -1,3 +1,6 @@
+2010-04-06 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Doesn't know native -march nor -mtune (GCC 4.2+)
+
2009-05-30 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Use profiledbootstrap to generate a more optimized compiler
This uses more diskspace, but unlike 4.x we have no
diff --git a/graphics-libs/cegui/CEGUI-0.6.2.tar.gz.sig
b/graphics-libs/cegui/CEGUI-0.6.2.tar.gz.sig
deleted file mode 100644
index a108ffe..0000000
Binary files a/graphics-libs/cegui/CEGUI-0.6.2.tar.gz.sig and /dev/null differ
diff --git a/graphics-libs/cegui/DETAILS b/graphics-libs/cegui/DETAILS
index 5896fcb..1d6545b 100755
--- a/graphics-libs/cegui/DETAILS
+++ b/graphics-libs/cegui/DETAILS
@@ -1,11 +1,11 @@
SPELL=cegui
PKG=CEGUI
- VERSION=0.6.2
+ VERSION=0.7.1
SOURCE=${PKG}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG}-${VERSION/b}
SOURCE_URL[0]=$SOURCEFORGE_URL/crayzedsgui/$SOURCE
#
SOURCE_HASH=sha512:7edfe35518d464226fbdf862d800af41de01fa2bf584a97f572415cf0ada2c2c8c1fca57c80c6bbae8662451fb20e3b9baaff95f0de8ba4d92a63ba2a98085c9
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:54a2c0b6773d6923c82ac418fe93198c86af140ae50fbb6eb9416318c256ad568124c7f73507a4aaef88534d452e65a642c6d664ed485d163bf27fb708fe3b5a
LICENSE[0]=LGPL
WEB_SITE=http://www.cegui.org.uk/
KEYWORDS="graphics libs"
diff --git a/graphics-libs/cegui/HISTORY b/graphics-libs/cegui/HISTORY
index 136794d..4af03c2 100644
--- a/graphics-libs/cegui/HISTORY
+++ b/graphics-libs/cegui/HISTORY
@@ -1,3 +1,7 @@
+2010-04-07 Peng Chang (Charles) <chp AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.1
+ * PRE_BUILD: removed because no longer necessary
+
2009-03-19 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.6.2
* PRE_BUILD: Run `libtoolize -f` and add '-f' to autoreconf to fix
diff --git a/graphics-libs/cegui/PRE_BUILD b/graphics-libs/cegui/PRE_BUILD
deleted file mode 100755
index 1942258..0000000
--- a/graphics-libs/cegui/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit 's: lua < 5.1::' acinclude.m4 &&
-touch INSTALL NEWS &&
-libtoolize -f &&
-autoreconf -f
diff --git a/graphics-libs/ogre/BUILD b/graphics-libs/ogre/BUILD
index 3e1ee83..e013b8d 100755
--- a/graphics-libs/ogre/BUILD
+++ b/graphics-libs/ogre/BUILD
@@ -1,6 +1 @@
-if is_depends_enabled $SPELL devil; then
- OPTS="--disable-freeimage $OPTS"
-fi &&
-
-OPTS="$OGRE_DOUBLE $OPTS" &&
-default_build
+cmake_build
diff --git a/graphics-libs/ogre/DETAILS b/graphics-libs/ogre/DETAILS
index 6cfb3d4..cd83286 100755
--- a/graphics-libs/ogre/DETAILS
+++ b/graphics-libs/ogre/DETAILS
@@ -1,15 +1,20 @@
SPELL=ogre
- VERSION=1-6-2
- SOURCE=$SPELL-v$VERSION.tar.bz2
+ VERSION=1-7-0
+ SOURCE=$SPELL-v${VERSION}p1.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ogre
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
#
SOURCE_HASH=sha512:14b5cd7979d45f554b1718e76cefe17883bdc709afba6fd332ae763532b264a2cc760e9e7c149b529a90e7652423000222ffaf3cf05fea4d4203ab2da200f65f
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:9d7870bb1721bb9570dcde21099f83239d30eeaa620ebd46690175477531557b3f0c8ec827a9eb9a3ad2bfa35d6c459a1f737e1780d9589892d47b17b1bbaa1a
LICENSE[0]=LGPL
WEB_SITE=http://www.ogre3d.org/
KEYWORDS="graphics libs"
ENTERED=20031008
SHORT="Object-Oriented Graphics Rendering Engine"
cat << EOF
-OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
flexible 3D engine written in C++ designed to make it easier and more
intuitive for developers to produce games and demos utilising 3D hardware.
The class library abstracts all the details of using the underlying system
libraries like Direct3D and OpenGL and provides an interface based on world
objects and other intuitive classes.
+OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,
flexible
+3D engine written in C++ designed to make it easier and more intuitive
+for developers to produce games and demos utilising 3D hardware. The class
+library abstracts all the details of using the underlying system libraries
+like Direct3D and OpenGL and provides an interface based on world objects
+and other intuitive classes.
EOF
diff --git a/graphics-libs/ogre/HISTORY b/graphics-libs/ogre/HISTORY
index 1732f08..5ae7c44 100644
--- a/graphics-libs/ogre/HISTORY
+++ b/graphics-libs/ogre/HISTORY
@@ -1,3 +1,8 @@
+2010-04-07 Peng Chang (Charles) <chp AT sourcemage.org>
+ * DETAILS: updated spell to 1-7-0
+ fixed long description wrap
+ fixed WEB_SITE
+
2009-04-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1-6-2
SOURCE no longer includes linux_osx-
diff --git a/graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig
b/graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig
deleted file mode 100644
index b2d9e09..0000000
Binary files a/graphics-libs/ogre/ogre-v1-6-2.tar.bz2.sig and /dev/null differ
diff --git a/graphics/gscan2pdf/DETAILS b/graphics/gscan2pdf/DETAILS
index b21261d..c71d81d 100755
--- a/graphics/gscan2pdf/DETAILS
+++ b/graphics/gscan2pdf/DETAILS
@@ -1,6 +1,6 @@
SPELL=gscan2pdf
- VERSION=0.9.29
-
SOURCE_HASH=sha512:7deeeba35af8a08986f0f07673504bb54dff2eb61290e2495953a28eff1173aea479a07106a06310913242cd96a40958d47443096baf40eac9dc1fe0d86ddbd6
+ VERSION=0.9.30
+
SOURCE_HASH=sha512:d445c94c8a0c86031da9812b708aaf3dc26f9106f216797a3a8a2a94069f0e7e241210370da67f5f93fb2d59c65ca59b2aea1a2cdb8d704b823ee15a4ad71356
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/graphics/gscan2pdf/HISTORY b/graphics/gscan2pdf/HISTORY
index f1f704c..0611781 100644
--- a/graphics/gscan2pdf/HISTORY
+++ b/graphics/gscan2pdf/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.30
+
2009-06-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.29