[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c080c61578a36c05262a323bece86b3c8f6d9828)

Treeve Jelbert scm at sourcemage.org
Sun Aug 3 12:21:39 EDT 2008


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 database/firebird/BUILD            |   67 ++++++++++++++-----------------------
 database/firebird/DEPENDS          |    3 +
 database/firebird/DETAILS          |    8 +++-
 database/firebird/FINAL            |    2 -
 database/firebird/HISTORY          |   17 +++++++++
 database/firebird/INSTALL          |   33 +++++++++++++-----
 database/firebird/PREPARE          |   10 +++--
 database/firebird/PRE_BUILD        |    1 
 database/firebird/configs          |    1 
 database/firebird/fb2.1.patch.bz2  |binary
 database/firebird/fb2.5.patch.bz2  |binary
 database/firebird/init.d/firebird2 |   13 ++++---
 database/firebird/volatiles        |    1 
 graphics-libs/poppler/DEPENDS      |   14 +++++--
 graphics-libs/poppler/HISTORY      |    3 +
 kde4-apps/koffice2/DEPENDS         |    7 ++-
 kde4-apps/koffice2/HISTORY         |    4 ++
 kde4/kdegraphics4/DEPENDS          |    3 +
 kde4/kdegraphics4/HISTORY          |    3 +
 printer/gutenprint/DETAILS         |    7 +++
 printer/gutenprint/HISTORY         |    4 ++
 printer/gutenprint/PREPARE         |    1 
 python-pypi/numpy/DETAILS          |    4 +-
 python-pypi/numpy/HISTORY          |    3 +
 python-pypi/pygame/HISTORY         |    3 +
 python-pypi/pygame/PRE_SUB_DEPENDS |    1 
 python-pypi/pygame/SUB_DEPENDS     |    3 +
 27 files changed, 143 insertions(+), 73 deletions(-)

New commits:
commit c080c61578a36c05262a323bece86b3c8f6d9828
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    firebird - 2.1 + 2.5 + new build process

commit f653e5fa8e77cb7e68af3cd9ba694bbc9f808b25
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pygame - update subdepends stuff

commit a0c1278495b792772a0330fe7bc03218d414222b
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    "numpy-1.1.1"

commit dc4aee085572effdf2331d09e2eb55ef78866ca7
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    gutenprint - add snapshot support

commit 376d85004ba6ab2bd09cc0d6225e7474059a36b3
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    koffice2 - minor changes to depends

commit 0c390c9179d400701dd58023aca2e3e09e69be72
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    poppler - cvs and future versions - depend on openjpeg

commit 2717fef328451afe8f2dac5be774249ccdc3304b
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdegraphics4 - add optional qca2

diff --git a/database/firebird/BUILD b/database/firebird/BUILD
index 0c95b1a..7484807 100755
--- a/database/firebird/BUILD
+++ b/database/firebird/BUILD
@@ -1,8 +1,8 @@
-  local FF FileName DB LCK LL                   &&
+  local FF DB LL                                &&
   persistent_add FB_PREFIX                      &&
   FB_PREFIX=${INSTALL_ROOT}/usr/firebird        &&
   OPTS="${OPTS} ${FB_SS}"                       &&
-if [ $$FB_VER != 2.1 ];then
+if [[ $$FB_VER == 2.0 ]];then
   if spell_ok icu; then
     ICU_FLAGS=`icu-config --ldflags-libsonly`   &&
     LDFLAGS="$LDFLAGS $ICU_FLAGS"
@@ -10,66 +10,51 @@ if [ $$FB_VER != 2.1 ];then
   if spell_ok libedit; then
     LDFLAGS="$LDFLAGS -ledit"
   fi
-fi                                            &&
+fi                                              &&
 # prepare optional language support
   for LL in $FB_GPRE; do
-    if [ $LL != none ]; then
+    if [[ $LL != none ]]; then
       OPTS="${OPTS} --with-gpre-${LL}"
     fi
   done                                          &&
   OPTS="${OPTS} ${FB_STAT}"                     &&
   LDFLAGS="$LDFLAGS -lpthread"                  &&
 
