Change download-vulnerability-list.sh to use exec_prefix in the

sense of pkg_tools_prefix and prefix in the sense of LOCALBASE.
This allows individual overriding for NetBSD.

Add the forgotten part to allow DESTDIR builds and the pkgsrc.7 man
page.

3 files changed, 9 insertions, 4 deletions

diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index b8243fa802b..21133757b70 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2007/07/14 20:17:06 adrianp Exp $
+# $NetBSD: Makefile,v 1.133 2007/07/16 13:23:02 joerg Exp $
 
 # Notes to package maintainers:
 #
@@ -17,6 +17,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.pkgsrc.org/
 COMMENT=		Package management and administration tools for pkgsrc
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=		audit-packages-[0-9]*
 
 GNU_CONFIGURE=		yes
diff --git a/pkgtools/pkg_install/PLIST b/pkgtools/pkg_install/PLIST
index 1c84fd1356c..7d9e1fd5252 100644
--- a/pkgtools/pkg_install/PLIST
+++ b/pkgtools/pkg_install/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/07/14 20:17:06 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/07/16 13:23:02 joerg Exp $
 man/cat1/audit-packages.0
 man/cat1/download-vulnerability-list.0
 man/cat1/linkfarm.0
@@ -10,6 +10,7 @@ man/cat1/pkg_info.0
 man/cat1/pkg_view.0
 man/cat5/audit-packages.conf.0
 man/cat5/pkg_summary.0
+man/cat7/pkgsrc.0
 man/man1/audit-packages.1
 man/man1/download-vulnerability-list.1
 man/man1/linkfarm.1
@@ -21,6 +22,7 @@ man/man1/pkg_info.1
 man/man1/pkg_view.1
 man/man5/audit-packages.conf.5
 man/man5/pkg_summary.5
+man/man7/pkgsrc.7
 sbin/audit-packages
 sbin/download-vulnerability-list
 sbin/linkfarm
diff --git a/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.sh.in b/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.sh.in
index 949af37c337..375220dbe99 100644
--- a/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.sh.in
+++ b/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: download-vulnerability-list.sh.in,v 1.1 2007/07/14 20:17:10 adrianp Exp $
+# $NetBSD: download-vulnerability-list.sh.in,v 1.2 2007/07/16 13:23:02 joerg Exp $
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -37,7 +37,8 @@
 : ${FETCH_ARGS=""}
 : ${FETCH_PROTO=ftp}
 
-AP=@prefix@/sbin/audit-packages
+prefix=@prefix@
+AP=@exec_prefix@/sbin/audit-packages
 NEW_VUL_LIST=pkg-vulnerabilities.$$
 EXIST_VUL_LIST=pkg-vulnerabilities
 FETCH_PATH="ftp.NetBSD.org/pub/NetBSD/packages/vulns"