Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Oct 2012 20:11:27 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305740 - in head/security/openvpn-beta: . files
Message-ID:  <201210112011.q9BKBRtE078823@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Thu Oct 11 20:11:26 2012
New Revision: 305740
URL: http://svn.freebsd.org/changeset/ports/305740

Log:
  - Properly install symlinks for auth-pam and down-root plugins [1]
  - Fix pkg-message description of locations of these plugins [1]
  - Fix plist for nonexistent DOCSDIR/openvpn
  
  PR:		ports/172598 [1]
  Submitted by:	Eric F Crist <ecrist@secure-computing.net> (maintainer) [1]
  Feature safe:	yes

Modified:
  head/security/openvpn-beta/Makefile
  head/security/openvpn-beta/files/pkg-message.in
  head/security/openvpn-beta/pkg-plist

Modified: head/security/openvpn-beta/Makefile
==============================================================================
--- head/security/openvpn-beta/Makefile	Thu Oct 11 19:55:47 2012	(r305739)
+++ head/security/openvpn-beta/Makefile	Thu Oct 11 20:11:26 2012	(r305740)
@@ -6,6 +6,7 @@ DISTVERSION=	2.3_beta1
 CATEGORIES=	security net
 MASTER_SITES=	http://swupdate.openvpn.net/community/releases/
 PKGNAMESUFFIX=	-beta
+PORTREVISION=	1
 
 MAINTAINER=	ecrist@secure-computing.net
 COMMENT=	Secure IP/Ethernet tunnel daemon
@@ -90,10 +91,9 @@ post-build:
 
 post-install:
 	${MKDIR} ${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/src/plugins/down-root/.libs/openvpn-plugin-down-root.so ${PREFIX}/lib/
-	${INSTALL_LIB} ${WRKSRC}/src/plugins/auth-pam/.libs/openvpn-plugin-auth-pam.so ${PREFIX}/lib/
-	${LN} -s ${WRKSRC}/src/plugins/down-root/.libs/openvpn-plugin-down-root.so ${PREFIX}/lib/openvpn-down-root.so
-	${LN} -s ${WRKSRC}/src/plugins/down-root/.libs/openvpn-plugin-auth-pam.so ${PREFIX}/lib/openvpn-auth-pam.so
+	${LN} -s ${PREFIX}/lib/openvpn/plugins/openvpn-plugin-down-root.so ${PREFIX}/lib/openvpn-down-root.so
+	${LN} -s ${PREFIX}/lib/openvpn/plugins/openvpn-plugin-auth-pam.so ${PREFIX}/lib/openvpn-auth-pam.so
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL \

Modified: head/security/openvpn-beta/files/pkg-message.in
==============================================================================
--- head/security/openvpn-beta/files/pkg-message.in	Thu Oct 11 19:55:47 2012	(r305739)
+++ head/security/openvpn-beta/files/pkg-message.in	Thu Oct 11 20:11:26 2012	(r305740)
@@ -13,10 +13,10 @@
 ### The following plugin locations have changed.  There is a symlink to the
 ### new file for the duration of the 2.3 release.  This will be removed in
 ### OpenVPN 2.4+.
-### Old Location:
+### New Location:
 ### %%PREFIX%%/openvpn/plugins/openvpn-plugin-auth-pam.so
 ### %%PREFIX%%/openvpn/plugins/openvpn-plugin-down-root.so
 ###
-### New Location:
+### Old Location:
 ### %%PREFIX%%/openvpn-plugin-auth-pam.so
 ### %%PREFIX%%/openvpn-plugin-down-root.so

Modified: head/security/openvpn-beta/pkg-plist
==============================================================================
--- head/security/openvpn-beta/pkg-plist	Thu Oct 11 19:55:47 2012	(r305739)
+++ head/security/openvpn-beta/pkg-plist	Thu Oct 11 20:11:26 2012	(r305740)
@@ -1,8 +1,6 @@
 lib/openvpn/plugins/openvpn-plugin-auth-pam.so
-lib/openvpn-plugin-auth-pam.so
 lib/openvpn/plugins/openvpn-plugin-auth-pam.la
 lib/openvpn/plugins/openvpn-plugin-down-root.so
-lib/openvpn-plugin-down-root.so
 lib/openvpn/plugins/openvpn-plugin-down-root.la
 lib/openvpn-auth-pam.so
 lib/openvpn-down-root.so
@@ -41,7 +39,6 @@ sbin/openvpn
 %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-stop
 %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/ucn.pl
 %%PORTDOCS%%%%DOCSDIR%%/sample-scripts/verify-cn
-@dirrmtry %%PORTDOCS%%%%DOCSDIR%%/openvpn
 @dirrmtry %%PORTDOCS%%%%DOCSDIR%%/sample
 @dirrmtry %%PORTDOCS%%%%DOCSDIR%%/sample-config-files
 @dirrmtry %%PORTDOCS%%%%DOCSDIR%%/sample-scripts



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210112011.q9BKBRtE078823>