-#strip -O3 from optimisations, gcc-4.2.2 problem
-  CFLAGS="${CFLAGS/-O3/-O2}"                    &&
-  CXXFLAGS="${CXXFLAGS/-O3/-O2}"                &&
-
-  ./configure 				\
-	--prefix=$FB_PREFIX 		\
-	$OPTS					&&
-  make_single                                   &&
-if [ $FB_CLIENT == n ]; then
+  ./configure 				                        \
+	--prefix=$FB_PREFIX 		                     \
+	$OPTS					                           &&
+if [[ $FB_CLIENT == n ]]; then
   make                                          &&
-# prepare an install image
-  cd gen                                        &&
-  ./install/makeInstallImage.sh                 &&
-#
+  cd $SOURCE_DIRECTORY/gen/firebird             &&
 # fix ownership and permissions
-  cd $SOURCE_DIRECTORY/gen/buildroot/$FB_PREFIX &&
   chown -R root:root ./                         &&
   chmod -R uga-w ./                             &&
-
 # Everyone may execute clients
   chmod 0555 bin/*                              &&
 # Shell scripts changing security attributes are for root only
   chmod 0500 bin/*.sh                           &&
 # Security database
-# Nobody besides firebird permitted to even read this file
-  chown firebird:firebird security*.fdb         &&
-  chmod 0600 security*.fdb                      &&
+  FF=security2.fdb                              &&
+  if [[ -e $FB_PREFIX/$FF ]];then
+    mv $FF $FF.new
+  else
+# Nobody except firebird permitted to even read this file
+    chown firebird:firebird $FF                 &&
+    chmod 0600 $FF
+  fi
 # all database should be owned by firebird
-  for DB in `ls examples/empbuild/*.fdb`
-    do
-      chmod ug+w $DB                            &&
-      chown firebird:firebird $DB
-    done
+  cd $SOURCE_DIRECTORY/gen/                     &&
+ for DB in `ls examples/empbuild/*.fdb`
+  do
+    chmod ug+w $DB                              &&
+    chown firebird:firebird $DB
+  done
 else
   cd gen                                        &&
   make includes                                 &&
   make -f Makefile.boot.gpre                    &&
   make -f Makefile.libfbclient                  &&
-  make -f Makefile.client.isql                  &&
+  make -f Makefile.client.isql                  
 # probably need to build gbak and then restore messages and help fdb
-#  make -f Makefile.client.gbak                  &&
-  cd firebird                                   &&
-  FBDEST=../buildroot${FB_PREFIX}/bin              &&
-  mkdir -p $FBDEST                              &&
-  cp -a bin/isql $FBDEST                        &&
-  FBDEST=../buildroot${INSTALL_ROOT}/usr/lib       &&
-  mkdir -p $FBDEST                              &&
-  cp -a lib/* $FBDEST                           &&
-  FBDEST=../buildroot${INSTALL_ROOT}/usr/include   &&
-  mkdir -p $FBDEST                              &&
-  cp -a include/* $FBDEST
-fi                                              &&
-make_normal
+#  make -f Makefile.client.gbak 
+fi
diff --git a/database/firebird/DEPENDS b/database/firebird/DEPENDS
index 57b1342..12f8074 100755
--- a/database/firebird/DEPENDS
+++ b/database/firebird/DEPENDS
@@ -11,7 +11,8 @@ case $FB_VER in
                          "--without-editline"    \
                          "for fancy line editing"
             ;;
-       2.1) depends btyacc &&
+       2.1 | 2.5)
+            depends btyacc &&
             depends icu '--with-system-icu'      &&
             optional_depends libedit             \
                          "-with-system-editline" \
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index f77faea..442d086 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -1,7 +1,11 @@
            SPELL=firebird
 case $FB_VER in 
+   2.5)
+         VERSION=2.5.0.20343-Alpha1
+     SOURCE_HASH=sha512:2a6a0c0094ffb769de5d4818cb2f6278bd10be5a3c132055acc964c227d0247edfcc5aea88d90217d52a29891c79171b657c3185eed08a5ee6c79dfde63d2fea
+;;
    2.1)
-         VERSION=2.1.1.17910-RC1
+         VERSION=2.1.1.17910-0
      SOURCE_HASH=sha512:8730c435eedc02d20d6a0ad194067cb6e5689e5a3f59ae03edd4f2dea92fa4e0ab2089a86a16ce0fcd71fa3ebd398a787038657ff6b1c74a2dee866b08ed7600
 ;;
    *)
@@ -11,7 +15,7 @@ case $FB_VER in
 esac
           SOURCE=${SPELL/f/F}-$VERSION.tar.bz2
    SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
-#   SOURCE_URL[1]=$SOURCEFORGE_URL/firebird/$SOURCE
+   SOURCE_URL[1]=$SOURCEFORGE_URL/firebird/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/RC?/0}
         WEB_SITE=http://www.firebirdsql.org
          LICENSE=IDPL
diff --git a/database/firebird/FINAL b/database/firebird/FINAL
index 782edfc..b9ad338 100755
--- a/database/firebird/FINAL
+++ b/database/firebird/FINAL
@@ -1,4 +1,4 @@
-if [ $FB_CLIENT == n ]; then
+if [[ $FB_CLIENT == n ]]; then
 
 # we do this here, so that things are not tracked, as these files are 
 # constantly modified in normal use
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 656a0e8..37058ac 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,20 @@
+2008-08-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS:  2.1.1.17910-0 (stable)
+	* fb2.1.patch.bz2: updated
+
+2008-07-13 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.5.0.20343-Alpha1 (devel)
+	  revert to dourceforge site
+	* PREPARE, DEPENDS: add option for 2.5
+	* fb2.5.patch.bz2: added
+	* BUILD, INSTALL: move mkInstallImage stuff to INSTALL.
+	  avoids redundant copying of large amounts of data
+	* BUILD: add some extra []
+	  remove stripping of optimisations and make_single
+	* INSTALL: prevent overwriting of security2.fdb
+	* volatiles, configs: add fbintl.conf
+	* init.d/firebird2: run fbserver directly. don't use fbguard
+
 2008-05-31 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.1.1.17910-RC1
 
diff --git a/database/firebird/INSTALL b/database/firebird/INSTALL
index b070251..1c7276e 100755
--- a/database/firebird/INSTALL
+++ b/database/firebird/INSTALL
@@ -1,9 +1,24 @@
-if [ $FB_CLIENT == n ]; then
-cd $SOURCE_DIRECTORY/gen/buildroot/$FB_PREFIX                &&
-# install config files first
-install_config_file firebird.conf $FB_PREFIX/firebird.conf   &&
-install_config_file aliases.conf  $FB_PREFIX/aliases.conf    &&
-rm aliases.conf firebird.conf
-fi                                                           &&
-# install prebuilt tree
-cp -ra $SOURCE_DIRECTORY/gen/buildroot/* $INSTALL_ROOT/
+local FF FBDEST                   &&
+mkdir -p ${FB_PREFIX}/intl        &&
+if [[ $FB_CLIENT == n ]]; then
+# prepare an install image
+  cd $SOURCE_DIRECTORY/gen        &&
+  ./install/makeInstallImage.sh   &&
+# security database
+  FF=firebird/security2.fdb       &&
+  if [[ -e $FF ]];then
+    cp $FF $FB_PREFIX
+  fi
+# config files
+  cd $SOURCE_DIRECTORY/gen/install/misc                         &&
+  install_config_file firebird.conf $FB_PREFIX/firebird.conf    &&
+  install_config_file aliases.conf  $FB_PREFIX/aliases.conf     &&
+  install_config_file fbintl.conf   $FB_PREFIX/intl/fbintl.conf
+else
+  cd $SOURCE_DIRECTORY/gen/firebird    &&
+  for FF in bin include lib;do
+    FBDEST=$FB_PREFIX/$FF              &&
+    mkdir -p $FBDEST                   &&
+    cp -ar $FF/* $FBDEST/$FF
+  done
+fi
diff --git a/database/firebird/PREPARE b/database/firebird/PREPARE
index 7f60047..b610bb6 100755
--- a/database/firebird/PREPARE
+++ b/database/firebird/PREPARE
@@ -7,7 +7,7 @@ cat <<EOF
  After installing firebird, you should change the default password for the SYSDBA user
  by means of the script /usr/firebird/bin/changeDBAPassword.sh
 EOF
-config_query_list FB_VER "which version to build?" 2.0 2.1
+config_query_list FB_VER "which version to build?" 2.1 2.0 2.5
 
 # warn of major changes
 if spell_ok firebird;then
@@ -38,9 +38,11 @@ EOF
         /usr/firebird/upgrade/metadata_charset.txt
 EOF
         ;;
-      1.5)
-        /bin/echo downgrading to version 1.5 is not supported
-        return 1
+      2.5)
+        cat <<EOF
+        Firebird 2.5 includes ODS 11.2 changes. Very experimental!
+        You are recommended to back up you firebird installation and databases
+EOF
         ;;
     esac
     if ! query "do you really want to upgrade firebird?";then
diff --git a/database/firebird/PRE_BUILD b/database/firebird/PRE_BUILD
index 56818ae..f4b4318 100755
--- a/database/firebird/PRE_BUILD
+++ b/database/firebird/PRE_BUILD
@@ -16,7 +16,6 @@
 # fix for gcc4 and smgl issues
 #apply patches
   bzcat ${SPELL_DIRECTORY}/fb${FB_VER}.patch.bz2 | patch -p1 &&
-
 # run autogen
   NOCONFIGURE=1 . ./autogen.sh
 
diff --git a/database/firebird/configs b/database/firebird/configs
index ad636c7..3319596 100644
--- a/database/firebird/configs
+++ b/database/firebird/configs
@@ -1,2 +1,3 @@
 ^/usr/firebird/aliases.conf$
 ^/usr/firebird/firebird.conf$
+^/usr/firebird/intl/fbintl.conf$
diff --git a/database/firebird/fb2.1.patch.bz2 b/database/firebird/fb2.1.patch.bz2
index db906f3..29cd638 100644
Binary files a/database/firebird/fb2.1.patch.bz2 and b/database/firebird/fb2.1.patch.bz2 differ
diff --git a/database/firebird/fb2.5.patch.bz2 b/database/firebird/fb2.5.patch.bz2
new file mode 100644
index 0000000..5bc9a24
Binary files /dev/null and b/database/firebird/fb2.5.patch.bz2 differ
diff --git a/database/firebird/init.d/firebird2 b/database/firebird/init.d/firebird2
index a813d44..96022a8 100755
--- a/database/firebird/init.d/firebird2
+++ b/database/firebird/init.d/firebird2
@@ -6,8 +6,9 @@
 # on system startup and shutdown to start the background
 # Firebird2  database Super server daemon 
 
-
-FB=/usr/firebird/bin/fbmgr.bin
+FB_DIR=/usr/firebird/bin
+FB=fbserver
+#FB=/usr/firebird/bin/fbmgr.bin
 # as of rc2, preferred method of stoppng is to kill the pid
 RUND=/var/run/firebird
 PID=$RUND/`basename $0`.pid
@@ -23,14 +24,18 @@ case $1 in
 		echo "Starting Firebird Super Server"
 		mkdir -p $RUND
 		chown firebird:firebird $RUND
-                su -s "/bin/sh" -m \
-                       -c "$FB -start -forever -pidfile $PID" -l "firebird"
+      $FB_DIR/$FB &
+#  eval `$FB -e $FB_DIR` > $PID
+#                su -s "/bin/sh" -m \
+#                      -c "$FB -start -forever -pidfile $PID" -l "firebird"
 		evaluate_retval
+      pgrep $FB > $PID
 		;;
 	stop)
                 echo "Stopping Firebird server"
 		kill `cat $PID`
 		evaluate_retval
+      rm $PID
                 ;;
 
         restart)
diff --git a/database/firebird/volatiles b/database/firebird/volatiles
index ad636c7..3319596 100644
--- a/database/firebird/volatiles
+++ b/database/firebird/volatiles
@@ -1,2 +1,3 @@
 ^/usr/firebird/aliases.conf$
 ^/usr/firebird/firebird.conf$
+^/usr/firebird/intl/fbintl.conf$
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index f1c93df..066b799 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -1,5 +1,15 @@
 if [[ $POPPLER_CVS == y ]]; then
   depends CVS
+  optional_depends  openjpeg                      \
+                  "--enable-openjpeg"             \
+                  "--disable-openjpeg"            \
+                  "for jpeg2000 support"
+
+else
+  optional_depends  jpeg                         \
+                  "--enable-libjpeg"             \
+                  "--disable-libjpeg"            \
+                  "for jpeg support"
 fi &&
 
 depends  g++           &&
@@ -10,10 +20,6 @@ optional_depends  zlib                           \
                   "--enable-zlib"                \
                   "--disable-zlib"               \
                   "for compressed file support"  &&
-optional_depends  jpeg                           \
-                  "--enable-libjpeg"             \
-                  "--disable-libjpeg"            \
-                  "for jpeg support"             &&
 optional_depends  gtk+2                          \
                   "--enable-poppler-glib"        \
                   "--disable-poppler-glib"       \
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 355da6a..7611e30 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2008-08-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: cvs and future versions - depend on openjpeg
+
 2008-07-29 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.8.5
 
diff --git a/kde4-apps/koffice2/DEPENDS b/kde4-apps/koffice2/DEPENDS
index 38ef2ce..b29c0e4 100755
--- a/kde4-apps/koffice2/DEPENDS
+++ b/kde4-apps/koffice2/DEPENDS
@@ -5,10 +5,11 @@ optional_depends freetype2      '' '' ''                      &&
 optional_depends fontconfig     '' '' ''                      &&
 optional_depends lcms           '' '' 'colour management'     &&
 optional_depends libexif        '' '' 'photo tags'            &&
-optional_depends mysql          '' '' 'kexi database'         &&
-optional_depends postgresql     '' '' 'kexi database'         &&
 optional_depends sqlite         '' '' 'kexi database'         &&
-optional_depends glew           '' '' 'OpenGL shader support' &&
+optional_depends mysql          '' '' 'import MySql to Kexi'         &&
+optional_depends postgresql     '' '' 'import to Postgresql to Kexi' &&
+optional_depends xbase          '' '' 'import dbase to Kexi'         &&
+optional_depends glew           '' '' 'OpenGL shaders in Krita' &&
 optional_depends exiv2          '' '' 'decode photo tags'     &&
 optional_depends poppler        '' '' 'PDF support'           &&
 optional_depends wv2            '' '' 'MS Word import'        &&
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index e8c5f4a..402decc 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,7 @@
+2008-08-08-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: update some descriptions
+	  add optional xbase
+
 2008-07-15 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.9.95.9
 
diff --git a/kde4/kdegraphics4/DEPENDS b/kde4/kdegraphics4/DEPENDS
index 719c2e2..7f8b85f 100755
--- a/kde4/kdegraphics4/DEPENDS
+++ b/kde4/kdegraphics4/DEPENDS
@@ -12,6 +12,9 @@ optional_depends jpeg          '' '' 'okular djvu-plugin'   &&
 optional_depends poppler       '' '' 'okular PDF-plugin'    &&
 optional_depends chmlib        '' '' 'okular CHM plugin'    &&
 optional_depends djvulibre     '' '' 'okular DejaVu plugin' &&
+optional_depends qca2          '-DWITH_QCA2=ON'  \
+                               '-DWITH_QCA2=OFF' \
+                               'import encrypted docs in okular'   &&
 optional_depends qimageblitz   '' '' 'build kolourpoint'    &&
 if check_if_xorg_modular_libs qt4;then
 optional_depends xf86vidmodeproto '' '' 'build kgamma control module'
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index a048a1a..63d921b 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,6 @@
+2008-08-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add optional qca2
+
 2008-07-29 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.1.0
 
diff --git a/printer/gutenprint/DETAILS b/printer/gutenprint/DETAILS
index 6f94fed..f4d1257 100755
--- a/printer/gutenprint/DETAILS
+++ b/printer/gutenprint/DETAILS
@@ -1,8 +1,15 @@
            SPELL=gutenprint
+if [[ $GUT_VER == snapshot ]];then
+         VERSION=20080726
+     SOURCE_HASH=sha512:2ac5d69e41f7ecf951ca00688567bddead2b1ae6d44408ae8fcd5acd5ef5e443c1a1929f0583bbc90d0ce84dad77707516417f5a0e0c257fc69e5fcb7b1fa020
+          SOURCE=$SPELL$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL$VERSION
+else
          VERSION=5.2.0-beta3
      SOURCE_HASH=sha512:df9a451f38f66510547700fb2e4904024689f2f480a0c7a131a2561a41f45d43f35c7f93ddc4bc76c9027ed85b0eab380e0a3baaf5a8d409fa09740721cedc42
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+fi
    SOURCE_URL[0]=$SOURCEFORGE_URL/gimp-print/$SOURCE
         WEB_SITE=http://gutenprint.sourceforge.net/
       LICENSE[0]=GPL
diff --git a/printer/gutenprint/HISTORY b/printer/gutenprint/HISTORY
index 2df881a..2b875c3 100644
--- a/printer/gutenprint/HISTORY
+++ b/printer/gutenprint/HISTORY
@@ -1,3 +1,7 @@
+2008-08-03 Treeve Jelbert <treeve at sourcemage.org>
+	* PREPARE: add support for snapshot versions
+	* DETAILS: version 20080726 (snapshot)
+
 2008-06-16 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 5.2.0-beta3
 
diff --git a/printer/gutenprint/PREPARE b/printer/gutenprint/PREPARE
new file mode 100755
index 0000000..9945d96
--- /dev/null
+++ b/printer/gutenprint/PREPARE
@@ -0,0 +1 @@
+config_query_list GUT_VER 'which version to build?' stable snapshot
diff --git a/python-pypi/numpy/DETAILS b/python-pypi/numpy/DETAILS
index 914f4b9..3fbdc35 100755
--- a/python-pypi/numpy/DETAILS
+++ b/python-pypi/numpy/DETAILS
@@ -1,6 +1,6 @@
            SPELL=numpy
-         VERSION=1.0.4
-     SOURCE_HASH=sha512:97d1631639afa248d5ecdc213264dc150a78a5cd7a7c146b34b221e6d538ea513a653e208dfb454787d2ee713b6fd9e406daef555d08e18493a6ad9904eca5e2
+         VERSION=1.1.1
+     SOURCE_HASH=sha512:c125d6d484521833d856b2e75227a8b608f97e51ca50f490f933f09d1bd3943aa2daae38a6095c0a8f8a02a81b4ffae4fdcb2906003fc5e230deef23283abf8b
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-?}
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/python-pypi/numpy/HISTORY b/python-pypi/numpy/HISTORY
index e4358c2..96a3f55 100644
--- a/python-pypi/numpy/HISTORY
+++ b/python-pypi/numpy/HISTORY
@@ -1,3 +1,6 @@
+2008-08-03 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.1.1
+
 2008-01-13 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: cleaned up
 	* FINAL: corrected a typo
diff --git a/python-pypi/pygame/HISTORY b/python-pypi/pygame/HISTORY
index bba0733..d53ddb1 100644
--- a/python-pypi/pygame/HISTORY
+++ b/python-pypi/pygame/HISTORY
@@ -1,3 +1,6 @@
+2008-08-03 Treeve Jelbert <treeve at sourcmage.org>
+	* PRE_SUB_DEPENDS, SUB_DEPENDS: add numpy
+
 2008-08-01 Alexander Tsamutali <astsmtl at gmail.com>
 	* DETAILS: updated spell to 1.8.1release
 
diff --git a/python-pypi/pygame/PRE_SUB_DEPENDS b/python-pypi/pygame/PRE_SUB_DEPENDS
index 59ca8e9..0f1200a 100755
--- a/python-pypi/pygame/PRE_SUB_DEPENDS
+++ b/python-pypi/pygame/PRE_SUB_DEPENDS
@@ -4,5 +4,6 @@ case $THIS_SUB_DEPENDS in
   MIXER)   is_depends_enabled $SPELL sdl_mixer && return 0;;
   SMPEG)   is_depends_enabled $SPELL smpeg     && return 0;;
   NUMERIC) is_depends_enabled $SPELL numeric   && return 0;;
+  NUMPY)   is_depends_enabled $SPELL numpy     && return 0;;
 esac
 return 1
diff --git a/python-pypi/pygame/SUB_DEPENDS b/python-pypi/pygame/SUB_DEPENDS
index fabfa2c..a012d69 100755
--- a/python-pypi/pygame/SUB_DEPENDS
+++ b/python-pypi/pygame/SUB_DEPENDS
@@ -3,6 +3,7 @@ case "$THIS_SUB_DEPENDS" in
   IMAGE)   depends sdl_image;;
   MIXER)   depends sdl_mixer;;
   SMPEG)   depends smpeg;;
-  NUMERIC) depends numeric NUMERIC;;
+  NUMERIC) depends numeric;;
+  NUMPY)   depends numpy;
   *)       echo "bogus sub_depends: pygame $THIS_SUB_DEPENDS"; return 1;;
 esac



More information about the SM-Commit mailing list