diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-21 00:21:21 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-21 00:21:21 -0300 |
| commit | 116249b42ef84d8917a2c8593f7e6b0d3500722e (patch) | |
| tree | cd565bc54690330bce0bfd9fe793c7c3663904a6 /extra/nasm | |
| parent | fcd3ae0df41ddf3667e1c91ce48d31ef6d32e6cb (diff) | |
| parent | a3108a9a809c496e1f6a0e9caf0acebac3889bfb (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/virtualbox-modules/PKGBUILD
community-testing/virtualbox-modules/virtualbox-archlinux-modules.install
community-testing/virtualbox-modules/virtualbox-modules.install
community/ircii-pana/PKGBUILD
extra/nasm/PKGBUILD
extra/vlc/PKGBUILD
gnome-unstable/baobab/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/dconf/PKGBUILD
gnome-unstable/evince/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/evolution/evolution.install
gnome-unstable/gcr/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/gnome-control-center/gnome-control-center.install
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-font-viewer/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gnome-panel/PKGBUILD
gnome-unstable/gnome-power-manager/PKGBUILD
gnome-unstable/gnome-power-manager/gnome-power-manager.install
gnome-unstable/gnome-screenshot/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install
gnome-unstable/gnome-system-log/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/gvfs/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/libgxps/PKGBUILD
gnome-unstable/network-manager-applet/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
gnome-unstable/pygobject/PKGBUILD
gnome-unstable/seahorse/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
gnome-unstable/vte3/PKGBUILD
gnome-unstable/yelp/PKGBUILD
gnome-unstable/yelp/yelp.install
testing/kmod/PKGBUILD
testing/kmod/depmod-search.conf
testing/lirc/PKGBUILD
testing/lirc/lirc.install
testing/openssh/PKGBUILD
testing/xf86-video-neomagic/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'extra/nasm')
| -rw-r--r-- | extra/nasm/PKGBUILD | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 56dc69ac4..7e01e55f5 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 150735 2012-02-21 15:12:29Z stephane $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 153792 2012-03-19 18:12:16Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> pkgbase=nasm pkgname=('nasm' 'nasm-doc') -pkgver=2.09.10 -pkgrel=2 +pkgver=2.10 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.nasm.us" license=('BSD') makedepends=('ghostscript') source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('15c79dcb5838870a0fac15feb5fade66') -sha1sums=('ca57a7454b29e18c64018e49cdf5c832937497ab') +sha1sums=('acdcae5366230e2e19b2ad36f952df0232c80950') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -26,17 +26,17 @@ package_nasm() { cd "${srcdir}/${pkgbase}-${pkgver}" make INSTALLROOT="${pkgdir}" install install_rdf - install -d "${pkgdir}/usr/share/info" - install -m644 doc/info/* "${pkgdir}/usr/share/info/" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nasm/LICENSE" + install -d "${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" + 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 } |