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

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

1 files changed, 16 insertions, 38 deletions

diff --git a/extra/xaw3d/PKGBUILD b/extra/xaw3d/PKGBUILD
index 931513921..c0bce8f80 100644
--- a/extra/xaw3d/PKGBUILD
+++ b/extra/xaw3d/PKGBUILD
@@ -1,51 +1,29 @@
-# $Id: PKGBUILD 124576 2011-05-23 03:13:29Z eric $
+# $Id: PKGBUILD 148656 2012-02-05 11:45:47Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xaw3d
-pkgver=1.5E
-pkgrel=3
+pkgver=1.6
+pkgrel=1
 pkgdesc="Three-D Athena widgets"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://directory.fsf.org/project/xaw3d/"
 license=('MIT')
-depends=('libxmu' 'libxpm')
-makedepends=('imake')
-options=('!makeflags')
-source=(ftp://ftp.visi.com/users/hawkeyd/X/Xaw3d-${pkgver}.tar.gz
-        Xaw3d-1.5E-xorg-imake.patch
-	Xaw3d-1.5-i18n.patch
-        Xaw3d-1.5-box.c.patch
-       	Xaw3d-1.5-debian-fixes.patch
-        xaw3d.patch
-	Xaw3d-1.5E-warnings.patch
-	Xaw3d-ia64.patch
-	LICENSE)
-md5sums=('29ecfdcd6bcf47f62ecfd672d31269a1'
-         '2cca7950cf7d270609bc810b8996f0a9'
-         'e7105bc1452f0c5f5d0bcdcf212aac0c'
-         'c061ab65467766f5817752ef216e3cc2'
-         '33bf0f1b52822b7293a3f45474178dfe'
-         '5acb23e5a52c75e62a22aef59882df14'
-         'c3aa4cbf95442081e7af810c13306cc9'
-         'f766e8eb6371cbb1f68af4f2932dc118'
-         '5b6b0242b3f53b7fe308e702abe28561')
+depends=('libxmu')
+makedepends=('xorg-util-macros')
+options=('!libtool')
+source=(http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-${pkgver}.tar.bz2)
+md5sums=('db88f0c5afc5f285e046d84e15ad30de')
 
 build() {
-  cd "${srcdir}/xc/lib/Xaw3d"
-  patch -Np0 -i "${srcdir}/Xaw3d-1.5E-xorg-imake.patch"
-  patch -Np4 -i "${srcdir}/xaw3d.patch"
-  patch -Np4 -i "${srcdir}/Xaw3d-ia64.patch"
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-i18n.patch"
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-box.c.patch"
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5-debian-fixes.patch"
-  patch -Np4 -i "${srcdir}/Xaw3d-1.5E-warnings.patch"
-  ln -s .. X11
-  xmkmf
-  make CDEBUGFLAGS="${CFLAGS} -DARROW_SCROLLBAR"
+  cd "${srcdir}/libXaw3d-${pkgver}"
+  ./configure --prefix=/usr --disable-static
+  make
 }
 
 package() {
-  cd "${srcdir}/xc/lib/Xaw3d"
-  make DESTDIR="${pkgdir}" SHLIBDIR=/usr/lib INCDIR=/usr/include install
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd "${srcdir}/libXaw3d-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }