Index: head/emulators/dynagui/Makefile =================================================================== --- head/emulators/dynagui/Makefile (revision 439028) +++ head/emulators/dynagui/Makefile (revision 439029) @@ -1,26 +1,31 @@ # Created by: Andrew Greenwood # $FreeBSD$ PORTNAME= dynagui PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DIST_SUBDIR= dynagui MAINTAINER= ports@FreeBSD.org COMMENT= GUI frontend to the dynamips router simulator +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= dynagen:emulators/dynagen -USES= python +USES= python shebangfix +SHEBANG_FILES= dynagui.py USE_PYTHON= distutils IMGDIR= ${STAGEDIR}${PREFIX}/share/${PORTNAME}/img +NO_ARCH= yes post-install: @${MKDIR} ${IMGDIR} ${INSTALL_DATA} ${WRKSRC}/img/* ${IMGDIR} ${CHMOD} 755 ${STAGEDIR}${PYTHON_SITELIBDIR}/dynagui.py ${LN} -sf ${PYTHON_SITELIBDIR}/dynagui.py ${STAGEDIR}${PREFIX}/bin/dynagui.py .include Index: head/emulators/dynagui/files/patch-libs_gui_c7200.py =================================================================== --- head/emulators/dynagui/files/patch-libs_gui_c7200.py (revision 439028) +++ head/emulators/dynagui/files/patch-libs_gui_c7200.py (nonexistent) @@ -1,11 +0,0 @@ ---- libs/gui_c7200.py.orig 2009-02-09 14:29:55.000000000 -0500 -+++ libs/gui_c7200.py 2009-02-09 14:30:28.000000000 -0500 -@@ -412,7 +412,7 @@ - - class GuiC7200(C7200, GuiRouter): - pixmap = cairo.ImageSurface.create_from_png( -- os.path.join('img', 'chassis.png')) -+ os.path.join('/usr/local/share/dynagui/img', 'chassis.png')) - - def __init__(self, dynamips, x=10, y=10, name=None): - GuiRouter.__init__(self, x, y) Property changes on: head/emulators/dynagui/files/patch-libs_gui_c7200.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/dynagui/files/patch-dynagui.py =================================================================== --- head/emulators/dynagui/files/patch-dynagui.py (revision 439028) +++ head/emulators/dynagui/files/patch-dynagui.py (revision 439029) @@ -1,40 +1,40 @@ ---- dynagui.py.orig 2007-12-13 16:04:43.000000000 -0500 -+++ dynagui.py 2009-02-05 18:42:36.000000000 -0500 -@@ -27,17 +27,17 @@ +--- dynagui.py.orig 2007-12-13 21:04:43 UTC ++++ dynagui.py +@@ -27,17 +27,17 @@ import sys import pygtk; pygtk.require('2.0') import gtk import gobject -from libs.canvas import MyCanvas -from libs import lab_io -from libs.lab import lab -from libs.gui_router import GuiRouter -from libs.dynamips_properties_dialog import DynamipsPropertiesDialog -from libs.C3600_properties_dialog import C3600PropertiesDialog -from libs.C7200_properties_dialog import C7200PropertiesDialog -from libs.frsw_properties_dialog import FRSwitchPropertiesDialog -from libs.atmsw_properties_dialog import ATMSwitchPropertiesDialog -from libs.ethsw_properties_dialog import EthSwitchPropertiesDialog -from libs.util import RouterSelectionDialog +from dynagui_libs.canvas import MyCanvas +from dynagui_libs import lab_io +from dynagui_libs.lab import lab +from dynagui_libs.gui_router import GuiRouter +from dynagui_libs.dynamips_properties_dialog import DynamipsPropertiesDialog +from dynagui_libs.C3600_properties_dialog import C3600PropertiesDialog +from dynagui_libs.C7200_properties_dialog import C7200PropertiesDialog +from dynagui_libs.frsw_properties_dialog import FRSwitchPropertiesDialog +from dynagui_libs.atmsw_properties_dialog import ATMSwitchPropertiesDialog +from dynagui_libs.ethsw_properties_dialog import EthSwitchPropertiesDialog +from dynagui_libs.util import RouterSelectionDialog ui_popup = \ -@@ -509,7 +509,7 @@ +@@ -509,7 +509,7 @@ class DynaguiFrame(gtk.Window): if len(lab.devices)>0: text = 'Select routers from which to extract configuration' rcd = RouterSelectionDialog(lab.devices, text, show_path=True) - from libs.nvram_io import read_conf_b64gz + from dynagui_libs.nvram_io import read_conf_b64gz for d in rcd.selected_devices: cgz64 = d.config_gz64 conf = read_conf_b64gz(cgz64) Index: head/emulators/dynagui/files/patch-libs_canvas.py =================================================================== --- head/emulators/dynagui/files/patch-libs_canvas.py (revision 439028) +++ head/emulators/dynagui/files/patch-libs_canvas.py (revision 439029) @@ -1,35 +1,35 @@ ---- libs/canvas.py.orig 2007-09-24 17:33:03.000000000 -0400 -+++ libs/canvas.py 2009-02-05 18:43:07.000000000 -0500 -@@ -25,19 +25,19 @@ +--- libs/canvas.py.orig 2007-09-24 21:33:03 UTC ++++ libs/canvas.py +@@ -25,19 +25,19 @@ import gtk import time from gtk import gdk import dynamips_lib -from libs.lab import lab, Connection -from libs.util import setup_ghost -from libs.gui_c3600 import GuiC3600 -from libs.gui_c7200 import GuiC7200 -from libs.gui_router import GuiRouter -from libs.gui_frsw import GuiFRSwitch -from libs.gui_atmsw import GuiATMSwitch -from libs.gui_ethsw import GuiEthSwitch -from libs.C3600_properties_dialog import C3600PropertiesDialog -from libs.C7200_properties_dialog import C7200PropertiesDialog -from libs.frsw_properties_dialog import FRSwitchPropertiesDialog -from libs.atmsw_properties_dialog import ATMSwitchPropertiesDialog -from libs.ethsw_properties_dialog import EthSwitchPropertiesDialog +from dynagui_libs.lab import lab, Connection +from dynagui_libs.util import setup_ghost +from dynagui_libs.gui_c3600 import GuiC3600 +from dynagui_libs.gui_c7200 import GuiC7200 +from dynagui_libs.gui_router import GuiRouter +from dynagui_libs.gui_frsw import GuiFRSwitch +from dynagui_libs.gui_atmsw import GuiATMSwitch +from dynagui_libs.gui_ethsw import GuiEthSwitch +from dynagui_libs.C3600_properties_dialog import C3600PropertiesDialog +from dynagui_libs.C7200_properties_dialog import C7200PropertiesDialog +from dynagui_libs.frsw_properties_dialog import FRSwitchPropertiesDialog +from dynagui_libs.atmsw_properties_dialog import ATMSwitchPropertiesDialog +from dynagui_libs.ethsw_properties_dialog import EthSwitchPropertiesDialog term = 'xterm' # linux terminal win_telnet = "telnet " # windows terminal Index: head/emulators/dynagui/files/patch-libs_gui__c7200.py =================================================================== --- head/emulators/dynagui/files/patch-libs_gui__c7200.py (nonexistent) +++ head/emulators/dynagui/files/patch-libs_gui__c7200.py (revision 439029) @@ -0,0 +1,11 @@ +--- libs/gui_c7200.py.orig 2007-10-31 18:55:27 UTC ++++ libs/gui_c7200.py +@@ -412,7 +412,7 @@ class GuiC7200_IO_2FE(PA_C7200_IO_2FE): + + class GuiC7200(C7200, GuiRouter): + pixmap = cairo.ImageSurface.create_from_png( +- os.path.join('img', 'chassis.png')) ++ os.path.join('/usr/local/share/dynagui/img', 'chassis.png')) + + def __init__(self, dynamips, x=10, y=10, name=None): + GuiRouter.__init__(self, x, y) Property changes on: head/emulators/dynagui/files/patch-libs_gui__c7200.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/dynagui/files/patch-setup.py =================================================================== --- head/emulators/dynagui/files/patch-setup.py (revision 439028) +++ head/emulators/dynagui/files/patch-setup.py (revision 439029) @@ -1,23 +1,23 @@ ---- setup.py.orig 1969-12-31 19:00:00.000000000 -0500 -+++ setup.py 2009-02-09 11:03:10.000000000 -0500 +--- setup.py.orig 2017-04-20 14:00:44 UTC ++++ setup.py @@ -0,0 +1,20 @@ +#!/usr/bin/env python + +from distutils.core import setup +import os + +try: + os.rename('libs','dynagui_libs') +except: + pass + +setup( name='dynagui', + version='0.4', + description='GUI-based frontend for the dynamips emulator', + author='', + author_email='', + url='', + py_modules=['dynagui'], + packages=['dynagui_libs'], + ) + Index: head/emulators/dynagui/pkg-descr =================================================================== --- head/emulators/dynagui/pkg-descr (revision 439028) +++ head/emulators/dynagui/pkg-descr (revision 439029) @@ -1,5 +1,5 @@ Dynagui is a GUI frontend to the dynamips Cisco 7200/36XX router simulator. It uses the dyna-gen library in order to communicate with the dynamips hypervisor. -WWW: http://dynagui.sourceforge.net +WWW: http://dynagui.sourceforge.net/