[pkgsrc/trunk]: pkgsrc/devel/nasm Update package to install html documentatio...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc5f8f42e920
branches:  trunk
changeset: 538430:bc5f8f42e920
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Fri Feb 08 03:50:07 2008 +0000

description:
Update package to install html documentation in the right place.
While here, simplify things by using the BSD_INSTALL* variables.

Bump PKGREVISION.

diffstat:

 devel/nasm/Makefile         |   6 +++---
 devel/nasm/PLIST            |  32 ++++++++++++++++----------------
 devel/nasm/distinfo         |   6 +++---
 devel/nasm/patches/patch-aa |  21 ++++++++++++++++++++-
 devel/nasm/patches/patch-ab |  18 ++++++++++--------
 5 files changed, 52 insertions(+), 31 deletions(-)

diffs (156 lines):

diff -r 6539c5f11dc2 -r bc5f8f42e920 devel/nasm/Makefile
--- a/devel/nasm/Makefile       Fri Feb 08 03:14:18 2008 +0000
+++ b/devel/nasm/Makefile       Fri Feb 08 03:50:07 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2008/01/28 05:38:20 bjs Exp $
+# $NetBSD: Makefile,v 1.34 2008/02/08 03:50:07 bjs Exp $
 
 DISTNAME=      nasm-2.01
+PKGREVISION=   1
 CATEGORIES=    devel lang
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nasm/}
 EXTRACT_SUFX=  .tar.bz2
@@ -22,8 +23,7 @@
 
 INSTALL_ENV+=  INSTALLROOT=${DESTDIR}
 
-MAKE_ENV+=     PERL5=${PERL5:Q}                        \
-               INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}
+MAKE_ENV+=     PERL5=${PERL5:Q}
 
 AUTO_MKDIRS=   yes
 
diff -r 6539c5f11dc2 -r bc5f8f42e920 devel/nasm/PLIST
--- a/devel/nasm/PLIST  Fri Feb 08 03:14:18 2008 +0000
+++ b/devel/nasm/PLIST  Fri Feb 08 03:50:07 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/01/28 05:38:20 bjs Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/02/08 03:50:07 bjs Exp $
 bin/ldrdf
 bin/nasm
 bin/ndisasm
@@ -17,21 +17,21 @@
 man/man1/rdfdump.1
 man/man1/rdflib.1
 man/man1/rdx.1
-share/doc/html/nasm/nasmdo10.html
-share/doc/html/nasm/nasmdo11.html
-share/doc/html/nasm/nasmdoc0.html
-share/doc/html/nasm/nasmdoc1.html
-share/doc/html/nasm/nasmdoc2.html
-share/doc/html/nasm/nasmdoc3.html
-share/doc/html/nasm/nasmdoc4.html
-share/doc/html/nasm/nasmdoc5.html
-share/doc/html/nasm/nasmdoc6.html
-share/doc/html/nasm/nasmdoc7.html
-share/doc/html/nasm/nasmdoc8.html
-share/doc/html/nasm/nasmdoc9.html
-share/doc/html/nasm/nasmdoca.html
-share/doc/html/nasm/nasmdoci.html
+share/doc/nasm/html/nasmdo10.html
+share/doc/nasm/html/nasmdo11.html
+share/doc/nasm/html/nasmdoc0.html
+share/doc/nasm/html/nasmdoc1.html
+share/doc/nasm/html/nasmdoc2.html
+share/doc/nasm/html/nasmdoc3.html
+share/doc/nasm/html/nasmdoc4.html
+share/doc/nasm/html/nasmdoc5.html
+share/doc/nasm/html/nasmdoc6.html
+share/doc/nasm/html/nasmdoc7.html
+share/doc/nasm/html/nasmdoc8.html
+share/doc/nasm/html/nasmdoc9.html
+share/doc/nasm/html/nasmdoca.html
+share/doc/nasm/html/nasmdoci.html
 share/doc/nasm/nasmdoc.ps
 share/doc/nasm/nasmdoc.txt
-@dirrm share/doc/html/nasm
+@dirrm share/doc/nasm/html
 @dirrm share/doc/nasm
diff -r 6539c5f11dc2 -r bc5f8f42e920 devel/nasm/distinfo
--- a/devel/nasm/distinfo       Fri Feb 08 03:14:18 2008 +0000
+++ b/devel/nasm/distinfo       Fri Feb 08 03:50:07 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2008/01/28 05:38:20 bjs Exp $
+$NetBSD: distinfo,v 1.14 2008/02/08 03:50:07 bjs Exp $
 
 SHA1 (nasm-2.01.tar.bz2) = e532443eb5a984c9711062d329d4ec07ec154250
 RMD160 (nasm-2.01.tar.bz2) = 9589f146fb242fa8ebc0ce2b53e6a8629022e8ca
 Size (nasm-2.01.tar.bz2) = 722479 bytes
