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

[Giovanni Scafora]

    Date: Wednesday, November 30, 2011 @ 15:12:40
  Author: giovanni
Revision: 143900

upgpkg: manedit 1.2.1-4

rebuild

Modified:
  manedit/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-30 19:57:03 UTC (rev 143899)
+++ PKGBUILD	2011-11-30 20:12:40 UTC (rev 143900)
@@ -4,15 +4,15 @@
 
 pkgname=manedit
 pkgver=1.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="An editor specifically tailored for UNIX manual pages"
 arch=('i686' 'x86_64')
 license=('GPL')
-url="http://www.battlefieldlinux.com/wolfpack/ManEdit/"
+url="http://freecode.com/projects/manedit"
 depends=('gcc-libs' 'bzip2' 'zlib' 'gtk')
-source=(http://wolfsinger.com/~wolfpack/packages/${pkgname}-${pkgver}.tar.bz2
-        manedit-1.2.1-fix-man-page.patch
-        manedit.desktop)
+source=("http://wolfsinger.com/~wolfpack/packages/${pkgname}-${pkgver}.tar.bz2"
+        'manedit-1.2.1-fix-man-page.patch'
+        'manedit.desktop')
 md5sums=('a7ee1835e32ed3c9279412af7caf13ef'
          '60cb0c224a6659f8a8183006608f368b'
          'bac6986fc25dda6f0e27e3673eef4600')
@@ -21,7 +21,7 @@
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # Patch to fix generate man page
-  patch -Np1 -i ${srcdir}/manedit-1.2.1-fix-man-page.patch || return 1
+  patch -Np1 -i ${srcdir}/manedit-1.2.1-fix-man-page.patch
 
   env CFLAGS="${CFLAGS}" \
   ./configure Linux \
@@ -35,8 +35,12 @@
               --disable="arch-i686" \
               --disable="arch-pentiumpro"
 
-  make all || return 1
+  make all
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   # Fix strip error (tries to strip a shell script)
   cp manedit/Makefile.install.UNIX{,.orig}
   sed -e '/INST.*FLAGS.*-s$/s:-s::' \
@@ -45,7 +49,7 @@
   # Set man dir too or FHS is violated
   make PREFIX="${pkgdir}/usr" \
        MAN_DIR="${pkgdir}/usr/share/man/man1" \
-       ICONS_DIR="${pkgdir}/usr/share/pixmaps" install || return 1
+       ICONS_DIR="${pkgdir}/usr/share/pixmaps" install
 
   # Install desktop file
   install -Dm644 ${srcdir}/manedit.desktop "${pkgdir}/usr/share/applications/manedit.desktop"