diff --git a/srcpkgs/nasm/patches/gcc81-pure_func.patch b/srcpkgs/nasm/patches/gcc81-pure_func.patch deleted file mode 100644 index b5c24d59f24..00000000000 --- a/srcpkgs/nasm/patches/gcc81-pure_func.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/nasmlib.h 2017-11-29 20:44:08.000000000 +0100 -+++ include/nasmlib.h 2018-05-22 11:26:47.909787252 +0200 -@@ -191,7 +191,7 @@ - * seg_init: Initialise the segment-number allocator. - * seg_alloc: allocate a hitherto unused segment number. - */ --void pure_func seg_init(void); -+void seg_init(void); - int32_t pure_func seg_alloc(void); - - /* diff --git a/srcpkgs/nasm/template b/srcpkgs/nasm/template index b4dfc53c3a6..77f4347e8a4 100644 --- a/srcpkgs/nasm/template +++ b/srcpkgs/nasm/template @@ -1,6 +1,6 @@ # Template file for 'nasm' pkgname=nasm -version=2.13.02 +version=2.14 revision=1 build_style=gnu-configure make_build_args="all doc" @@ -8,12 +8,14 @@ hostmakedepends="groff perl perl-Font-TTF perl-IO-String perl-Sort-Versions ghostscript source-sans-pro liberation-fonts-ttf" short_desc="An 80x86 assembler designed for portability and modularity" maintainer="Juan RP " -homepage="http://www.nasm.us" -license="2-clause-BSD" -distfiles="http://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.bz2" -checksum=8d3028d286be7c185ba6ae4c8a692fc5438c129b2a3ffad60cbdcedd2793bbbe +license="BSD-2-Clause" +homepage="https://www.nasm.us" +distfiles="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.xz" +checksum=97c615dbf02ef80e4e2b6c385f7e28368d51efc214daa98e600ca4572500eec0 -do_install() { - make INSTALLROOT="${DESTDIR}" install install_doc +post_install() { + make -C doc DESTDIR="${DESTDIR}" docdir=/usr/share/doc/nasm install vlicense LICENSE + + #mv ${DESTDIR}/usr/doc ${DESTDIR}/usr/share/doc }