[pkgsrc/trunk]: pkgsrc/sysutils/pciutils Add DESTDIR support. Split install -...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5100492410f5
branches:  trunk
changeset: 534549:5100492410f5
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Oct 26 15:06:19 2007 +0000

description:
Add DESTDIR support. Split install -d command as it is not portable.

diffstat:

 sysutils/pciutils/Makefile         |   4 +++-
 sysutils/pciutils/distinfo         |   4 ++--
 sysutils/pciutils/patches/patch-aa |  28 ++++++++++++++++++----------
 3 files changed, 23 insertions(+), 13 deletions(-)

diffs (76 lines):

diff -r 16c5b16f9b11 -r 5100492410f5 sysutils/pciutils/Makefile
--- a/sysutils/pciutils/Makefile        Fri Oct 26 14:50:18 2007 +0000
+++ b/sysutils/pciutils/Makefile        Fri Oct 26 15:06:19 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/08/22 22:49:12 gdt Exp $
+# $NetBSD: Makefile,v 1.11 2007/10/26 15:06:19 joerg Exp $
 
 DISTNAME=      pciutils-2.1.11
 PKGREVISION=   1
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://mj.ucw.cz/pciutils.shtml
 COMMENT=       PCI bus manipulation utility similar to NetBSD pcictl(8)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 # subdir build in libs, followed by linking with it, without .WAIT
 MAKE_JOBS_SAFE=        NO
 
diff -r 16c5b16f9b11 -r 5100492410f5 sysutils/pciutils/distinfo
--- a/sysutils/pciutils/distinfo        Fri Oct 26 14:50:18 2007 +0000
+++ b/sysutils/pciutils/distinfo        Fri Oct 26 15:06:19 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/12/27 18:39:53 reed Exp $
+$NetBSD: distinfo,v 1.4 2007/10/26 15:06:19 joerg Exp $
 
 SHA1 (pciutils-2.1.11.tar.gz) = bb1e107a745a40e208f676cffc0826ca8b928688
 RMD160 (pciutils-2.1.11.tar.gz) = 46b6aed92fb9a8b81e7bd0da23ed13963ce15456
 Size (pciutils-2.1.11.tar.gz) = 120948 bytes
-SHA1 (patch-aa) = eb33c807890869abd2ddfeb38472dc15bd612bdd
+SHA1 (patch-aa) = 03031ebefda815b1fc0cac1dbdfd5fc5cada463c
diff -r 16c5b16f9b11 -r 5100492410f5 sysutils/pciutils/patches/patch-aa
--- a/sysutils/pciutils/patches/patch-aa        Fri Oct 26 14:50:18 2007 +0000
+++ b/sysutils/pciutils/patches/patch-aa        Fri Oct 26 15:06:19 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2005/12/27 18:39:53 reed Exp $
+$NetBSD: patch-aa,v 1.3 2007/10/26 15:06:19 joerg Exp $
 
 --- Makefile.orig      2003-01-04 13:53:01.000000000 +0100
 +++ Makefile
@@ -22,19 +22,27 @@
  
  ifeq ($(shell uname),NetBSD)
  PCILIB=libpciutils.a
-@@ -58,11 +60,14 @@ clean:
+@@ -58,11 +60,18 @@ clean:
  
  install: all
  # -c is ignored on Linux, but required on FreeBSD
 -      $(DIRINSTALL) -m 755 $(SBINDIR) $(SHAREDIR) $(MANDIR)/man8
-+      $(DIRINSTALL) -m 755 $(SBINDIR) $(SHAREDIR) $(MANDIR)/man8 $(LIBDIR) $(INCLUDEDIR)
-       $(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR)
-       $(INSTALL) -c -m 755 update-pciids $(SBINDIR)
-       $(INSTALL) -c -m 644 pci.ids $(SHAREDIR)
-+      $(INSTALL) -c -m 644 README $(SHAREDIR)
-       $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8
-+      $(INSTALL) -c -m 444 lib/$(PCILIB) $(LIBDIR)
-+      $(INSTALL) -c -m 644 lib/pci.h lib/header.h lib/config.h $(INCLUDEDIR)
+-      $(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR)
+-      $(INSTALL) -c -m 755 update-pciids $(SBINDIR)
+-      $(INSTALL) -c -m 644 pci.ids $(SHAREDIR)
+-      $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8
++      $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR)
++      $(DIRINSTALL) -m 755 $(DESTDIR)$(SHAREDIR)
++      $(DIRINSTALL) -m 755 $(DESTDIR)$(MANDIR)/man8
++      $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
++      $(DIRINSTALL) -m 755 $(DESTDIR)$(INCLUDEDIR)
++      $(INSTALL) -c -m 755 -s lspci setpci $(DESTDIR)$(SBINDIR)
++      $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR)
++      $(INSTALL) -c -m 644 pci.ids $(DESTDIR)$(SHAREDIR)
++      $(INSTALL) -c -m 644 README $(DESTDIR)$(SHAREDIR)
++      $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
++      $(INSTALL) -c -m 444 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
++      $(INSTALL) -c -m 644 lib/pci.h lib/header.h lib/config.h $(DESTDIR)$(INCLUDEDIR)
  
  uninstall: all
        rm -f $(SBINDIR)/lspci $(SBINDIR)/setpci $(SBINDIR)/update-pciids