Fix a few leftovers from previous update, noted by Jukka Sallmi in private mail:

 * remove RCS ID from patch-ab
 * remove duplicate line in Makefile
 * Update checksums

5 files changed, 99 insertions, 9 deletions

diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index fbd49d4b7e6..a187219dd4a 100644
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/01/09 11:35:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.20 2008/01/09 12:25:40 hubertf Exp $
 #
 
 DISTNAME=		vpnc-0.5.1
@@ -26,7 +26,6 @@ SUBST_SED.paths+=	-e 's|@PREFIX@|${PREFIX}|g'
 SUBST_SED.paths+=	-e 's|@PKGMANDIR@|${PKGMANDIR}|g'
 SUBST_SED.paths+=	-e 's|@VARBASE@|${VARBASE}|g'
 SUBST_SED.paths+=	-e 's|@PERL5@|${PERL5}|g'
-SUBST_SED.paths+=	-e 's|@PERL5@|${PERL5}|g'
 
 EGDIR=			${PREFIX}/share/examples/vpnc
 CONF_FILES+=		${EGDIR}/vpnc.conf ${PKG_SYSCONFDIR}/vpnc/vpnc.conf
diff --git a/net/vpnc/distinfo b/net/vpnc/distinfo
index f0c3755ce6c..f41218d3d61 100644
--- a/net/vpnc/distinfo
+++ b/net/vpnc/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2008/01/09 11:35:31 hubertf Exp $
+$NetBSD: distinfo,v 1.10 2008/01/09 12:25:40 hubertf Exp $
 
 SHA1 (vpnc-0.5.1.tar.gz) = efc71dba03aa40945af35e4b074d99f922ff7ffd
 RMD160 (vpnc-0.5.1.tar.gz) = 76dd5a3a38bd2109cf8e1fbad85e2762e8489832
 Size (vpnc-0.5.1.tar.gz) = 91496 bytes
 SHA1 (patch-aa) = 93beb83165aeb0abb9605f0d8ce9d203726d7d04
-SHA1 (patch-ab) = 9eb2db944f6428401990659984abd38a07c3454f
+SHA1 (patch-ab) = 14aa011b36fcf1da54d506fd5398cfc55cb11748
 SHA1 (patch-ac) = 7cde3e693a73e5848de596a49d23e4be45a7d8a9
 SHA1 (patch-ad) = 7e31f1804541eb4de9924edcc517304487aad0f2
 SHA1 (patch-ae) = d831819831a5861550c5924955cc270c58341d9d
diff --git a/net/vpnc/patches/patch-ab b/net/vpnc/patches/patch-ab
index 2145bc15019..269d5fc1338 100644
--- a/net/vpnc/patches/patch-ab
+++ b/net/vpnc/patches/patch-ab
@@ -1,10 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2008/01/09 11:35:31 hubertf Exp $
+$NetBSD: patch-ab,v 1.6 2008/01/09 12:25:40 hubertf Exp $
 
 --- makeman.pl.orig	2007-09-10 22:39:48.000000000 +0200
-+++ makeman.pl	2007-09-14 14:39:22.000000000 +0200
-@@ -1,4 +1,4 @@
++++ makeman.pl
+@@ -1,2 +1,2 @@
 -#! /usr/bin/perl -w
 +#! @PERL5@ -w
  
- # $Id: patch-ab,v 1.5 2008/01/09 11:35:31 hubertf Exp $
- 
diff --git a/net/vpnc/patches/patch-ad b/net/vpnc/patches/patch-ad
new file mode 100644
index 00000000000..37ff7dd9de4
--- /dev/null
+++ b/net/vpnc/patches/patch-ad
@@ -0,0 +1,10 @@
+$NetBSD: patch-ad,v 1.3 2008/01/09 12:25:40 hubertf Exp $
+
+--- pcf2vpnc.orig	2007-08-30 12:51:30.000000000 +0200
++++ pcf2vpnc	2007-09-14 15:34:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!@PERL5@
+ # Stefan Tomanek <stefan@pico.ruhr.de>
+ # updated by Wolfram Sang <ninja@the-dreams.de> on 21.10.06 and on 26.06.07
+ ##
diff --git a/net/vpnc/patches/patch-ae b/net/vpnc/patches/patch-ae
new file mode 100644
index 00000000000..2958a489243
--- /dev/null
+++ b/net/vpnc/patches/patch-ae
@@ -0,0 +1,83 @@
+$NetBSD: patch-ae,v 1.1 2008/01/09 12:25:41 hubertf Exp $
+
+--- vpnc.8.template.orig	2007-09-10 22:39:48.000000000 +0200
++++ vpnc.8.template	2007-09-14 16:08:21.000000000 +0200
+@@ -48,9 +48,9 @@ command line options
+ .IP \(bu
+ config file(s) specified on the command line
+ .IP \(bu
+-/etc/vpnc/default.conf
++@PKG_SYSCONFDIR@/vpnc/default.conf
+ .IP \(bu
+-/etc/vpnc.conf
++@PKG_SYSCONFDIR@/vpnc.conf
+ .IP \(bu
+ prompting the user if not found above
+ 
+@@ -63,9 +63,9 @@ place to set an option wins.
+ configuration filenames
+ which do not contain a /
+ will be searched at
+-.B /etc/vpnc/<filename>
++.B @PKG_SYSCONFDIR@/vpnc/<filename>
+ and
+-.B /etc/vpnc/<filename>.conf.
++.B @PKG_SYSCONFDIR@/vpnc/<filename>.conf.
+ Otherwise
+ .B <filename>
+ and
+@@ -74,9 +74,9 @@ will be used.
+ If no configuration file
+ is specified on the command-line
+ at all, both
+-.B /etc/vpnc/default.conf
++.B @PKG_SYSCONFDIR@/vpnc/default.conf
+ and
+-.B /etc/vpnc.conf
++.B @PKG_SYSCONFDIR@/vpnc.conf
+ will be loaded.
+ 
+ .SH OPTIONS
+@@ -91,8 +91,8 @@ for security reasons) or be stored in a 
+ Prints your configuration; output can be used as vpnc.conf
+ 
+ .SH FILES
+-.I /etc/vpnc.conf
+-.I /etc/vpnc/default.conf
++.I @PKG_SYSCONFDIR@/vpnc.conf
++.I @PKG_SYSCONFDIR@/vpnc/default.conf
+ .RS
+ The default configuration file. You can specify the same config
+ directives as with command line options and additionaly
+@@ -110,7 +110,7 @@ See
+ for further details.
+ .RE
+ 
+-.I /etc/vpnc/*.conf
++.I @PKG_SYSCONFDIR@/vpnc/*.conf
+ .RS
+ vpnc will read configuration files in this directory when
+ the config filename (with or without .conf) is specified on the command line.
+@@ -149,11 +149,11 @@ IKE Authmode hybrid
+ .P
+ 
+ .P
+-CA-Dir /etc/vpnc
++CA-Dir @PKG_SYSCONFDIR@/vpnc
+ .P
+ \fBor\fR
+ .P
+-CA-File /etc/vpnc/vpn-example-com.pem
++CA-File @PKG_SYSCONFDIR@/vpnc/vpn-example-com.pem
+ .P
+ 
+ .P
+@@ -176,7 +176,7 @@ named something like 722d15bd.X, where X
+ make sure that files with colliding hashes have different names. The number
+ can be derived from the certificate file itself:
+ .P
+-openssl x509 -subject_hash -noout -in /etc/vpnc/vpn-example-com.pem
++openssl x509 -subject_hash -noout -in @PKG_SYSCONFDIR@/vpnc/vpn-example-com.pem
+ 
+ See also the
+ .B \-\-print\-config