Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/multipath-tools/PKGBUILD
	community/perl-gnome2-wnck/PKGBUILD
	community/znc/PKGBUILD
	core/openldap/PKGBUILD
	extra/mod_perl/PKGBUILD
	extra/perl-digest-nilsimsa/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/vim/PKGBUILD
	extra/xcb-util-keysyms/PKGBUILD
	extra/xcb-util-wm/PKGBUILD
	extra/xournal/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	multilib/lib32-libx11/PKGBUILD
	multilib/lib32-libxft/PKGBUILD
	multilib/lib32-xcb-util/PKGBUILD

4 files changed, 78 insertions, 15 deletions

diff --git a/community/amsn/PKGBUILD b/community/amsn/PKGBUILD
index b98c01658..04f7dacbd 100644
--- a/community/amsn/PKGBUILD
+++ b/community/amsn/PKGBUILD
@@ -1,32 +1,34 @@
-# $Id: PKGBUILD 63498 2012-02-05 11:51:24Z ibiru $
+# $Id: PKGBUILD 71853 2012-06-02 11:00:55Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <j@codemac.net>
 
 pkgname=amsn
-pkgver=0.98.4
-pkgrel=2
+pkgver=0.98.9
+pkgrel=1
 pkgdesc="MSN client written in Tcl/Tk"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://amsn.sourceforge.net/"
 license=('GPL2')
 depends=('tk' 'tls')
-makedepends=('libjpeg' 'libpng' 'farsight2' 'libv4l')
-optdepends=('farsight2: for video conferencing')
+makedepends=('libjpeg' 'libpng' 'farstream' 'libv4l')
+optdepends=('farstream: for video conferencing')
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2 amsn-0.98.4-libpng15.patch amsn-0.98.4-v4l2.patch)
-md5sums=('96fd20e8709ced4443432d125a5e0a5a'
-         '182eef321e78632499c24b3009c085ad'
-         '02d4ec8faed521387d6e44481f43c91a')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver-src.tar.bz2
+        $pkgname-$pkgver-v4l2.patch
+        $pkgname-$pkgver-no-rebuild-on-install.patch)
+sha256sums=('1fd2620489cc3627a841773a79cf28a7c9c438979c76d37f231a773a79e7f23e'
+            '5371339024548fad3b3c5330e3bc410360a383a75d1771fb656885acddfc44cf'
+            'dd560bebcfa672ba0be56b70dbcaa069b0faba7206d9cb8ea5d61fbd50ad81a1')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # patch for libpng15
-  patch -Np0 -i $srcdir/amsn-0.98.4-libpng15.patch
+  cd ${srcdir}/$pkgname-$pkgver
 
   # patch for linux kernel header changes
-  patch -Np0 -i $srcdir/amsn-0.98.4-v4l2.patch
+  patch -Np0 -i ${srcdir}/$pkgname-$pkgver-v4l2.patch
+  # build patch
+  patch -Np0 -i ${srcdir}/$pkgname-$pkgver-no-rebuild-on-install.patch
+
   # python2 fix
   for file in lang/missing.py plugins/music/infosongbird; do
       sed -i 's_/usr/bin/env python_/usr/bin/env python2_' ${file}
@@ -37,7 +39,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/$pkgname-$pkgver
 
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/amsn/amsn-0.98.9-no-rebuild-on-install.patch b/community/amsn/amsn-0.98.9-no-rebuild-on-install.patch
new file mode 100644
index 000000000..d3b6e4c55
--- /dev/null
+++ b/community/amsn/amsn-0.98.9-no-rebuild-on-install.patch
@@ -0,0 +1,14 @@
+--- Makefile.in	2012-05-18 21:28:05.000000000 +0200
++++ Makefile.in	2012-06-02 12:26:35.585073960 +0200
+@@ -261,3 +261,5 @@
+ 
+-install_libs:: rebuild_libs do_install_libs
++install_libs:: clean_libs
++	$(MAKE) rebuild_libs
++	$(MAKE) do_install_libs
+ 
+@@ -278,3 +280,3 @@
+ rebuild_libs: LIBDIR=$(libdir)/$(PACKAGE)
+-rebuild_libs: clean_libs $(LIBS_WITH_RPATH)
++rebuild_libs: $(LIBS_WITH_RPATH)
+ 
diff --git a/community/amsn/amsn-0.98.9-v4l2.patch b/community/amsn/amsn-0.98.9-v4l2.patch
new file mode 100644
index 000000000..b636e61fd
--- /dev/null
+++ b/community/amsn/amsn-0.98.9-v4l2.patch
@@ -0,0 +1,44 @@
+--- configure.ac	2012-05-23 21:21:14.000000000 +0200
++++ configure.ac	2012-06-02 12:29:24.836921683 +0200
+@@ -378,6 +378,10 @@
+ 	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
+ fi
+ 
++if test "$FOUND_OS" = "linux"; then
++    AC_CHECK_HEADERS(linux/videodev2.h)
++fi
++
+ #---------------------------------------------------------------------------------------------
+ 
+ dnl ---------------------------------------------------------------------
+--- utils/linux/capture/capture.h	2011-04-12 02:20:59.000000000 +0200
++++ utils/linux/capture/capture.h	2012-06-02 12:29:24.836921683 +0200
+@@ -34,7 +34,11 @@
+ #ifdef HAVE_SYS_VIDEODEV2_H
+ #   include <sys/videodev2.h>
+ #else
+-#   include <linux/videodev.h>
++	#ifdef HAVE_LINUX_VIDEODEV2_H
++		#include <linux/videodev2.h>
++	#else
++		#include <linux/videodev.h>
++	#endif
+ #endif
+ */
+ 
+--- utils/linux/capture/libng/plugins/Rules.mk	2012-05-18 17:31:32.000000000 +0200
++++ utils/linux/capture/libng/plugins/Rules.mk	2012-06-02 12:51:59.523065502 +0200
+@@ -2,6 +2,13 @@
+ TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so
+ TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS})
+ 
++plugin_link_so         = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@
++ifeq ($(verbose),no)
++  echo_plugin_link_so          = echo "  LDP    " $@
++else
++  echo_plugin_link_so          = echo $(plugin_link_so)
++endif
++  
+ # global targets
+ all:: $(TARGETS-plugins)
+ 
\ No newline at end of file
diff --git a/community/amsn/amsn.changelog b/community/amsn/amsn.changelog
index 8dab097ad..41d497576 100644
--- a/community/amsn/amsn.changelog
+++ b/community/amsn/amsn.changelog
@@ -1,3 +1,6 @@
+2012-06-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* amsn 0.98.9-1
+
 2010-12-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* Update to major release 0.98.4