mmucl-1.5.2-2

3 files changed, 33 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29b2c9cb321d..5f3979522b79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mmucl
-	pkgdesc = MUD client programmed in tcl.
+	pkgdesc = MUD client programmed in tcl
 	pkgver = 1.5.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://mmucl.sourceforge.net/
 	install = mmucl.install
 	arch = i686
@@ -9,9 +9,7 @@ pkgbase = mmucl
 	license = GPL2
 	depends = tcl
 	source = http://downloads.sourceforge.net/mmucl/mmucl-1.5.2.tar.gz
-	source = mmucl.install
 	md5sums = d38ad0b1a51325dada8ac6b1b15113e2
-	md5sums = 1b6e24eb94357959362faf41f8e0edd1
 
 pkgname = mmucl
 
diff --git a/PKGBUILD b/PKGBUILD
index ee0ffef91462..62e03e6630f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,38 @@
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+
 pkgname=mmucl
 pkgver=1.5.2
-pkgrel=1
-pkgdesc="MUD client programmed in tcl."
+pkgrel=2
+pkgdesc="MUD client programmed in tcl"
 arch=('i686' 'x86_64')
-depends=('tcl')
-license=('GPL2')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	mmucl.install)
 url="http://mmucl.sourceforge.net/"
-md5sums=('d38ad0b1a51325dada8ac6b1b15113e2'
-         '1b6e24eb94357959362faf41f8e0edd1')
-install=mmucl.install
+license=('GPL2')
+depends=('tcl')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('d38ad0b1a51325dada8ac6b1b15113e2')
 
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  mkdir -p $startdir/pkg/usr/share/mmucl
-  sed -i "s|/usr/local|$startdir/pkg/usr|" Makefile
+prepare() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  sed -i "s|/usr/local|${pkgdir}/usr|" Makefile
   grep -v "/mmucl.info" Makefile &> Makefile2
   mv Makefile2 Makefile
-  make || return 1
-  make install || return 1
-  install -Dm644 $startdir/src/$pkgname-$pkgver/mmucl.html $startdir/pkg/usr/share/mmucl/ || return 1
-  sed -i "s|$startdir/pkg||" $startdir/pkg/usr/bin/mmucl2
+}
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  install -d "${pkgdir}"/usr/share/mmucl
+
+  make install
+
+  install -Dm644 "${srcdir}"/$pkgname-$pkgver/mmucl.html "${pkgdir}"/usr/share/mmucl/
+  sed -i "s|${pkgdir}||" "${pkgdir}"/usr/bin/mmucl2
 }
diff --git a/mmucl.install b/mmucl.install
index ab3edc7ea00e..72735a48eb88 100644
--- a/mmucl.install
+++ b/mmucl.install
@@ -1,16 +1,7 @@
-
 post_install() {
-	echo "> Note: Only the text interface appears"
-	echo "> to function. If you know how to get"
-	echo "> the others to work, let me know."
+	echo "> Note: Only the text interface appears to function."
 }
 
 post_upgrade() {
 	post_install
 }
-
-op=$1
-shift
-$op $*
-
-#EOF