Do this the right way: regen audit-packages.0 and then substitute as

regular

2 files changed, 15 insertions, 16 deletions

diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile
index 55cc74eb509..ea6b4cdf9eb 100644
--- a/security/audit-packages/Makefile
+++ b/security/audit-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2004/04/09 15:30:57 jschauma Exp $
+# $NetBSD: Makefile,v 1.45 2004/04/09 16:06:59 jschauma Exp $
 
 DISTNAME=	audit-packages-1.29
 CATEGORIES=	security pkgtools
@@ -29,8 +29,8 @@ NROFF=		nroff -mandoc
 .endif
 
 do-build:
-	@for f in audit-packages audit-packages.8 \
-		download-vulnerability-list; do	\
+	@for f in audit-packages audit-packages.0 audit-packages.8 	\
+		download-vulnerability-list; do				\
 		${SED} -e 's|@PKGVULNDIR@|${PKGVULNDIR}|g' 		\
 			-e 's|@AWK@|${AWK}|g'				\
 			-e 's|@FETCH_CMD@|${FETCH_CMD}|g'		\
diff --git a/security/audit-packages/files/audit-packages.0 b/security/audit-packages/files/audit-packages.0
index d9fb5a182ff..e4f3847cdf0 100644
--- a/security/audit-packages/files/audit-packages.0
+++ b/security/audit-packages/files/audit-packages.0
@@ -17,9 +17,9 @@ DDEESSCCRRIIPPTTIIOONN
 
      The ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt program downloads this file from
      _f_t_p_:_/_/_f_t_p_._N_e_t_B_S_D_._o_r_g_/_p_u_b_/_N_e_t_B_S_D_/_p_a_c_k_a_g_e_s_/_d_i_s_t_f_i_l_e_s_/_p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s
-     using ftp(1).  This vulnerabilities file documents all known security
-     issues in pkgsrc packages and is kept up-to-date by the NetBSD packages
-     team.
+     using @FETCH_CMD_SHORT@(1).  This vulnerabilities file documents all
+     known security issues in pkgsrc packages and is kept up-to-date by the
+     NetBSD packages team.
 
      Each line lists the package and vulnerable versions, the type of exploit,
      and an Internet address for further information.  The type of exploit can
@@ -59,14 +59,13 @@ DDEESSCCRRIIPPTTIIOONN
            ++oo   weak-encryption
            ++oo   weak-ssl-authentication
 
-     By default, the vulnerabilities file is stored in the
-     _/_u_s_r_/_p_k_g_s_r_c_/_d_i_s_t_f_i_l_e_s directory.  This can be changed by defining the
-     environment variable PKGVULNDIR to the directory containing the vulnera-
-     bilities file.
+     By default, the vulnerabilities file is stored in the _@_P_K_G_V_U_L_N_D_I_R_@ direc-
+     tory.  This can be changed by defining the environment variable
+     PKGVULNDIR to the directory containing the vulnerabilities file.
 
 EENNVVIIRROONNMMEENNTT
      These variables can also be defined in the
-     _/_u_s_r_/_p_k_g_/_e_t_c_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s_._c_o_n_f file.
+     _@_P_K_G___S_Y_S_C_O_N_F_D_I_R_@_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s_._c_o_n_f file.
 
      PKGVULNDIR  Specifies the directory containing the _p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s
                  file.
@@ -74,9 +73,9 @@ EENNVVIIRROONNMMEENNTT
      FETCH_ARGS  Specifies optional arguments for the ftp client.
 
 FFIILLEESS
-     _/_u_s_r_/_p_k_g_s_r_c_/_d_i_s_t_f_i_l_e_s_/_p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s
+     _@_P_K_G_V_U_L_N_D_I_R_@_/_p_k_g_-_v_u_l_n_e_r_a_b_i_l_i_t_i_e_s
 
-     _/_u_s_r_/_p_k_g_/_e_t_c_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s_._c_o_n_f
+     _@_P_K_G___S_Y_S_C_O_N_F_D_I_R_@_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s_._c_o_n_f
 
 EEXXAAMMPPLLEESS
      The ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt command can be run via cron(8) to update
@@ -84,15 +83,15 @@ EEXXAAMMPPLLEESS
      cron(8) (or with NetBSD's _/_e_t_c_/_s_e_c_u_r_i_t_y_._l_o_c_a_l daily security script).
 
      The ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt command can be forced to use IPv4 with
-     the following setting in _/_u_s_r_/_p_k_g_/_e_t_c_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s_._c_o_n_f:
+     the following setting in _@_P_K_G___S_Y_S_C_O_N_F_D_I_R_@_/_a_u_d_i_t_-_p_a_c_k_a_g_e_s_._c_o_n_f:
 
      export FETCH_ARGS="-4"
 
 SSEEEE AALLSSOO
-     pkg_info(1), mk.conf(5), packages(7), _/_u_s_r_/_p_k_g_s_r_c_/_m_k_/_b_s_d_._p_k_g_._d_e_f_a_u_l_t_s_._m_k
+     pkg_info(1), mk.conf(5), packages(7), _@_P_K_G_S_R_C_D_I_R_@_/_m_k_/_b_s_d_._p_k_g_._d_e_f_a_u_l_t_s_._m_k
      and
 
-     _D_o_c_u_m_e_n_t_a_t_i_o_n _o_n _t_h_e _N_e_t_B_S_D _P_a_c_k_a_g_e _S_y_s_t_e_m.  _/_u_s_r_/_p_k_g_s_r_c_/_P_a_c_k_a_g_e_s_._t_x_t
+     _D_o_c_u_m_e_n_t_a_t_i_o_n _o_n _t_h_e _N_e_t_B_S_D _P_a_c_k_a_g_e _S_y_s_t_e_m.  _@_P_K_G_S_R_C_D_I_R_@_/_P_a_c_k_a_g_e_s_._t_x_t
 
 HHIISSTTOORRYY
      The aauuddiitt--ppaacckkaaggeess and ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt commands were origi-