Sun Nov 23 15:16:42 2008 UTC ()
Do not unnecessarily create share/doc/openvpn, and remove it from PLIST.
It wasn't created when installing the binary package.

Bump PKGREVISION.


(wiz)
diff -r1.26 -r1.27 pkgsrc/net/openvpn/Makefile
diff -r1.6 -r1.7 pkgsrc/net/openvpn/PLIST
cvs diff -r1.26 -r1.27 pkgsrc/net/openvpn/Makefile (expand / switch to unified diff)

--- pkgsrc/net/openvpn/Makefile 2008/10/09 10:57:23 1.26
+++ pkgsrc/net/openvpn/Makefile 2008/11/23 15:16:42 1.27
@@ -1,54 +1,53 @@ @@ -1,54 +1,53 @@
1# $NetBSD: Makefile,v 1.26 2008/10/09 10:57:23 sborrill Exp $ 1# $NetBSD: Makefile,v 1.27 2008/11/23 15:16:42 wiz Exp $
2# 2#
3 3
4DISTNAME= openvpn-2.1_rc13 4DISTNAME= openvpn-2.1_rc13
5PKGNAME= openvpn-2.1rc13 5PKGNAME= ${DISTNAME:S/_//}
 6PKGREVISION= 1
6CATEGORIES= net 7CATEGORIES= net
7MASTER_SITES= http://openvpn.net/release/ \ 8MASTER_SITES= http://openvpn.net/release/ \
8 http://openvpn.net/release/old/ 9 http://openvpn.net/release/old/
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openvpn.net/ 12HOMEPAGE= http://openvpn.net/
12COMMENT= Easy-to-use SSL VPN daemon 13COMMENT= Easy-to-use SSL VPN daemon
13#LICENSE= gnu-gpl-v2 14#LICENSE= gnu-gpl-v2
14 15
15PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
16 17
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
18USE_TOOLS+= grep:run 19USE_TOOLS+= grep:run
19USE_LIBTOOL= yes 20USE_LIBTOOL= yes
20USE_OLD_DES_API= yes 21USE_OLD_DES_API= yes
21TEST_TARGET= check 22TEST_TARGET= check
22 23
23PKG_SYSCONFSUBDIR= openvpn 24PKG_SYSCONFSUBDIR= openvpn
24DATADIR= ${PREFIX}/share/${PKGBASE} 25DATADIR= ${PREFIX}/share/${PKGBASE}
25DOCDIR= ${PREFIX}/share/doc/${PKGBASE} 
26EGDIR= ${PREFIX}/share/examples/${PKGBASE} 26EGDIR= ${PREFIX}/share/examples/${PKGBASE}
27EASYRSADIR= ${DATADIR}/easy-rsa 27EASYRSADIR= ${DATADIR}/easy-rsa
28RCD_SCRIPTS= openvpn 28RCD_SCRIPTS= openvpn
29 29
30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
31CONFIGURE_ARGS+= --enable-password-save 31CONFIGURE_ARGS+= --enable-password-save
32CONFIGURE_ARGS+= --disable-dependency-tracking 32CONFIGURE_ARGS+= --disable-dependency-tracking
33 33
34# Pthread support is still considered very experimental, so don't enable 34# Pthread support is still considered very experimental, so don't enable
35# it for the default (production) build. 35# it for the default (production) build.
36# 36#
37#CONFIGURE_ARGS+= --enable-pthread 37#CONFIGURE_ARGS+= --enable-pthread
38 38
39INSTALLATION_DIRS= ${DATADIR}/easy-rsa ${EGDIR}/config \ 39INSTALLATION_DIRS= ${DATADIR}/easy-rsa ${EGDIR}/config \
40 ${DOCDIR} ${EGDIR}/keys \ 40 ${EGDIR}/keys ${EGDIR}/scripts
41 ${EGDIR}/scripts 
42 41
43.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
44 43
45# OpenVPN 2.x has a shared module "plugin" architecture that allows 44# OpenVPN 2.x has a shared module "plugin" architecture that allows
46# inserting callbacks into the server for various tasks. 45# inserting callbacks into the server for various tasks.
47# 46#
48DL_AUTO_VARS= yes 47DL_AUTO_VARS= yes
49.include "../../mk/dlopen.buildlink3.mk" 48.include "../../mk/dlopen.buildlink3.mk"
50 49
51.include "../../archivers/lzo/buildlink3.mk" 50.include "../../archivers/lzo/buildlink3.mk"
52.include "../../security/openssl/buildlink3.mk" 51.include "../../security/openssl/buildlink3.mk"
53.include "../../mk/pthread.buildlink3.mk" 52.include "../../mk/pthread.buildlink3.mk"
54.if ${OPSYS} == "SunOS" 53.if ${OPSYS} == "SunOS"
cvs diff -r1.6 -r1.7 pkgsrc/net/openvpn/PLIST (expand / switch to unified diff)

--- pkgsrc/net/openvpn/PLIST 2008/10/09 10:57:23 1.6
+++ pkgsrc/net/openvpn/PLIST 2008/11/23 15:16:42 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2008/10/09 10:57:23 sborrill Exp $ 1@comment $NetBSD: PLIST,v 1.7 2008/11/23 15:16:42 wiz Exp $
2man/man8/openvpn.8 2man/man8/openvpn.8
3sbin/openvpn 3sbin/openvpn
4share/examples/openvpn/config/README 4share/examples/openvpn/config/README
5share/examples/openvpn/config/client.conf 5share/examples/openvpn/config/client.conf
6share/examples/openvpn/config/firewall.sh 6share/examples/openvpn/config/firewall.sh
7share/examples/openvpn/config/home.up 7share/examples/openvpn/config/home.up
8share/examples/openvpn/config/loopback-client 8share/examples/openvpn/config/loopback-client
9share/examples/openvpn/config/loopback-server 9share/examples/openvpn/config/loopback-server
10share/examples/openvpn/config/office.up 10share/examples/openvpn/config/office.up
11share/examples/openvpn/config/openvpn-shutdown.sh 11share/examples/openvpn/config/openvpn-shutdown.sh
12share/examples/openvpn/config/openvpn-startup.sh 12share/examples/openvpn/config/openvpn-startup.sh
13share/examples/openvpn/config/server.conf 13share/examples/openvpn/config/server.conf
14share/examples/openvpn/config/static-home.conf 14share/examples/openvpn/config/static-home.conf
@@ -51,14 +51,13 @@ share/openvpn/easy-rsa/list-crl @@ -51,14 +51,13 @@ share/openvpn/easy-rsa/list-crl
51share/openvpn/easy-rsa/openssl-0.9.6.cnf 51share/openvpn/easy-rsa/openssl-0.9.6.cnf
52share/openvpn/easy-rsa/openssl.cnf 52share/openvpn/easy-rsa/openssl.cnf
53share/openvpn/easy-rsa/pkitool 53share/openvpn/easy-rsa/pkitool
54share/openvpn/easy-rsa/revoke-full 54share/openvpn/easy-rsa/revoke-full
55share/openvpn/easy-rsa/sign-req 55share/openvpn/easy-rsa/sign-req
56share/openvpn/easy-rsa/vars 56share/openvpn/easy-rsa/vars
57share/openvpn/easy-rsa/whichopensslcnf 57share/openvpn/easy-rsa/whichopensslcnf
58@dirrm share/openvpn/easy-rsa 58@dirrm share/openvpn/easy-rsa
59@dirrm share/openvpn 59@dirrm share/openvpn
60@dirrm share/examples/openvpn/scripts 60@dirrm share/examples/openvpn/scripts
61@dirrm share/examples/openvpn/keys 61@dirrm share/examples/openvpn/keys
62@dirrm share/examples/openvpn/config 62@dirrm share/examples/openvpn/config
63@dirrm share/examples/openvpn 63@dirrm share/examples/openvpn
64@dirrm share/doc/openvpn