-SHA1 (patch-aa) = 8514d241d017f0396e7ee8bfe0008d99ca29683c
-SHA1 (patch-ab) = f59ec4b8b342af6c0986cb0fb6be604675523c42
+SHA1 (patch-aa) = 3f05734250b81898f15fc4323d95ec5606c91cb1
+SHA1 (patch-ab) = 126868a02cb51e284cc172def061757cbf3742aa
 SHA1 (patch-ac) = 35b69553570023019193c9de915913b1994dcd5b
diff -r 6539c5f11dc2 -r bc5f8f42e920 devel/nasm/patches/patch-aa
--- a/devel/nasm/patches/patch-aa       Fri Feb 08 03:14:18 2008 +0000
+++ b/devel/nasm/patches/patch-aa       Fri Feb 08 03:50:07 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2008/01/28 05:38:20 bjs Exp $
+$NetBSD: patch-aa,v 1.4 2008/02/08 03:50:07 bjs Exp $
 
 --- Makefile.in.orig   2008-01-17 15:22:39.000000000 -0500
 +++ Makefile.in
@@ -11,3 +11,22 @@
  
  XOBJS         = @XOBJS@
  
+@@ -148,12 +148,12 @@ PERLREQ = macros.c insnsa.c insnsd.c ins
+ perlreq: $(PERLREQ)
+ 
+ install: nasm$(X) ndisasm$(X)
+-      $(MKDIR) -p $(INSTALLROOT)$(bindir)
+-      $(INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X)
+-      $(INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X)
+-      $(MKDIR) -p $(INSTALLROOT)$(mandir)/man1
+-      $(INSTALL_DATA) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1
+-      $(INSTALL_DATA) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1
++      $(BSD_INSTALL_PROGRAM_DIR) $(INSTALLROOT)$(bindir)
++      $(BSD_INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X)
++      $(BSD_INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X)
++      $(BSD_INSTALL_MAN_DIR) $(INSTALLROOT)$(mandir)/man1
++      $(BSD_INSTALL_MAN) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1
++      $(BSD_INSTALL_MAN) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1
+ 
+ clean:
+       $(RM) -f *.$(O) *.s *.i
diff -r 6539c5f11dc2 -r bc5f8f42e920 devel/nasm/patches/patch-ab
--- a/devel/nasm/patches/patch-ab       Fri Feb 08 03:14:18 2008 +0000
+++ b/devel/nasm/patches/patch-ab       Fri Feb 08 03:50:07 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2008/01/28 05:38:20 bjs Exp $
+$NetBSD: patch-ab,v 1.3 2008/02/08 03:50:07 bjs Exp $
 
 --- doc/Makefile.in.orig       2008-01-17 15:22:17.000000000 -0500
 +++ doc/Makefile.in
@@ -8,7 +8,7 @@
  mandir                = @mandir@
 -docdir                = $(prefix)/doc/nasm
 +docdir                = $(prefix)/share/doc/nasm
-+htmldocdir    = $(prefix)/share/doc/html/nasm
++htmldocdir    = $(docdir)/html
  infodir               = @infodir@
  datarootdir   = @datarootdir@
  
@@ -28,14 +28,16 @@
  
  # exports
  export srcdir
-@@ -77,6 +77,7 @@ spotless: clean
+@@ -76,7 +76,8 @@ spotless: clean
+       -rm -f nasmdoc*.ps
  
  install: all
-       $(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)
+-      $(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)
 -      mkdir -p $(INSTALLROOT)$(docdir)/html
 -      $(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html
 -      $(INSTALL_DATA) nasmdoc.ps nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir)
-+      $(INSTALL_DATA_DIR) $(INSTALLROOT)$(docdir)
-+      $(INSTALL_DATA_DIR) $(INSTALLROOT)$(htmldocdir)
-+      $(INSTALL_DATA) html/* $(INSTALLROOT)$(htmldocdir)
-+      $(INSTALL_DATA) nasmdoc.ps nasmdoc.txt $(INSTALLROOT)$(docdir)
++      $(BSD_INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)
++      $(BSD_INSTALL_DATA_DIR) $(INSTALLROOT)$(docdir)
++      $(BSD_INSTALL_DATA_DIR) $(INSTALLROOT)$(htmldocdir)
++      $(BSD_INSTALL_DATA) html/* $(INSTALLROOT)$(htmldocdir)
++      $(BSD_INSTALL_DATA) nasmdoc.ps nasmdoc.txt $(INSTALLROOT)$(docdir)