6 files changed, 43 insertions, 10 deletions

diff --git a/security/kovpn/Makefile b/security/kovpn/Makefile
index aba8fc0221f9..8f9ad13cbe3d 100644
--- a/security/kovpn/Makefile
+++ b/security/kovpn/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	kovpn
-PORTVERSION=	0.2
+PORTVERSION=	0.3
 CATEGORIES=	security kde
 MASTER_SITES=	http://home.bawue.de/~lighter/www.enlighter.de/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}_pre6
 
 MAINTAINER=	anderson@cnpm.embrapa.br
 COMMENT=	A simple GUI for OpenVPN clients
 
 RUN_DEPENDS=	openvpn:${PORTSDIR}/security/openvpn
 
-WRKSRC=		${WRKDIR}/kovpn
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
diff --git a/security/kovpn/distinfo b/security/kovpn/distinfo
index de7e5ae03e32..cd14cd4f0c48 100644
--- a/security/kovpn/distinfo
+++ b/security/kovpn/distinfo
@@ -1,3 +1,3 @@
-SIZE (kovpn-0.2.tar.bz2) = 487299
-MD5 (kovpn-0.2.tar.bz2) = 141f3833b3f482aa8ac967d948a879a0
-SHA256 (kovpn-0.2.tar.bz2) = a32e3d9e8564ce293e8f3acdbca2236e6c07a34cd25f9175458120f4a278d6e1
+MD5 (kovpn-0.3_pre6.tar.bz2) = 5cb3ddf5248d3d83b96d831555ef1cf7
+SHA256 (kovpn-0.3_pre6.tar.bz2) = 98644c91c89e682fd0804337ad0d12eb5b2ef57f88104805492ca23d64c3f75b
+SIZE (kovpn-0.3_pre6.tar.bz2) = 860206
diff --git a/security/kovpn/files/patch-src-openvpnmanager.cpp b/security/kovpn/files/patch-src-openvpnmanager.cpp
index 52f51cd6be7b..1ae54a9379a6 100644
--- a/security/kovpn/files/patch-src-openvpnmanager.cpp
+++ b/security/kovpn/files/patch-src-openvpnmanager.cpp
@@ -1,6 +1,6 @@
---- src/openvpnmanager.cpp	Fri Mar 31 21:56:53 2006
-+++ src/openvpnmanager.cpp	Tue Apr 11 16:27:47 2006
-@@ -159,7 +159,7 @@
+--- src/openvpnmanager.cpp	Mon Mar 26 10:43:56 2007
++++ src/openvpnmanager.cpp	Mon Mar 26 10:47:06 2007
+@@ -192,7 +192,7 @@
     mConnectionWanted = false;
     mForce = false;
     command( "hold on\n" ); /* OpenVPN does imediatelly reconnect without the hold release. */
diff --git a/security/kovpn/files/patch-src-prefopenvpnlayout.ui b/security/kovpn/files/patch-src-prefopenvpnlayout.ui
new file mode 100644
index 000000000000..59e920e08b6f
--- /dev/null
+++ b/security/kovpn/files/patch-src-prefopenvpnlayout.ui
@@ -0,0 +1,12 @@
+--- src/prefopenvpnlayout.ui.orig	Mon Mar 26 11:14:17 2007
++++ src/prefopenvpnlayout.ui	Mon Mar 26 11:21:50 2007
+@@ -43,6 +43,9 @@
+             <property name="name">
+                 <cstring>groupBox1</cstring>
+             </property>
++            <property name="enabled">
++                <bool>false</bool>
++            </property>
+             <property name="title">
+                 <string>OpenVPN start/stop settings</string>
+             </property>
diff --git a/security/kovpn/files/patch-src-traywindow.cpp b/security/kovpn/files/patch-src-traywindow.cpp
new file mode 100644
index 000000000000..1510dba18c41
--- /dev/null
+++ b/security/kovpn/files/patch-src-traywindow.cpp
@@ -0,0 +1,20 @@
+--- src/traywindow.cpp	Mon Mar 26 10:41:03 2007
++++ src/traywindow.cpp	Mon Mar 26 10:41:27 2007
+@@ -116,7 +116,7 @@
+    delete mDisconnectMenuItems[ manager->id() ];
+ 
+    /* I think (int) manager is unique and static enough to be used as id for the menu */
+-   mContextMenu->removeItem( ( int ) manager );
++   mContextMenu->removeItem( ( size_t ) manager );
+    mManagerMenus.remove( manager->id() );
+    mOvpnManagers.remove( manager );
+ }
+@@ -134,7 +134,7 @@
+ 
+    mManagerMenus[ manager->id() ] = new KPopupMenu( mContextMenu );
+    /* I think (int) manager is unique and static enough to be used as id for the menu */
+-   mContextMenu->insertItem( manager->id() , mManagerMenus[ manager->id() ] , ( int ) manager, 5 );
++   mContextMenu->insertItem( manager->id() , mManagerMenus[ manager->id() ] , ( size_t ) manager, 5 );
+ 
+    mManagerMenus[ manager->id() ] ->insertTitle( i18n( "Status: Unavailable" ), 0 );
+ 
diff --git a/security/kovpn/pkg-plist b/security/kovpn/pkg-plist
index b5dead16b2f8..11909c50e6f0 100644
--- a/security/kovpn/pkg-plist
+++ b/security/kovpn/pkg-plist
@@ -1,4 +1,5 @@
 bin/kovpn
+bin/kovpnsetup
 share/doc/HTML/en/kovpn/common
 share/doc/HTML/en/kovpn/index.docbook
 share/doc/HTML/en/kovpn/index.cache.bz2
@@ -17,7 +18,7 @@ share/applnk/Utilities/kovpn.desktop
 @dirrm share/doc/HTML/en/kovpn
 @dirrm share/apps/kovpn/pics
 @dirrm share/apps/kovpn
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/32x32/apps
 @dirrmtry share/applnk/Utilities
-%%PORTDOCS%%@dirrm %%DOCSDIR%%