4 files changed, 13 insertions, 35 deletions

diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile
index c062aba4e948..e029bf4df205 100644
--- a/security/openvpn-admin/Makefile
+++ b/security/openvpn-admin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openvpn-admin
-PORTVERSION=	1.9.2
-PORTREVISION=	3
+PORTVERSION=	1.9.3b
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,22 +14,16 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	MrL0Lz@gmail.com
 COMMENT=	GUI frontend to openvpn
 
-BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono \
-		gapi2-codegen:${PORTSDIR}/x11-toolkits/gtk-sharp20
-RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono \
-		gapi2-codegen:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
-		openvpn:${PORTSDIR}/security/openvpn
+RUN_DEPENDS=	openvpn:${PORTSDIR}/security/openvpn
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/b//}
 
 USE_GMAKE=	yes
-USE_GNOME=	gtk20
+USE_GNOME=	gtksharp20
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-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
@@ -39,9 +32,8 @@ post-patch:
 
 do-install:
 	${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}/share/applications || ${TRUE}
+	${INSTALL_DATA} ${WRKSRC}/openvpn-admin.desktop ${PREFIX}/share/applications/
 	${MKDIR} ${PREFIX}/lib/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/src/openvpn-admin.exe ${PREFIX}/lib/${PORTNAME}
 	${MKDIR} ${PREFIX}/etc/openvpn
diff --git a/security/openvpn-admin/distinfo b/security/openvpn-admin/distinfo
index eb2de5eb804c..81d8236d14b6 100644
--- a/security/openvpn-admin/distinfo
+++ b/security/openvpn-admin/distinfo
@@ -1,3 +1,3 @@
-MD5 (openvpn-admin-1.9.2.tar.gz) = ec53bd710c9d20d30c5cb478d75e0ba9
-SHA256 (openvpn-admin-1.9.2.tar.gz) = 6526bd56db2e646052d52c59e7b9411b59544adb5e40c8ddedac928f55adb130
-SIZE (openvpn-admin-1.9.2.tar.gz) = 342997
+MD5 (openvpn-admin-1.9.3b.tar.gz) = 34899a0d7b6532684897001d8cf8b349
+SHA256 (openvpn-admin-1.9.3b.tar.gz) = fee9bca67e3ba7e9c8c89de0d79e171f72507c03ecc3851b3271078ba1c0b437
+SIZE (openvpn-admin-1.9.3b.tar.gz) = 351571
diff --git a/security/openvpn-admin/files/patch-src_Configuration.cs b/security/openvpn-admin/files/patch-src_Configuration.cs
deleted file mode 100644
index fd69e84a1904..000000000000
--- a/security/openvpn-admin/files/patch-src_Configuration.cs
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Configuration.cs.orig	Tue Nov 22 01:46:04 2005
-+++ src/Configuration.cs	Sun Feb 26 15:09:48 2006
-@@ -459,8 +459,8 @@
- 			int pid = Int32.Parse(Configuration.GetFileContents(pidfile, true));
- 			
- 			// Only for Mono after 1.9.1 releases.
--			//Mono.Unix.Native.Syscall.kill(pid, Mono.Unix.Native.Signum.SIGKILL);
--			Mono.Unix.Syscall.kill(pid, Mono.Unix.Signum.SIGKILL);
-+			Mono.Unix.Native.Syscall.kill(pid, Mono.Unix.Native.Signum.SIGKILL);
-+			//Mono.Unix.Syscall.kill(pid, Mono.Unix.Signum.SIGKILL);
- 
- 			File.Delete(pidfile);
- 			File.Delete(stafile);
diff --git a/security/openvpn-admin/pkg-plist b/security/openvpn-admin/pkg-plist
index bbeab48b3dfd..2103663fb73a 100644
--- a/security/openvpn-admin/pkg-plist
+++ b/security/openvpn-admin/pkg-plist
@@ -1,7 +1,6 @@
-sbin/openvpn-admin
 lib/openvpn-admin/openvpn-admin.exe
-etc/pam.d/openvpn-admin
-%%DATADIR%%/openvpn-admin.desktop
-@dirrm %%DATADIR%%
+sbin/openvpn-admin
+share/applications/openvpn-admin.desktop
+@dirrmtry share/applications
 @dirrm lib/openvpn-admin
 @dirrmtry etc/openvpn