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

[Eric Bélanger]

    Date: Thursday, May 30, 2013 @ 23:24:38
  Author: eric
Revision: 91996

upgpkg: wvstreams 4.6.1-6

Move files to /usr/bin

Modified:
  wvstreams/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-30 21:12:52 UTC (rev 91995)
+++ PKGBUILD	2013-05-30 21:24:38 UTC (rev 91996)
@@ -5,7 +5,7 @@
 
 pkgname=wvstreams
 pkgver=4.6.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A network programming library written in C++"
 arch=('i686' 'x86_64')
 url="http://alumnit.ca/wiki/?page=WvStreams"
@@ -19,14 +19,19 @@
          'df423c68134a09439b3961c34635e0b4')
 options=('!makeflags')
 
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+prepare() {
+  cd ${pkgname}-${pkgver}
 
   patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch"
   patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch"
   patch -p1 -i "$srcdir/openssl-buildfix.patch"
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
+
   ./configure --prefix=/usr \
+     --sbin=/usr/bin \
      --sysconfdir=/etc \
      --localstatedir=/var \
      --without-dbus \
@@ -38,12 +43,12 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
   
   # FS#15974
   # --without-dbus still installs the pkg-config file
-  rm ${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc
+  rm "${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc"
   # --without-qt still installs the pkg-config file
-  rm ${pkgdir}/usr/lib/pkgconfig/libwvqt.pc
+  rm "${pkgdir}/usr/lib/pkgconfig/libwvqt.pc"
 }