[arch-commits] Commit in xterm/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Tuesday, August 25, 2009 @ 16:33:20
  Author: jgc
Revision: 50386

Merged revisions 49788,50383 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xterm/trunk

........
  r49788 | jgc | 2009-08-15 18:25:56 +0200 (Sat, 15 Aug 2009) | 1 line
  
  upgpkg: xterm 245-1
........
  r50383 | jgc | 2009-08-25 22:27:35 +0200 (Tue, 25 Aug 2009) | 1 line
  
  upgpkg: xterm 246-1
........

Modified:
  xterm/repos/extra-i686/	(properties)
  xterm/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   61 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 33 insertions(+), 28 deletions(-)


Property changes on: xterm/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xterm/trunk:1-36466
   + /xterm/trunk:1-50385

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-25 20:29:01 UTC (rev 50385)
+++ extra-i686/PKGBUILD	2009-08-25 20:33:20 UTC (rev 50386)
@@ -2,45 +2,50 @@
 #  ppc Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # i686 Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xterm
-pkgver=243
-pkgrel=2
+pkgver=246
+pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=(i686 x86_64)
 url="http://invisible-island.net/xterm/"
 license=('custom')
 depends=('libxft' 'libxaw>=1.0.5' 'ncurses' 'xorg-apps')
 groups=('xorg')
-source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE)
-md5sums=('be25d2d3661d0bb77fc66e1bcbb3caba' '10ecc3f8ee91e3189863a172f68282d2')
+source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
+        LICENSE)
+md5sums=('b0c3aa021031742d6f5009833fc4d800'
+         '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
-              --libdir=/etc \
-              --mandir=/usr/share/man \
-	      --with-app-defaults=/usr/share/X11/app-defaults/ \
-              --with-x \
-	      --disable-full-tgetent \
-	      --disable-imake \
-	      --enable-ansi-color \
-	      --enable-88-color \
-	      --enable-256-color \
-	      --enable-broken-osc \
-	      --enable-broken-st \
-	      --enable-load-vt-fonts \
-	      --enable-i18n \
-	      --enable-wide-chars \
-	      --enable-doublechars \
-	      --enable-warnings \
-	      --enable-tcap-query \
-	      --enable-logging \
-	      --enable-dabbrev \
-	      --enable-freetype \
-	      --enable-luit \
-	      --enable-mini-luit \
-	      --enable-narrowproto || return 1
+      --libdir=/etc \
+      --mandir=/usr/share/man \
+      --with-app-defaults=/usr/share/X11/app-defaults/ \
+      --with-x \
+      --disable-full-tgetent \
+      --disable-imake \
+      --enable-ansi-color \
+      --enable-88-color \
+      --enable-256-color \
+      --enable-broken-osc \
+      --enable-broken-st \
+      --enable-load-vt-fonts \
+      --enable-i18n \
+      --enable-wide-chars \
+      --enable-doublechars \
+      --enable-warnings \
+      --enable-tcap-query \
+      --enable-logging \
+      --enable-dabbrev \
+      --enable-freetype \
+      --enable-luit \
+      --enable-mini-luit \
+      --enable-narrowproto || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   chmod 0755 "${pkgdir}/usr/bin/xterm" || return 1
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 "${srcdir}/LICENSE" \
+      "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }