1 files changed, 13 insertions, 32 deletions
diff --git a/xwpe/PKGBUILD b/xwpe/PKGBUILD
index 2ffe0ae..7800512 100644
--- a/xwpe/PKGBUILD
+++ b/xwpe/PKGBUILD
@@ -4,55 +4,36 @@
 
 pkgname=xwpe
 pkgver=1.5.30a
-pkgrel=1
-pkgdesc="A Borland IDE-like text editor"
+pkgrel=2
+pkgdesc='A Borland IDE-like text editor'
 arch=('i686' 'x86_64')
-url="http://www.identicalsoftware.com/xwpe"
+url='http://www.identicalsoftware.com/xwpe'
 license=('GPL2')
-depends=('ncurses' 'gpm' 'zlib' 'libice' 'libx11')
-source=("http://www.identicalsoftware.com/xwpe/$pkgname-$pkgver.tar.gz"
-        'xwpe-1.5.30a-makefile.patch')
+depends=('ncurses' 'gpm' 'zlib')
+optdepends=('libx11' 'libsm')
+source=("${url}/${pkgname}-${pkgver}.tar.gz"
+        'xwpe-1.5.30a-build.patch')
 sha256sums=('fce37a5dd3afd7102a73d187eda8b9d1ab88bf5db649f385b8cd13e72e0c7961'
-            'SKIP')
+            '0751f172ce6d442f59c69e6f401fd77c20a60479ce6b577c0f77b35dd40d0252')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
 
-  # Allow building a version without X
-  patch -p1 -i ../xwpe-1.5.30a-makefile.patch
+  # Fix and improve build
+  patch -p1 -i ../xwpe-1.5.30a-build.patch
 }
 
 build() {
   cd "${pkgname}-${pkgver}"
   CFLAGS="${CFLAGS}" ./configure \
    --prefix=/usr \
-   --libdir='${prefix}/share'
-  make wpe
-  mv wpe wpe.save
+   --libdir=/usr/share
   make
 }
 
 package() {
   cd "${pkgname}-${pkgver}"
-  make install \
-   prefix="${pkgdir}/usr" \
-   MANDIR="${pkgdir}/usr/share/man" \
-
-  (
-    cd "${pkgdir}/usr/bin" ; rm -f we wpe
-  )
-
-  install -m755 wpe.save "${pkgdir}/usr/bin/wpe"
-
-  (
-    cd "${pkgdir}/usr/bin" ; ln -sf wpe we
-  )
-
-  install -Dm644 xwpe.desktop \
-   "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
+  make install DESTDIR="${pkgdir}"
   install -dm755 "${pkgdir}/usr/share/doc/${pkgname}"
-
-  install -m644 CHANGELOG README \
-   "${pkgdir}/usr/share/doc/${pkgname}"
+  install -m644 CHANGELOG README "${pkgdir}/usr/share/doc/${pkgname}"
 }