5 files changed, 36 insertions, 10 deletions

diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index cb2e671b71c5..0e09d0dc5648 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	gns3
-# Date created:		24 may 2009
-# Whom:			Olivier Cochard-Labbe <olivier@cochard.me>
-#
+# Created by:			Olivier Cochard-Labbe <olivier@cochard.me>
 # $FreeBSD$
-#
 
 PORTNAME=	gns3
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.3.1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/gns-3/GNS3/${PORTVERSION}
 DISTNAME=	GNS3-${PORTVERSION}-src
@@ -16,7 +11,6 @@ MAINTAINER=	olivier@cochard.me
 COMMENT=	Graphical Cisco network simulator
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	qemu:${PORTSDIR}/emulators/qemu
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
@@ -30,6 +24,8 @@ USE_PYTHON=		2.6+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	GNS3
 
+DESKTOP_ENTRIES=	"GNS3" "${COMMENT}" "" "${PORTNAME}" "System;Emulator" "true"
+
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
diff --git a/emulators/gns3/distinfo b/emulators/gns3/distinfo
index b14a48773d9e..c203cc4d6e55 100644
--- a/emulators/gns3/distinfo
+++ b/emulators/gns3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GNS3-0.8.2-src.tar.gz) = e72553afe0c919aff54bedb4b639ebfcee83725eef28128bbb5076e226628a86
-SIZE (GNS3-0.8.2-src.tar.gz) = 3992183
+SHA256 (GNS3-0.8.3.1-src.tar.gz) = d842a7ceb8619a43fe1a95095d435a31128822bc88b23354fbccb80838ebc404
+SIZE (GNS3-0.8.3.1-src.tar.gz) = 4055595
diff --git a/emulators/gns3/files/patch-Defaults.py b/emulators/gns3/files/patch-Defaults.py
new file mode 100644
index 000000000000..ab67a3b2b502
--- /dev/null
+++ b/emulators/gns3/files/patch-Defaults.py
@@ -0,0 +1,11 @@
+--- src/GNS3/Config/Defaults.py.orig	2012-10-22 19:17:09.000000000 +0200
++++ src/GNS3/Config/Defaults.py	2012-10-27 00:55:58.000000000 +0200
+@@ -65,7 +65,7 @@
+     QEMUWRAPPER_DEFAULT_WORKDIR = unicode('/tmp')
+ 
+ # Default paths to Qemu and qemu-img
+-if sys.platform.startswith('win'):
++if sys.platform.startswith('win') or sys.platform.startswith('freebsd'):
+     QEMU_DEFAULT_PATH = unicode('qemu')
+     QEMU_IMG_DEFAULT_PATH = unicode('qemu-img')
+ else:
diff --git a/emulators/gns3/files/patch-qemuwrapper.py b/emulators/gns3/files/patch-qemuwrapper.py
new file mode 100644
index 000000000000..d62555ab0d3f
--- /dev/null
+++ b/emulators/gns3/files/patch-qemuwrapper.py
@@ -0,0 +1,11 @@
+--- qemuwrapper/qemuwrapper.py.orig	2012-10-27 00:41:23.000000000 +0200
++++ qemuwrapper/qemuwrapper.py	2012-10-27 00:43:33.000000000 +0200
+@@ -83,7 +83,7 @@
+ __author__ = 'Thomas Pani and Jeremy Grossmann'
+ __version__ = '0.8.3.1'
+ 
+-if platform.system() == 'Windows':
++if platform.system() == 'Windows' or platform.system().__contains__("BSD"):
+     QEMU_PATH = "qemu" # we still use Qemu 0.11.0 on Windows
+ else:
+     QEMU_PATH = "qemu-system-i386"
diff --git a/emulators/gns3/pkg-plist b/emulators/gns3/pkg-plist
index 1aae29415400..5e940167771c 100644
--- a/emulators/gns3/pkg-plist
+++ b/emulators/gns3/pkg-plist
@@ -1,8 +1,10 @@
 bin/gns3
 libexec/gns3/qemuwrapper.py
+libexec/gns3/tcp_pipe_proxy.py
 libexec/gns3/vboxcontroller_4_1.py
 libexec/gns3/vboxwrapper.py
 %%EXAMPLESDIR%%/baseconfig.txt
+%%EXAMPLESDIR%%/baseconfig_sw.txt
 %%PYTHON_SITELIBDIR%%/GNS3/Annotation.py
 %%PYTHON_SITELIBDIR%%/GNS3/Annotation.pyc
 %%PYTHON_SITELIBDIR%%/GNS3/Annotation.pyo
@@ -79,6 +81,9 @@ libexec/gns3/vboxwrapper.py
 %%PYTHON_SITELIBDIR%%/GNS3/Dynagen/dynamips_lib.py
 %%PYTHON_SITELIBDIR%%/GNS3/Dynagen/dynamips_lib.pyc
 %%PYTHON_SITELIBDIR%%/GNS3/Dynagen/dynamips_lib.pyo
+%%PYTHON_SITELIBDIR%%/GNS3/Dynagen/portTracker_lib.py
+%%PYTHON_SITELIBDIR%%/GNS3/Dynagen/portTracker_lib.pyc
+%%PYTHON_SITELIBDIR%%/GNS3/Dynagen/portTracker_lib.pyo
 %%PYTHON_SITELIBDIR%%/GNS3/Dynagen/qemu_lib.py
 %%PYTHON_SITELIBDIR%%/GNS3/Dynagen/qemu_lib.pyc
 %%PYTHON_SITELIBDIR%%/GNS3/Dynagen/qemu_lib.pyo
@@ -162,6 +167,9 @@ libexec/gns3/vboxwrapper.py
 %%PYTHON_SITELIBDIR%%/GNS3/Link/Ethernet.py
 %%PYTHON_SITELIBDIR%%/GNS3/Link/Ethernet.pyc
 %%PYTHON_SITELIBDIR%%/GNS3/Link/Ethernet.pyo
+%%PYTHON_SITELIBDIR%%/GNS3/Link/PipeCapture.py
+%%PYTHON_SITELIBDIR%%/GNS3/Link/PipeCapture.pyc
+%%PYTHON_SITELIBDIR%%/GNS3/Link/PipeCapture.pyo
 %%PYTHON_SITELIBDIR%%/GNS3/Link/Serial.py
 %%PYTHON_SITELIBDIR%%/GNS3/Link/Serial.pyc
 %%PYTHON_SITELIBDIR%%/GNS3/Link/Serial.pyo