From 5cb978c42b6c6444161fa41121ea5f07579404bc Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 6 Aug 2012 00:02:23 +0000
Subject: Mon Aug  6 00:02:23 UTC 2012

---
 extra/nasm/PKGBUILD | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

(limited to 'extra/nasm')

diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index f8af21be8..3e8184e81 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 153792 2012-03-19 18:12:16Z stephane $
+# $Id: PKGBUILD 164757 2012-08-04 18:04:50Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
-pkgbase=nasm
-pkgname=('nasm' 'nasm-doc')
-pkgver=2.10
+pkgname=nasm
+pkgver=2.10.03
 pkgrel=1
-arch=('i686' 'x86_64')
+pkgdesc="An 80x86 assembler designed for portability and modularity"
 url="http://www.nasm.us"
 license=('BSD')
+arch=('i686' 'x86_64')
+depends=('glibc')
 makedepends=('ghostscript')
-source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('acdcae5366230e2e19b2ad36f952df0232c80950')
+source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('78a8de9ba02da7c2ba8c583a57901ff6856ad6c6')
+install=nasm.install
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -19,24 +21,10 @@ build() {
   make everything
 }
 
-package_nasm() {
-  pkgdesc="An 80x86 assembler designed for portability and modularity"
-  depends=('glibc')
-  install=nasm.install
-
+package() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make INSTALLROOT="${pkgdir}" install install_rdf
-  install -d "${pkgdir}"/usr/share/info
+  install -dm755 "${pkgdir}"/usr/share/info
   install -m644 doc/info/* "${pkgdir}"/usr/share/info/
   install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/nasm/LICENSE
 }
-
-package_nasm-doc() {
-  pkgdesc="An 80x86 assembler designed for portability and modularity (manuals)"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/doc"
-  install -d "${pkgdir}"/usr/share/doc/nasm/html
-  install -m644 html/* "${pkgdir}"/usr/share/doc/nasm/html/
-  install -m644  nasmdoc.ps nasmdoc.pdf nasmdoc.txt  "${pkgdir}"/usr/share/doc/nasm/
-  install -D -m644 ../LICENSE "${pkgdir}"/usr/share/licenses/nasm-doc/LICENSE
-}
-- 
cgit v1.2.3-54-g00ecf