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

Conflicts:
	community/antiword/PKGBUILD
	community/apcupsd/PKGBUILD
	community/busybox/PKGBUILD
	community/chrpath/PKGBUILD
	community/driftnet/PKGBUILD
	community/emesene/PKGBUILD
	community/fdm/PKGBUILD
	community/fftw2/PKGBUILD
	community/gsynaptics/PKGBUILD
	community/gtk-rezlooks-engine/PKGBUILD
	community/httptunnel/PKGBUILD
	community/libnfnetlink/PKGBUILD
	community/libopenraw/PKGBUILD
	community/mashup/PKGBUILD
	community/pcb/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/preload/PKGBUILD
	community/rlog/PKGBUILD
	community/scponly/PKGBUILD
	community/splint/PKGBUILD
	community/wmname/PKGBUILD
	community/xosd/PKGBUILD
	community/xxkb/PKGBUILD
	community/znc/PKGBUILD
	core/glibc/PKGBUILD
	core/libtool/PKGBUILD
	extra/at/PKGBUILD
	extra/autogen/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/cdrdao/PKGBUILD
	extra/chkrootkit/PKGBUILD
	extra/cmt/PKGBUILD
	extra/compface/PKGBUILD
	extra/dasher/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/dmapi/PKGBUILD
	extra/docker/PKGBUILD
	extra/dvd+rw-tools/PKGBUILD
	extra/dvdrtools/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/festival/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gecko-sharp-2.0/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gmetadom/PKGBUILD
	extra/gnome-speech/PKGBUILD
	extra/gnome-vfsmm/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/graphite/PKGBUILD
	extra/i8kutils/PKGBUILD
	extra/id3/PKGBUILD
	extra/java-access-bridge/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/koffice/PKGBUILD
	extra/ladspa/PKGBUILD
	extra/libcddb/PKGBUILD
	extra/libcroco/PKGBUILD
	extra/libdc1394/PKGBUILD
	extra/libdca/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libglademm/PKGBUILD
	extra/libgnomecanvasmm/PKGBUILD
	extra/libsigsegv/PKGBUILD
	extra/libstdc++5/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libytnef/PKGBUILD
	extra/lua/PKGBUILD
	extra/mcpp/PKGBUILD
	extra/metalog/PKGBUILD
	extra/mp3wrap/PKGBUILD
	extra/mt-st/PKGBUILD
	extra/naim/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/oxine/PKGBUILD
	extra/php/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pstoedit/PKGBUILD
	extra/qt/PKGBUILD
	extra/speex/PKGBUILD
	extra/sweep/PKGBUILD
	extra/t1lib/PKGBUILD
	extra/taglib-extras/PKGBUILD
	extra/unixodbc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/ypbind-mt/PKGBUILD
	gnome-unstable/caribou/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/cogl/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/empathy/PKGBUILD
	gnome-unstable/empathy/empathy.install
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/folks/PKGBUILD
	gnome-unstable/gconf/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/gdm/fix_external_program_directories.patch
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-color-manager/PKGBUILD
	gnome-unstable/gnome-contacts/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-menus/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-panel/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-shell/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gnome-utils/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gtkmm3/PKGBUILD
	gnome-unstable/libgdata/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/libwnck3/PKGBUILD
	gnome-unstable/mash/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/mx/PKGBUILD
	gnome-unstable/pulseaudio/PKGBUILD
	gnome-unstable/pygobject/PKGBUILD
	gnome-unstable/pygobject2/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	gnome-unstable/sushi/PKGBUILD
	gnome-unstable/totem/PKGBUILD
	gnome-unstable/upower/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-gtk/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-mpg123/PKGBUILD
	multilib/lib32-nspr/PKGBUILD
	multilib/lib32-nss/PKGBUILD
	multilib/lib32-nss/add_spi+cacert_ca_certs.patch
	multilib/lib32-openssl/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/wine/PKGBUILD
	testing/util-linux/PKGBUILD

1 files changed, 43 insertions, 28 deletions

diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD
index 0b4defe8d..5b2380e0c 100644
--- a/extra/lesstif/PKGBUILD
+++ b/extra/lesstif/PKGBUILD
@@ -1,42 +1,57 @@
-# $Id: PKGBUILD 62257 2010-01-05 21:48:01Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 137646 2011-09-10 10:03:09Z andrea $
+# Maintainer:
+# Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=lesstif
 pkgver=0.95.2
-pkgrel=2
+pkgrel=3
 pkgdesc="LGPL'd re-implementation of Motif"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lesstif.org/"
 license=('LGPL' 'MIT')
 depends=('freetype2' 'libxt' 'libxp')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-	LICENSE 040_fedora_XxxxProperty-64bit.diff)
-md5sums=('754187dbac09fcf5d18296437e72a32f' 'b1f320192a9154f72d83e9d3d5a25a2f'\
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'LICENSE' '040_fedora_XxxxProperty-64bit.diff')
+md5sums=('754187dbac09fcf5d18296437e72a32f'
+         'b1f320192a9154f72d83e9d3d5a25a2f'
          '30e2c0babc84696af089d55cb9cb2908')
-sha1sums=('b894e544d529a235a6a665d48ca94a465f44a4e5' '5d7f38555417cb617d7d5b7e41a93af8430dc638'\
-         '85412aba25058110db8da99da4a2c5ab44330467')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../040_fedora_XxxxProperty-64bit.diff || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man --docdir=/usr/share/doc \
-    --enable-production --enable-nonstandard-conversions --enable-editres \
-    --with-xdnd --enable-build-21 --disable-debug --enable-static || return 1
-
-# fix linkage against already installed version
-  perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool || return 1
-
-  make || return 1
-
-# fix linkage against already installed version
-  for f in `find . -name \*.la -type f` ; do
-    perl -pi -e 's/^(relink_command=.*)/# $1/' $f || return 1
-  done
-
-  make -C lib/Mrm-2.1 || return 1
-  make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install || return 1
-  make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+	cd "${srcdir}"/${pkgname}-${pkgver}
+	patch -p1 -i "${srcdir}"/040_fedora_XxxxProperty-64bit.diff
+
+	./configure --prefix=/usr \
+      --mandir=/usr/share/man \
+	  --docdir=/usr/share/doc \
+      --enable-production \
+	  --enable-nonstandard-conversions \
+      --enable-editres \
+      --with-xdnd \
+      --enable-build-21 \
+      --disable-debug \
+	  --enable-static
+
+	# fix linkage against already installed version
+	perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool
+
+	make
+
+	# fix linkage against already installed version
+	for f in `find . -name \*.la -type f` ; do
+	    perl -pi -e 's/^(relink_command=.*)/# $1/' $f
+	done
+
+	make -C lib/Mrm-2.1
+}
+
+package() {
+	cd "${srcdir}"/${pkgname}-${pkgver}
+
+	make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install
+	make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif \
+	    DESTDIR=${pkgdir} install
+	install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }