From owner-svn-ports-head@FreeBSD.ORG Sat Oct 27 13:04:39 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 28262433; Sat, 27 Oct 2012 13:04:39 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 022EE8FC08; Sat, 27 Oct 2012 13:04:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9RD4cPe080022; Sat, 27 Oct 2012 13:04:38 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9RD4c4g080013; Sat, 27 Oct 2012 13:04:38 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201210271304.q9RD4c4g080013@svn.freebsd.org> From: Pawel Pekala Date: Sat, 27 Oct 2012 13:04:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306499 - in head/emulators/gns3: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2012 13:04:39 -0000 Author: pawel Date: Sat Oct 27 13:04:38 2012 New Revision: 306499 URL: http://svn.freebsd.org/changeset/ports/306499 Log: - Update to version 0.8.3.1 [1] - Don't install another copy of GPLv2 license - Add desktop entry PR: ports/173135 [1] Submitted by: Olivier Cochard-Labbe [1] Feature safe: yes Added: head/emulators/gns3/files/ head/emulators/gns3/files/patch-Defaults.py (contents, props changed) head/emulators/gns3/files/patch-qemuwrapper.py (contents, props changed) Modified: head/emulators/gns3/Makefile head/emulators/gns3/distinfo head/emulators/gns3/pkg-plist Modified: head/emulators/gns3/Makefile ============================================================================== --- head/emulators/gns3/Makefile Sat Oct 27 12:41:38 2012 (r306498) +++ head/emulators/gns3/Makefile Sat Oct 27 13:04:38 2012 (r306499) @@ -1,13 +1,8 @@ -# New ports collection makefile for: gns3 -# Date created: 24 may 2009 -# Whom: Olivier Cochard-Labbe -# +# Created by: Olivier Cochard-Labbe # $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 Modified: head/emulators/gns3/distinfo ============================================================================== --- head/emulators/gns3/distinfo Sat Oct 27 12:41:38 2012 (r306498) +++ head/emulators/gns3/distinfo Sat Oct 27 13:04:38 2012 (r306499) @@ -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 Added: head/emulators/gns3/files/patch-Defaults.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/gns3/files/patch-Defaults.py Sat Oct 27 13:04:38 2012 (r306499) @@ -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: Added: head/emulators/gns3/files/patch-qemuwrapper.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/gns3/files/patch-qemuwrapper.py Sat Oct 27 13:04:38 2012 (r306499) @@ -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" Modified: head/emulators/gns3/pkg-plist ============================================================================== --- head/emulators/gns3/pkg-plist Sat Oct 27 12:41:38 2012 (r306498) +++ head/emulators/gns3/pkg-plist Sat Oct 27 13:04:38 2012 (r306499) @@ -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