[arch-commits] Commit in lesstif/trunk (ChangeLog PKGBUILD)

[Andrea Scarpino]

    Date: Saturday, September 10, 2011 @ 06:02:03
  Author: andrea
Revision: 137645

upgpkg: lesstif 0.95.2-3

cleanup PKGBUILD; old package rebuild

Modified:
  lesstif/trunk/PKGBUILD
Deleted:
  lesstif/trunk/ChangeLog

-----------+
 ChangeLog |   19 -------------------
 PKGBUILD  |   49 +++++++++++++++++++++++++++----------------------
 2 files changed, 27 insertions(+), 41 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-09-10 09:57:32 UTC (rev 137644)
+++ ChangeLog	2011-09-10 10:02:03 UTC (rev 137645)
@@ -1,19 +0,0 @@
-2010-01-05  Eric Belanger  <eric at archlinux.org>
-
-	* lesstif 0.95.2-2
-	* Fixed segmentation fault when doing copy/paste on i686 (close FS#17712)
-
-2009-12-30  Eric Belanger  <eric at archlinux.org>
-
-	* lesstif 0.95.2-1
-	* Upstream update
-	* Added docs
-
-2008-12-08  Eric Belanger  <eric at archlinux.org>
-
-	* lesstif 0.95.0-3
-	* Added license
-	* Updated options syntax
-	* Added url
-	* FHS man pages
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-10 09:57:32 UTC (rev 137644)
+++ PKGBUILD	2011-09-10 10:02:03 UTC (rev 137645)
@@ -1,52 +1,57 @@
 # $Id$
+# Maintainer:
 # Contributor: Eric Belanger <eric at archlinux.org>
 # Contributor: John Proctor <jproctor at prium.net>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=lesstif
 pkgver=0.95.2
-pkgrel=2
+pkgrel=3
 pkgdesc="LGPL'd re-implementation of Motif"
 arch=('i686' 'x86_64')
 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
+	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 || 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
 
 	# fix linkage against already installed version
-	perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool || return 1
+	perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool
 
-	make || return 1
+	make
 
 	# 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
+	    perl -pi -e 's/^(relink_command=.*)/# $1/' $f
 	done
 
-	make -C lib/Mrm-2.1 || return 1
+	make -C lib/Mrm-2.1
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd "${srcdir}"/${pkgname}-${pkgver}
 
-	make -C lib/Mrm-2.1 DESTDIR=${pkgdir} install || return 1
+	make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install
 	make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif \
-	    DESTDIR=${pkgdir} install || return 1
-	install -Dm644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
+	    DESTDIR=${pkgdir} install
+	install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }