Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/dosbox/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/fbgrab/PKGBUILD
	community/fbv/PKGBUILD
	community/flam3/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gdk-pixbuf/PKGBUILD
	community/ghemical/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/gnustep-base/PKGBUILD
	community/guvcview/PKGBUILD
	community/keepassx/PKGBUILD
	community/kvpnc/PKGBUILD
	community/libghemical/PKGBUILD
	community/liboglappth/PKGBUILD
	community/png2ico/PKGBUILD
	community/shapelib/PKGBUILD
	community/sloccount/PKGBUILD
	community/tmw/PKGBUILD
	community/xmoto/PKGBUILD
	core/links/PKGBUILD
	extra/amule/PKGBUILD
	extra/cairomm/PKGBUILD
	extra/calligra/PKGBUILD
	extra/evas/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gd/PKGBUILD
	extra/gif2png/PKGBUILD
	extra/glhack/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/imlib/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/lbreakout2/PKGBUILD
	extra/libgdiplus/PKGBUILD
	extra/libkate/PKGBUILD
	extra/libpano13/PKGBUILD
	extra/libwebp/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxslt/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/ntp/PKGBUILD
	extra/nx/PKGBUILD
	extra/openjpeg/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/sdl_image/PKGBUILD
	extra/vice/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wv/PKGBUILD
	extra/wxgtk/PKGBUILD
	extra/xaos/PKGBUILD
	extra/xsane/PKGBUILD
	extra/zvbi/PKGBUILD

1 files changed, 15 insertions, 17 deletions

diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD
index 4a5bfa66d..cd822c75c 100644
--- a/community/puzzles/PKGBUILD
+++ b/community/puzzles/PKGBUILD
@@ -3,39 +3,37 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=puzzles
-pkgver=9835
+pkgver=9838
 pkgrel=1
 pkgdesc="Simon Tatham's Portable Puzzle Collection"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 license=('MIT')
-makedepends=('pkgconfig')
+makedepends=('pkgconfig' 'subversion')
 depends=('gtk2')
-source=("http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz")
+source=("svn://svn.tartarus.org/sgt/puzzles#revision=$pkgver")
+md5sums=("SKIP")
 
 build() {
-	cd ${srcdir}/${pkgname}-r${pkgver}
+    cd ${srcdir}/${pkgname}
 
     ./mkfiles.pl
     
-	sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile
+    sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile
 
-    export CFLAGS="$CFLAGS -lm"
-	make prefix=/usr
+    make prefix=/usr
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-r${pkgver}
+    cd ${srcdir}/${pkgname}
 
-	install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
-	install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/
+    install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}}
+    install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/
 
-	make prefix=/usr DESTDIR=${pkgdir} install
+    make prefix=/usr DESTDIR=${pkgdir} install
 
-	#fix FS#14600
-	mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net
-	mv ${pkgdir}/usr/bin/cube ${pkgdir}/usr/bin/puzzles-cube
-	mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox
+    #fix FS#14600
+    mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net
+    mv ${pkgdir}/usr/bin/cube ${pkgdir}/usr/bin/puzzles-cube
+    mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox
 }
-
-md5sums=('0db6e36f2ac04490f38ace15aabab555')