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

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 7 insertions, 36 deletions

diff --git a/extra/allegro/LICENSE b/extra/allegro/LICENSE
deleted file mode 100644
index 497c56a8f..000000000
--- a/extra/allegro/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-===================================
-============ Copyright ============
-===================================
-
-   Allegro is gift-ware. It was created by a number of people working in 
-   cooperation, and is given to you freely as a gift. You may use, modify, 
-   redistribute, and generally hack it about in any way you like, and you do 
-   not have to give us anything in return. However, if you like this product 
-   you are encouraged to thank us by making a return gift to the Allegro 
-   community. This could be by writing an add-on package, providing a useful 
-   bug report, making an improvement to the library, or perhaps just 
-   releasing the sources of your program so that other people can learn from 
-   them. If you redistribute parts of this code or make a game using it, it 
-   would be nice if you mentioned Allegro somewhere in the credits, but you 
-   are not required to do this. We trust you not to abuse our generosity.
-
-   Disclaimer:
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-   SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-   FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD
index a37609c5e..fa829a121 100644
--- a/extra/allegro/PKGBUILD
+++ b/extra/allegro/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 125663 2011-05-27 21:50:52Z ibiru $
+# $Id: PKGBUILD 140688 2011-10-18 03:46:08Z eric $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
 
 pkgname=allegro
-pkgver=4.4.2
+pkgver=5.0.4
 pkgrel=1
 pkgdesc="Portable library mainly aimed at video game and multimedia programming"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://alleg.sourceforge.net/"
 license=('custom')
-depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng')
-makedepends=('cmake')
-source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz
-        LICENSE)
-md5sums=('4db71b0460fc99926ae91d223199c2e6'
-         'cd97e2992e8e66b9e6a449d832dc9c7a')
+depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg')
+makedepends=('cmake' 'mesa')
+source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz)
+md5sums=('e2e314ee7116c7efddd0497d6c885e46')
 
 build() {
   cd "${srcdir}"
@@ -34,6 +32,5 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }