[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

Florin Braescu florin at lunar-linux.org
Tue Jul 23 17:55:51 CEST 2013


commit 37e3c292b1edfa3f42bd73caace9fdfea25714d1
Author: Florin Braescu <florin at lunar-linux.org>
Date: Tue, 23 Jul 2013 08:36:07 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/37e3c292b1edfa3f42bd73caace9fdfea25714d1

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  games/paintown/BUILD       | +0/-23    
  games/paintown/DEPENDS     | +4/-2     
  games/paintown/DETAILS     | +4/-4     
  games/paintown/PRE_BUILD   | +4/-0     
  graphics/darktable/DEPENDS | +1/-1     
  graphics/darktable/DETAILS | +3/-3     
  sql/mongodb/BUILD          | +6/-2     
  sql/mongodb/DETAILS        | +5/-5     
  8 files changed, 27 insertions(+), 40 deletions(-)

--- a/games/paintown/BUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-(
-
-  # Fix compilation error:
-  # build/menu/option_lives.cpp:56: error: 'sprintf' was not declared in this scope
-  sedit '/globals.h"/a\#include <stdio.h>' src/menu/option_{lives,npc_buddies,speed}.cpp &&
-  sedit '/lit_bitmap.h"/a\#include <stdio.h>' src/util/bitmap.cpp &&
-  sedit "s:-Wall::" SConstruct &&
-  sedit "s:char \* extension:const char \* extension:" src/game.cpp &&
-
-  # Set data path
-  sedit "s:\"data\":\"$MODULE_PREFIX/share/games/paintown\":" src/util/funcs.cpp &&
-  sedit "s:return 'data':return '$MODULE_PREFIX/share/games/paintown':" SConstruct &&
-  sedit "s:\./data/:$MODULE_PREFIX/share/games/paintown:" src/main-menu.cpp src/menu/menutest.cpp &&
-
-  scons DATA_PATH=$MODULE_PREFIX/share/games &&
-
-  prepare_install &&
-  mkdir -p $MODULE_PREFIX/games $MODULE_PREFIX/share/games/paintown &&
-  install -m755 paintown $MODULE_PREFIX/games/paintown &&
-  gather_docs LICENSE TODO LEGAL README &&
-  cp -ar data/* $MODULE_PREFIX/share/games/paintown/
-
-) > $C_FIFO 2>&1
--- a/games/paintown/DEPENDS
+++ b/games/paintown/DEPENDS
@@ -1,5 +1,7 @@
 depends Python
-depends allegro-4
+depends scons
 depends freetype2
 depends libpng
-depends scons
+depends zlib
+
+depends SDL
--- a/games/paintown/DETAILS
+++ b/games/paintown/DETAILS
@@ -1,11 +1,11 @@
           MODULE=paintown
-         VERSION=3.2
-          SOURCE=$MODULE-$VERSION.tar.gz
+         VERSION=3.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/$MODULE
-      SOURCE_VFY=sha1:ea817c32cf689f97f480161155bf9f5c1fbd9123
+      SOURCE_VFY=sha1:e036b94f4a31d96f6e4f3255225fd8b048eeb80f
         WEB_SITE=http://paintown.sourceforge.net/
          ENTERED=20090725
-         UPDATED=20090725
+         UPDATED=20130719
            SHORT="Side-scrolling beat-em-up in the style of Beats of Rage"
 
 cat << EOF
--- /dev/null
+++ b/games/paintown/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+
+# don't ask for non-default install locations
+sedit "/read/ d" install.sh
--- a/graphics/darktable/DEPENDS
+++ b/graphics/darktable/DEPENDS
@@ -12,5 +12,5 @@ optional_depends "colord-gtk"       "-DCOLORD=ON"             "-DCOLORD=OFF"
 optional_depends "json-glib"        "-DUSE_GLIBJSON=ON"       "-DUSE_GLIBJSON=OFF"       "For lib JavaScript Object Notation support"
 optional_depends "flickcurl"        "-DUSE_FLICKR=ON"         "-DUSE_FLICKR=OFF"         "For Flickr API support"
 optional_depends "openjpeg"         "-DUSE_OPENJPEG=ON"       "-DUSE_OPENJPEG=OFF"       "For openjpeg graphics support"
-optional_depends "libgphoto"        "-DUSE_CAMERA_SUPPORT=ON" "-DUSE_CAMERA_SUPPORT=OFF" "For Camera support"
+optional_depends "libgphoto2"       "-DUSE_CAMERA_SUPPORT=ON" "-DUSE_CAMERA_SUPPORT=OFF" "For Camera support"
 optional_depends "libgnome-keyring" "-DUSE_GNOME_KEYRING=ON"  "-DUSE_GNOME_KEYRING=OFF"  "For gnome keyring support"
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,12 +1,12 @@
           MODULE=darktable
-         VERSION=1.2.1
+         VERSION=1.2.2
           SOURCE=${MODULE}-${VERSION}.tar.xz
       SOURCE_URL=$SFORGE_URL/darktable/darktable/${VERSION%.*}
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-      SOURCE_VFY=sha1:7742ec241296de67c822882ae03517f6be590b95
+      SOURCE_VFY=sha1:03a5bf367163535b1d471744641c4b6be28146fe
         WEB_SITE=http://www.darktable.org
          ENTERED=20111109
-         UPDATED=20130529
+         UPDATED=20130722
            SHORT="An image darkroom"
 
 cat << EOF
--- a/sql/mongodb/BUILD
+++ b/sql/mongodb/BUILD
@@ -1,4 +1,4 @@
-OPTS+=" --use-system-boost --use-system-pcre" &&
+OPTS+=" --release --use-system-boost --use-system-pcre --sharedclient" &&
 
 # Honor CXXFLAGS and remove -ggdb
 patch_it $SOURCE3 1 &&
@@ -31,4 +31,8 @@ fi &&
 
 for i in /var/{lib,log}/mongodb; do
   install -d $i -o mongodb -g mongodb -m 770
-done
+done &&
+
+# we don't want static libs to be around
+# especially not if they are 5.4M in size
+rm /usr/lib/libmongoclient.a
--- a/sql/mongodb/DETAILS
+++ b/sql/mongodb/DETAILS
@@ -1,21 +1,21 @@
           MODULE=mongodb
-         VERSION=2.4.4
+         VERSION=2.4.5
           SOURCE=$MODULE-src-r$VERSION.tar.gz
          SOURCE2=mongodb.conf-0.3
-         SOURCE3=mongodb-2.2-r1-fix-scons.patch
+         SOURCE3=mongodb-2.4.5-fix-scons.patch
          SOURCE4=mongodb-2.4.2-use-system-path.patch
       SOURCE_URL=http://downloads.mongodb.org/src
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
      SOURCE4_URL=$PATCH_URL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-src-r$VERSION
-      SOURCE_VFY=sha256:ea3db3e730290d030853f7a22cbbc5edfbe33dd538ec67d551a7e88f6d4db240
+      SOURCE_VFY=sha256:b576cbc2c813144b8a8774a7232b78bd0b005e2e6fa7428e7fa1e426c7a28705
      SOURCE2_VFY=sha256:29e47681c4a9325a8288e3f5c3591138f08bce36178c21a0a4b41bf4b05922dc
-     SOURCE3_VFY=sha256:fe19ffdd046abeb375978dd3ebcb21b3a605206ef9f8dea2bb7620327cc6f7db
+     SOURCE3_VFY=sha256:166eaad8412c0479c0800ffecb15fbdd536caadb1b199d0e91555eb3d80d6af5
      SOURCE4_VFY=sha256:8907e4be5546ec7ea0146989d4d64d115b66a893adb7f1015ceba67e297c7dd0
         WEB_SITE=http://www.mongodb.org/
          ENTERED=20101205
-         UPDATED=20130608
+         UPDATED=20130719
            SHORT="A scalable, high-performance, key-value store, document-oriented database"
 cat << EOF
 MongoDB bridges the gap between key-value stores (which are fast and




More information about the Lunar-commits mailing list