Sat Feb 23 00:05:17 PST 2013

9 files changed, 45 insertions, 102 deletions

diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD
index 817429c57..3d9a9d58e 100644
--- a/community/freeimage/PKGBUILD
+++ b/community/freeimage/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: scippio <scippio@berounet.cz>
 
 pkgname=freeimage
-pkgver=3.15.3
-pkgrel=2
+pkgver=3.15.4
+pkgrel=1
 pkgdesc="Library project for developers who would like to support popular graphics image formats"
 arch=('i686' 'x86_64')
 license=('GPL' 'custom:FIPL')
@@ -14,7 +14,7 @@ url="http://freeimage.sourceforge.net/"
 depends=('gcc-libs')
 makedepends=('dos2unix')
 source=("http://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip")
-md5sums=('6c305b4086500ff8541c596ea6fc7cd7')
+md5sums=('9f9a3b2c3c1b4fd24fe479e8aaee86b1')
 
 build() {
   cp -r FreeImage FreeImagefip
@@ -23,15 +23,17 @@ build() {
   export CXXFLAGS="$CXXFLAGS -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS"
 
   cd FreeImage
+  sed -i "1 i #include <cstring>" Source/OpenEXR/IlmImf/ImfAutoArray.h
   make
 
   cd ${srcdir}/FreeImagefip
+  sed -i "1 i #include <cstring>" Source/OpenEXR/IlmImf/ImfAutoArray.h
   make -f Makefile.fip 
 }
 
 package() {
   cd FreeImage
-  make DESTDIR=${pkgdir} install || true
+  make DESTDIR=${pkgdir} install
 
   cd ${srcdir}/FreeImagefip
   make -f Makefile.fip DESTDIR=${pkgdir} install
diff --git a/community/meteorjs/PKGBUILD b/community/meteorjs/PKGBUILD
index b514b39f3..b64b79f01 100644
--- a/community/meteorjs/PKGBUILD
+++ b/community/meteorjs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83547 2013-02-02 18:38:31Z mtorromeo $
+# $Id: PKGBUILD 84695 2013-02-22 11:25:02Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Parth Buch <parthbuch115 at gmail dot com>
 # Contributor: Tom Vincent <http://tlvince.com/contact/>
 
 pkgname=meteorjs
-pkgver=0.5.4
+pkgver=0.5.7
 pkgrel=1
 pkgdesc="Open-source platform for building top-quality web apps in a fraction of the time."
 arch=('i686' 'x86_64')
@@ -13,14 +13,14 @@ license=('MIT')
 depends=('nodejs' 'mongodb')
 options=('!strip')
 
-sha256sums=('64dbdfd1788e3859f54bbe36e99ca60574e625c68d41b9bfc9384b253b345798'
+sha256sums=('dea74135489b89d7a7fdebb3966a05b2df41440bbdc31adce85e6b140aff8e23'
             'a3ac659c52b652676da0530f2148025e0f8bfa84bccf63431c20eb72d3bc5cb7')
 
-if [ "$CARCH" == x86_64 ]; then
+if [ "$CARCH" = "x86_64" ]; then
     _arch="amd64"
 else
     _arch="i386"
-    sha256sums[0]='7a3c1eaa8588876ed8bec6bab20b0be99f7e36fce839b3d70b776018ca606f89'
+    sha256sums[0]='2a126beb5224e4063c8efc849e099d7bf302f062e76356f8f7662737bccd41b6'
 fi
 
 source=("http://d3sqy0vbqsdhku.cloudfront.net/meteor_$pkgver-1_$_arch.deb" meteor)
@@ -33,7 +33,9 @@ package() {
 
     cd "$pkgdir/usr/lib/meteor"
     rm -rf LICENSE.txt lib/node lib/dtrace lib/node_modules/npm share include \
-           lib/node_modules/mongodb/node_modules/bson/build/Release/obj.target/bson.node
+           lib/node_modules/mongodb/node_modules/bson/build/Release/obj.target/bson.node \
+           lib/node_modules/websocket/build/Release/obj.target/xor.node \
+           lib/node_modules/websocket/build/Release/obj.target/validation.node
 
     # mongodb links
     rm -rf mongodb
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index c14a5200d..137fa40dc 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84198 2013-02-13 14:43:00Z bpiotrowski $
+# $Id: PKGBUILD 84707 2013-02-22 20:47:11Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
@@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx
 
 pkgname=nginx
 pkgver=1.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl' 'geoip')
@@ -27,13 +27,11 @@ backup=(${_cfgdir:1}/fastcgi.conf
 		${_cfgdir:1}/win-utf
 		etc/logrotate.d/nginx)
 source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-		rc.d
 		service
-		nginx.logrotate)
+		logrotate)
 sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3'
-            '4f6bd31d684956ca143f7dc68dbd3caa67e835fb84dc44d1a94217b9214c6cfd'
             '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
-            '613b0ed3fe4b5ee505ddb5122ee41604f464a5049be81c97601ee93970763a23')
+            'b0ef6c00e0e94926588242ed910b387922e513d5152fcdb651dc06e2b84e7d85')
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -80,9 +78,6 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 
-	install -d "$pkgdir"/etc/logrotate.d
-	install -m644 "$srcdir"/nginx.logrotate "$pkgdir"/etc/logrotate.d/nginx
-
 	sed -e 's|\<user\s\+\w\+;|user html;|g' \
 		-e '44s|html|/usr/share/nginx/html|' \
 		-e '54s|html|/usr/share/nginx/html|' \
@@ -94,9 +89,9 @@ package() {
 
 	install -d "$pkgdir"/usr/share/nginx
 	mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
-
-	install -D -m755 "$srcdir"/rc.d "$pkgdir"/etc/rc.d/nginx
+	
+	install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx
 	install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service
-	install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE
+	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE
 	rm -rf "$pkgdir"/var/run
 }
diff --git a/community/nginx/nginx.logrotate b/community/nginx/logrotate
index d490d5d9b..8773578b5 100644
--- a/community/nginx/nginx.logrotate
+++ b/community/nginx/logrotate
@@ -1,5 +1,6 @@
-/var/log/nginx/*.log {
+/var/log/nginx/*log {
 	missingok
+	create 750 root log
 	sharedscripts
 	compress
 	postrotate
diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install
index b31ee41d7..00a7b9cac 100644
--- a/community/nginx/nginx.install
+++ b/community/nginx/nginx.install
@@ -1,4 +1,12 @@
+post_install() {
+    if [[ -e var/log/nginx ]]; then
+        chmod 750 var/log/nginx
+        chown root:log var/log/nginx
+    fi
+}
+
 post_upgrade() {
+    [[ $(vercmp $2 1.2.7-1) -le 0 ]] && post_install
     if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
         echo " >>> Since 1.2.1-2 several changes has been made in package:"
         echo "      - *.conf files have been moved to /etc/nginx"
diff --git a/community/nginx/rc.d b/community/nginx/rc.d
deleted file mode 100644
index eb9031e81..000000000
--- a/community/nginx/rc.d
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-function check_config {
-  stat_busy "Checking nginx configuration"
-  /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf
-  if [ $? -ne 0 ]; then
-    stat_die
-  else
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    check_config
-    $0 careless_start
-    ;;
-  careless_start)
-    stat_busy "Starting nginx"
-    if [ -s /var/run/nginx.pid ]; then
-      stat_fail
-      # probably ;)
-      stat_busy "Nginx is already running"
-      stat_die
-     fi
-    /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon nginx
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nginx"
-    PID=$(cat /var/run/nginx.pid)
-    kill -QUIT $PID &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      for i in {1..10}; do
-        [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    check_config
-    $0 stop
-    sleep 1
-    $0 careless_start
-    ;;
-  reload)
-    check_config
-    if [ -s /var/run/nginx.pid ]; then
-      status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid)
-    fi
-    ;;
-  check)
-    check_config
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload|check|careless_start}"
-esac
diff --git a/community/opencollada/PKGBUILD b/community/opencollada/PKGBUILD
index cf2af3acb..3804e7621 100644
--- a/community/opencollada/PKGBUILD
+++ b/community/opencollada/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 83397 2013-01-31 10:18:08Z svenstaro $
+# $Id: PKGBUILD 84701 2013-02-22 15:29:30Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=opencollada
-pkgver=20130130
+pkgver=20130222
 pkgrel=1
 pkgdesc="Stream based reader and writer library for COLLADA files"
 arch=(i686 x86_64)
@@ -9,6 +9,8 @@ url="https://github.com/KhronosGroup/OpenCOLLADA"
 license=('GPL')
 depends=('libxml2' 'pcre')
 makedepends=('git' 'cmake')
+source=('opencollada.conf')
+md5sums=('5f7e9d79ab86756648b648ee5ed6ce1d')
 
 _gitroot=git://github.com/KhronosGroup/OpenCOLLADA.git
 _gitname=opencollada
@@ -33,9 +35,9 @@ build() {
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
+
   cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DUSE_SHARED=ON
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
@@ -43,6 +45,8 @@ package() {
   cd "$srcdir/$_gitname-build/build"
 
   make DESTDIR=$pkgdir install
+
+  install -Dm644 $srcdir/opencollada.conf $pkgdir/etc/ld.so.conf.d/opencollada.conf
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/opencollada/opencollada.conf b/community/opencollada/opencollada.conf
new file mode 100644
index 000000000..cd7c2a5c5
--- /dev/null
+++ b/community/opencollada/opencollada.conf
@@ -0,0 +1 @@
+/usr/lib/opencollada
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 54f8b966f..4fdcb003a 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 83277 2013-01-28 16:50:13Z stephane $
+# $Id: PKGBUILD 84689 2013-02-22 09:36:08Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spring
-pkgver=0.91.0
-_pkgver=91.0
-pkgrel=4
+pkgver=0.92.0
+_pkgver=92.0
+pkgrel=1
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64')
 url="http://springrts.com/"
@@ -18,15 +18,13 @@ optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
 install=spring.install
 source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('8849ace38f2ae20dc100b9d0a8d743e9')
+md5sums=('6dcf665cfe7d6eaf0e287086685c6709')
 
 build() {
   bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
   
   cd spring_${_pkgver}
 
-  sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h
- 
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
 	-DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES