Wed Jun 16 07:30:26 2010 UTC ()
- fix PLIST
- kill some pkglint warnings


(tnn)
diff -r1.36 -r1.37 pkgsrc/net/openvpn/Makefile
diff -r1.9 -r1.10 pkgsrc/net/openvpn/PLIST
diff -r1.2 -r1.3 pkgsrc/net/openvpn/options.mk
cvs diff -r1.36 -r1.37 pkgsrc/net/openvpn/Makefile (expand / switch to unified diff)

--- pkgsrc/net/openvpn/Makefile 2010/06/15 12:05:28 1.36
+++ pkgsrc/net/openvpn/Makefile 2010/06/16 07:30:26 1.37
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.36 2010/06/15 12:05:28 sborrill Exp $ 1# $NetBSD: Makefile,v 1.37 2010/06/16 07:30:26 tnn Exp $
2# 2#
3 3
4DISTNAME= openvpn-2.1.1 4DISTNAME= openvpn-2.1.1
5PKGNAME= ${DISTNAME:S/_//} 
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= http://openvpn.net/release/ \ 6MASTER_SITES= http://openvpn.net/release/ \
8 http://openvpn.net/release/old/ 7 http://openvpn.net/release/old/
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openvpn.net/ 10HOMEPAGE= http://openvpn.net/
12COMMENT= Easy-to-use SSL VPN daemon 11COMMENT= Easy-to-use SSL VPN daemon
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18USE_TOOLS+= grep:run 17USE_TOOLS+= grep:run
cvs diff -r1.9 -r1.10 pkgsrc/net/openvpn/PLIST (expand / switch to unified diff)

--- pkgsrc/net/openvpn/PLIST 2009/10/30 19:06:06 1.9
+++ pkgsrc/net/openvpn/PLIST 2010/06/16 07:30:26 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.9 2009/10/30 19:06:06 manu Exp $ 1@comment $NetBSD: PLIST,v 1.10 2010/06/16 07:30:26 tnn 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
@@ -21,26 +21,27 @@ share/examples/openvpn/keys/README @@ -21,26 +21,27 @@ share/examples/openvpn/keys/README
21share/examples/openvpn/keys/ca.crt 21share/examples/openvpn/keys/ca.crt
22share/examples/openvpn/keys/ca.key 22share/examples/openvpn/keys/ca.key
23share/examples/openvpn/keys/client.crt 23share/examples/openvpn/keys/client.crt
24share/examples/openvpn/keys/client.key 24share/examples/openvpn/keys/client.key
25share/examples/openvpn/keys/dh1024.pem 25share/examples/openvpn/keys/dh1024.pem
26share/examples/openvpn/keys/pass.crt 26share/examples/openvpn/keys/pass.crt
27share/examples/openvpn/keys/pass.key 27share/examples/openvpn/keys/pass.key
28share/examples/openvpn/keys/pkcs12.p12 28share/examples/openvpn/keys/pkcs12.p12
29share/examples/openvpn/keys/server.crt 29share/examples/openvpn/keys/server.crt
30share/examples/openvpn/keys/server.key 30share/examples/openvpn/keys/server.key
31share/examples/openvpn/scripts/auth-pam.pl 31share/examples/openvpn/scripts/auth-pam.pl
32share/examples/openvpn/scripts/bridge-start 32share/examples/openvpn/scripts/bridge-start
33share/examples/openvpn/scripts/bridge-stop 33share/examples/openvpn/scripts/bridge-stop
 34share/examples/openvpn/scripts/bs
34share/examples/openvpn/scripts/openvpn.init 35share/examples/openvpn/scripts/openvpn.init
35share/examples/openvpn/scripts/ucn.pl 36share/examples/openvpn/scripts/ucn.pl
36share/examples/openvpn/scripts/verify-cn 37share/examples/openvpn/scripts/verify-cn
37share/examples/rc.d/openvpn 38share/examples/rc.d/openvpn
38share/openvpn/easy-rsa/README 39share/openvpn/easy-rsa/README
39share/openvpn/easy-rsa/build-ca 40share/openvpn/easy-rsa/build-ca
40share/openvpn/easy-rsa/build-dh 41share/openvpn/easy-rsa/build-dh
41share/openvpn/easy-rsa/build-inter 42share/openvpn/easy-rsa/build-inter
42share/openvpn/easy-rsa/build-key 43share/openvpn/easy-rsa/build-key
43share/openvpn/easy-rsa/build-key-pass 44share/openvpn/easy-rsa/build-key-pass
44share/openvpn/easy-rsa/build-key-pkcs12 45share/openvpn/easy-rsa/build-key-pkcs12
45share/openvpn/easy-rsa/build-key-server 46share/openvpn/easy-rsa/build-key-server
46share/openvpn/easy-rsa/build-req 47share/openvpn/easy-rsa/build-req
cvs diff -r1.2 -r1.3 pkgsrc/net/openvpn/options.mk (expand / switch to unified diff)

--- pkgsrc/net/openvpn/options.mk 2009/10/30 19:06:06 1.2
+++ pkgsrc/net/openvpn/options.mk 2010/06/16 07:30:26 1.3
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: options.mk,v 1.2 2009/10/30 19:06:06 manu Exp $ 1# $NetBSD: options.mk,v 1.3 2010/06/16 07:30:26 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openvpn 3PKG_OPTIONS_VAR= PKG_OPTIONS.openvpn
4PKG_SUPPORTED_OPTIONS= pkcs11 pam 4PKG_SUPPORTED_OPTIONS= pkcs11 pam
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9# include support for certificates on a stick (or card) 9# include support for certificates on a stick (or card)
10 10
11.if !empty(PKG_OPTIONS:Mpkcs11) 11.if !empty(PKG_OPTIONS:Mpkcs11)
12.include "../../security/pkcs11-helper/buildlink3.mk" 12.include "../../security/pkcs11-helper/buildlink3.mk"
13.else 13.else
14# it would pick it up halfways when installed, and fail building 14# it would pick it up halfways when installed, and fail building
15CONFIGURE_ARGS+= --disable-pkcs11 15CONFIGURE_ARGS+= --disable-pkcs11
16.endif 16.endif
17 17
18PLIST_VARS+= pam 18PLIST_VARS+= pam
19.if !empty(PKG_OPTIONS:Mpam) 19.if !empty(PKG_OPTIONS:Mpam)
20USE_TOOLS+= gmake 20USE_TOOLS+= gmake
21BUILD_DIRS+= plugin/auth-pam 21BUILD_DIRS+= plugin/auth-pam
22BUILD_TARGET=  22BUILD_TARGET= # empty
23INSTALL_DIRS= ${WRKSRC} 23INSTALL_DIRS= .
24INSTALL_TARGET= install 24INSTALL_TARGET= install
25PLIST.pam= yes 25PLIST.pam= yes
26post-install-pam: 26post-install-pam:
27 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/openvpn && \ 27 ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib/openvpn && \
28 cd ${WRKSRC:Q}/plugin/auth-pam && \ 28 cd ${WRKSRC:Q}/plugin/auth-pam && \
29 ${INSTALL_LIB} openvpn-auth-pam.so \ 29 ${INSTALL_LIB} openvpn-auth-pam.so \
30 ${DESTDIR}${PREFIX}/lib/openvpn || true 30 ${DESTDIR}${PREFIX}/lib/openvpn || ${TRUE}
31.include "../../mk/pam.buildlink3.mk" 31.include "../../mk/pam.buildlink3.mk"
32.else 32.else
33post-install-pam: 33post-install-pam:
34.endif 34.endif