From 67b6eb2ad35e7868775afc53824f1a817808a469 Mon Sep 17 00:00:00 2001 From: Ion-Mihai Tetcu Date: Sat, 17 Jun 2006 23:56:56 +0000 Subject: [PATCH] - Install openvpn-admin.exe - grammar improvement for BROKEN. - make openvpn-admin search for its configuration files in ${PREFIX}/etc/openvpn, and pre-create that directory. It will contain user data after use, so only @dirrmtry to remove it. - install openvpn-admin into ${PREFIX}/sbin/, to stick to the original installation logic, and in the same course also install openvpn-admin.pam without extension. PR: ports/95336 Submitted by: Andreas Kohn Approved by: maintainer (via private email) --- security/openvpn-admin/Makefile | 13 +++++++++---- security/openvpn-admin/pkg-plist | 7 +++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile index b051165fec52..341c20f3c303 100644 --- a/security/openvpn-admin/Makefile +++ b/security/openvpn-admin/Makefile @@ -7,7 +7,7 @@ PORTNAME= openvpn-admin PORTVERSION= 1.9.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= openvpnadmin @@ -28,17 +28,22 @@ GNU_CONFIGURE= yes .include .if ${OSVERSION} < 500000 -BROKEN= "Some dependencies doesn't build on FreeBSD < 5.x" +BROKEN= Some dependencies don't build on FreeBSD < 5.x .endif post-patch: @${REINPLACE_CMD} -e 's,/usr/bin/iconv,${LOCALBASE}/bin/iconv,g' \ ${WRKSRC}/intltool-merge.in + @${REINPLACE_CMD} -e 's,/etc/openvpn,${PREFIX}/etc/openvpn,' \ + ${WRKSRC}/src/Configuration.cs do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/openvpn-admin ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/openvpn-admin.pam ${PREFIX}/etc/pam.d + ${INSTALL_SCRIPT} ${WRKSRC}/openvpn-admin ${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/openvpn-admin.pam ${PREFIX}/etc/pam.d/openvpn-admin ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/openvpn-admin.desktop ${DATADIR} + ${MKDIR} ${PREFIX}/lib/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/src/openvpn-admin.exe ${PREFIX}/lib/${PORTNAME} + ${MKDIR} ${PREFIX}/etc/openvpn .include diff --git a/security/openvpn-admin/pkg-plist b/security/openvpn-admin/pkg-plist index abae58d9c70c..bbeab48b3dfd 100644 --- a/security/openvpn-admin/pkg-plist +++ b/security/openvpn-admin/pkg-plist @@ -1,4 +1,7 @@ -bin/openvpn-admin -etc/pam.d/openvpn-admin.pam +sbin/openvpn-admin +lib/openvpn-admin/openvpn-admin.exe +etc/pam.d/openvpn-admin %%DATADIR%%/openvpn-admin.desktop @dirrm %%DATADIR%% +@dirrm lib/openvpn-admin +@dirrmtry etc/openvpn