From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 19 14:10:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1132A106567A for ; Thu, 19 Jun 2008 14:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CEA3E8FC15 for ; Thu, 19 Jun 2008 14:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m5JEA16A073855 for ; Thu, 19 Jun 2008 14:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m5JEA1h8073854; Thu, 19 Jun 2008 14:10:01 GMT (envelope-from gnats) Resent-Date: Thu, 19 Jun 2008 14:10:01 GMT Resent-Message-Id: <200806191410.m5JEA1h8073854@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pavel I Volkov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 315B7106567C for ; Thu, 19 Jun 2008 14:01:37 +0000 (UTC) (envelope-from pol@opk.ru) Received: from fobosfort.iib.ru (fobosfort.iib.ru [195.151.95.22]) by mx1.freebsd.org (Postfix) with ESMTP id 5D5D88FC1E for ; Thu, 19 Jun 2008 14:01:36 +0000 (UTC) (envelope-from pol@opk.ru) Received: from saturn.iib.ru (saturn.iib.ru [192.168.49.101]) by fobosfort.iib.ru (8.9/8.9) with ESMTP id m5JDVdcN066647 for ; Thu, 19 Jun 2008 17:31:39 +0400 (MSD) (envelope-from pol@opk.ru) Received: from 192.168.0.100 by 192.168.0.101 with smtp-gw id normnAaOzs; Thu, 19 Jun 2008 13:31:52 GMT Received: from pol.iib.ru (pol.iib.ru [192.168.0.45]) by mars.iib.ru (8.13.3/8.13.3) with ESMTP id m5JDVdcr031773 for ; Thu, 19 Jun 2008 17:31:40 +0400 (MSD) (envelope-from pol@opk.ru) Received: from pol.iib.ru (localhost [127.0.0.1]) by pol.iib.ru (8.14.2/8.14.2) with ESMTP id m5JDVERH004948 for ; Thu, 19 Jun 2008 17:31:14 +0400 (MSD) (envelope-from pol@pol.iib.ru) Received: (from pol@localhost) by pol.iib.ru (8.14.2/8.14.2/Submit) id m5JDTnVS004930; Thu, 19 Jun 2008 17:29:49 +0400 (MSD) (envelope-from pol) Message-Id: <200806191329.m5JDTnVS004930@pol.iib.ru> Date: Thu, 19 Jun 2008 17:29:49 +0400 (MSD) From: Pavel I Volkov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/124759: [MAINTAINER] emulators/dynagen: update to 0.11.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2008 14:10:02 -0000 >Number: 124759 >Category: ports >Synopsis: [MAINTAINER] emulators/dynagen: update to 0.11.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jun 19 14:10:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Pavel I Volkov >Release: FreeBSD 7.0-STABLE i386 >Organization: >Environment: System: FreeBSD pol.opk.ru 7.0-STABLE FreeBSD 7.0-STABLE #0: Mon May 26 13:48:12 MSD 2008 >Description: - Update to 0.11.0 Added file(s): - files/patch-confConsole.py - files/patch-console.py - files/patch-pemu_lib.py Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- dynagen-0.11.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/emulators/dynagen.orig/Makefile /usr/ports/emulators/dynagen/Makefile --- /usr/ports/emulators/dynagen.orig/Makefile 2008-06-12 02:40:37.000000000 +0400 +++ /usr/ports/emulators/dynagen/Makefile 2008-06-19 16:50:07.000000000 +0400 @@ -1,25 +1,25 @@ # New ports collection makefile for: dynagen # Date created: 2006-11-07 # Whom: trasz +# Whom: Pavel Volkov # # $FreeBSD: ports/emulators/dynagen/Makefile,v 1.11 2008/06/11 10:42:21 trasz Exp $ # PORTNAME= dynagen -PORTVERSION= 0.9.3 -PORTREVISION= 1 +PORTVERSION= 0.11.0 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= dyna-gen MAINTAINER= pol@opk.ru -COMMENT= Text-based front end for Dynamips +COMMENT= Text-based front end for Dynamips development version -RUN_DEPENDS= dynamips:${PORTSDIR}/emulators/dynamips +RUN_DEPENDS= dynamips:${PORTSDIR}/emulators/dynamips-devel +# Note that it *should* be dynamips-devel but that port installs it as dynamips USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_PKGVERSION= 0.4.4 ALL_TARGET= # empty USE_GCC= 3.4+ USE_DOS2UNIX= yes @@ -43,16 +43,18 @@ .endif ${MKDIR} ${EXAMPLESDIR} ${MKDIR} ${EXAMPLESDIR}/sample_labs - ${MKDIR} ${EXAMPLESDIR}/sample_labs/simple1 - ${INSTALL_DATA} ${WRKSRC}/sample_labs/simple1/simple1.net ${EXAMPLESDIR}/sample_labs/simple1 - ${MKDIR} ${EXAMPLESDIR}/sample_labs/multiserver - ${INSTALL_DATA} ${WRKSRC}/sample_labs/multiserver/multiserver.net ${EXAMPLESDIR}/sample_labs/multiserver + ${MKDIR} ${EXAMPLESDIR}/sample_labs/ethernet_switch + ${INSTALL_DATA} ${WRKSRC}/sample_labs/ethernet_switch/ethsw1.net ${EXAMPLESDIR}/sample_labs/ethernet_switch ${MKDIR} ${EXAMPLESDIR}/sample_labs/frame_relay ${INSTALL_DATA} ${WRKSRC}/sample_labs/frame_relay/frame_relay1.net ${EXAMPLESDIR}/sample_labs/frame_relay + ${MKDIR} ${EXAMPLESDIR}/sample_labs/multiserver + ${INSTALL_DATA} ${WRKSRC}/sample_labs/multiserver/multiserver.net ${EXAMPLESDIR}/sample_labs/multiserver + ${MKDIR} ${EXAMPLESDIR}/sample_labs/pix + ${INSTALL_DATA} ${WRKSRC}/sample_labs/pix/pixtest.net ${EXAMPLESDIR}/sample_labs/pix + ${MKDIR} ${EXAMPLESDIR}/sample_labs/simple1 + ${INSTALL_DATA} ${WRKSRC}/sample_labs/simple1/simple1.net ${EXAMPLESDIR}/sample_labs/simple1 ${MKDIR} ${EXAMPLESDIR}/sample_labs/simple2 ${INSTALL_DATA} ${WRKSRC}/sample_labs/simple2/simple2.net ${EXAMPLESDIR}/sample_labs/simple2 - ${MKDIR} ${EXAMPLESDIR}/sample_labs/ethernet_switch - ${INSTALL_DATA} ${WRKSRC}/sample_labs/ethernet_switch/ethsw1.net ${EXAMPLESDIR}/sample_labs/ethernet_switch ${INSTALL_DATA} ${WRKSRC}/sample_labs/all_config_options.txt ${EXAMPLESDIR}/sample_labs .include diff -ruN --exclude=CVS /usr/ports/emulators/dynagen.orig/distinfo /usr/ports/emulators/dynagen/distinfo --- /usr/ports/emulators/dynagen.orig/distinfo 2007-07-05 04:16:02.000000000 +0400 +++ /usr/ports/emulators/dynagen/distinfo 2008-06-10 20:37:51.000000000 +0400 @@ -1,3 +1,3 @@ -MD5 (dynagen-0.9.3.tar.gz) = 89e9715f968e9d00fd73d718450ce658 -SHA256 (dynagen-0.9.3.tar.gz) = b2a22658fb54f92d15dfc6063f8f9abb959fb6a54804091db658ef70e0de88ab -SIZE (dynagen-0.9.3.tar.gz) = 606741 +MD5 (dynagen-0.11.0.tar.gz) = 3f88b3449b17096dca84d007f0b91b3f +SHA256 (dynagen-0.11.0.tar.gz) = 53523fe13e151c0476596315aa724d50c6523ab72bb64d0ffc8d3ea8ad4e9628 +SIZE (dynagen-0.11.0.tar.gz) = 1418846 diff -ruN --exclude=CVS /usr/ports/emulators/dynagen.orig/files/patch-confConsole.py /usr/ports/emulators/dynagen/files/patch-confConsole.py --- /usr/ports/emulators/dynagen.orig/files/patch-confConsole.py 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/emulators/dynagen/files/patch-confConsole.py 2008-06-11 14:54:49.000000000 +0400 @@ -0,0 +1,8 @@ +--- confConsole.py.orig 2008-06-11 14:54:32.000000000 +0400 ++++ confConsole.py 2008-06-11 14:54:43.000000000 +0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/local/bin/python + # -*- coding: utf-8 -*- + + """ diff -ruN --exclude=CVS /usr/ports/emulators/dynagen.orig/files/patch-console.py /usr/ports/emulators/dynagen/files/patch-console.py --- /usr/ports/emulators/dynagen.orig/files/patch-console.py 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/emulators/dynagen/files/patch-console.py 2008-06-11 14:54:49.000000000 +0400 @@ -0,0 +1,8 @@ +--- console.py.orig 2008-06-11 14:53:38.000000000 +0400 ++++ console.py 2008-06-11 14:53:57.000000000 +0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/local/bin/python + # -*- coding: utf-8 -*- + + """ diff -ruN --exclude=CVS /usr/ports/emulators/dynagen.orig/files/patch-dynagen /usr/ports/emulators/dynagen/files/patch-dynagen --- /usr/ports/emulators/dynagen.orig/files/patch-dynagen 2007-07-05 04:16:03.000000000 +0400 +++ /usr/ports/emulators/dynagen/files/patch-dynagen 2008-06-11 14:45:35.000000000 +0400 @@ -1,11 +1,17 @@ ---- dynagen.orig Sun Feb 18 17:28:09 2007 -+++ dynagen Mon Feb 26 16:50:51 2007 -@@ -34,7 +34,7 @@ +--- dynagen.orig 2008-06-11 11:42:34.000000000 +0400 ++++ dynagen 2008-06-11 12:18:16.000000000 +0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/local/bin/python + # -*- coding: utf-8 -*- + + """ +@@ -41,7 +41,7 @@ # Constants - VERSION = '0.9.3.061007' --CONFIGSPECPATH = [ "/usr/share/dynagen", "/usr/local/share" ] -+CONFIGSPECPATH = [ "/usr/local/share/dynagen", "/usr/share/dynagen", "/usr/local/share" ] + VERSION = '0.11.0' +-CONFIGSPECPATH = ['/usr/share/dynagen', '/usr/local/share'] ++CONFIGSPECPATH = ['/usr/local/share/dynagen', '/usr/share/dynagen', '/usr/local/share'] CONFIGSPEC = 'configspec' - INIPATH = [ "/etc", "/usr/local/etc" ] + INIPATH = ['/etc', '/usr/local/etc'] INIFILE = 'dynagen.ini' diff -ruN --exclude=CVS /usr/ports/emulators/dynagen.orig/files/patch-dynamips_lib.py /usr/ports/emulators/dynagen/files/patch-dynamips_lib.py --- /usr/ports/emulators/dynagen.orig/files/patch-dynamips_lib.py 2007-07-05 04:16:03.000000000 +0400 +++ /usr/ports/emulators/dynagen/files/patch-dynamips_lib.py 2008-06-11 14:54:49.000000000 +0400 @@ -1,15 +1,8 @@ ---- dynamips_lib.py.orig Sun Feb 18 17:28:09 2007 -+++ dynamips_lib.py Mon Feb 26 21:05:00 2007 -@@ -1411,7 +1411,11 @@ - flag = '1' - else: - flag = '0' -- send(self.__d, 'vm set_sparse_mem %s %s' % (self.__name, flag)) -+ -+ # Workaround for "*** Error: Unknown command 'set_sparse_mem'" message -+ # with dynamips-0.2.5. -+ if flag == 1: -+ send(self.__d, 'vm set_sparse_mem %s %s' % (self.__name, flag)) +--- dynamips_lib.py.orig 2008-06-11 14:52:21.000000000 +0400 ++++ dynamips_lib.py 2008-06-11 14:52:36.000000000 +0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/local/bin/python + # -*- coding: utf-8 -*- - def __getsparsemem(self): - """ Returns the sparsemem + """ diff -ruN --exclude=CVS /usr/ports/emulators/dynagen.orig/files/patch-pemu_lib.py /usr/ports/emulators/dynagen/files/patch-pemu_lib.py --- /usr/ports/emulators/dynagen.orig/files/patch-pemu_lib.py 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/emulators/dynagen/files/patch-pemu_lib.py 2008-06-11 14:54:49.000000000 +0400 @@ -0,0 +1,8 @@ +--- pemu_lib.py.orig 2008-06-11 14:50:50.000000000 +0400 ++++ pemu_lib.py 2008-06-11 14:51:02.000000000 +0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/local/bin/python + # -*- coding: utf-8 -*- + + """ diff -ruN --exclude=CVS /usr/ports/emulators/dynagen.orig/files/patch-setup.py /usr/ports/emulators/dynagen/files/patch-setup.py --- /usr/ports/emulators/dynagen.orig/files/patch-setup.py 2006-11-25 13:33:33.000000000 +0300 +++ /usr/ports/emulators/dynagen/files/patch-setup.py 2008-06-11 11:40:57.000000000 +0400 @@ -1,5 +1,5 @@ ---- /dev/null Sat Nov 25 10:03:22 2006 -+++ setup.py Wed Oct 11 02:08:24 2006 +--- /dev/null 2008-06-11 11:33:00.000000000 +0400 ++++ setup.py 2008-06-11 11:38:41.000000000 +0400 @@ -0,0 +1,22 @@ +#!/usr/bin/env python + @@ -10,15 +10,15 @@ + +setup( # Distribution meta-data + name = "dynagen", -+ version = "0.4.4", ++ version = "0.11.0", + description = "A frontend for dynamips", + author = "Greg Anuzelli", + author_email = "dynagen@gmail.com", + url = "http://sourceforge.net/projects/dyna-gen", + -+ #py_modules = [ 'console', 'dynamips_lib'] -+ py_modules = [ 'configobj', 'console', 'dynamips_lib', -+ 'validate'] ++ py_modules = ['confConsole','configobj','console','dynamips_lib', ++ 'pemu_lib', 'pemubin', 'pemuwrapper', ++ 'validate'] +) + +print "If you have installed the modules, copy dynagen to some " diff -ruN --exclude=CVS /usr/ports/emulators/dynagen.orig/pkg-plist /usr/ports/emulators/dynagen/pkg-plist --- /usr/ports/emulators/dynagen.orig/pkg-plist 2007-07-05 04:16:02.000000000 +0400 +++ /usr/ports/emulators/dynagen/pkg-plist 2008-06-11 12:04:50.000000000 +0400 @@ -2,35 +2,52 @@ @unexec if cmp -s %D/etc/dynagen.ini.sample %D/etc/dynagen.ini; then rm -f %D/etc/dynagen.ini; fi etc/dynagen.ini.sample @exec if [ ! -f %D/etc/dynagen.ini ] ; then cp -p %D/%F %B/dynagen.ini; fi +lib/%%PYTHON_VERSION%%/site-packages/confConsole.py lib/%%PYTHON_VERSION%%/site-packages/configobj.py lib/%%PYTHON_VERSION%%/site-packages/console.py lib/%%PYTHON_VERSION%%/site-packages/dynamips_lib.py +lib/%%PYTHON_VERSION%%/site-packages/pemu_lib.py +lib/%%PYTHON_VERSION%%/site-packages/pemubin.py +lib/%%PYTHON_VERSION%%/site-packages/pemuwrapper.py lib/%%PYTHON_VERSION%%/site-packages/validate.py +lib/%%PYTHON_VERSION%%/site-packages/confConsole.pyc lib/%%PYTHON_VERSION%%/site-packages/configobj.pyc lib/%%PYTHON_VERSION%%/site-packages/console.pyc lib/%%PYTHON_VERSION%%/site-packages/dynamips_lib.pyc +lib/%%PYTHON_VERSION%%/site-packages/pemu_lib.pyc +lib/%%PYTHON_VERSION%%/site-packages/pemubin.pyc +lib/%%PYTHON_VERSION%%/site-packages/pemuwrapper.pyc lib/%%PYTHON_VERSION%%/site-packages/validate.pyc +lib/%%PYTHON_VERSION%%/site-packages/confConsole.pyo lib/%%PYTHON_VERSION%%/site-packages/configobj.pyo lib/%%PYTHON_VERSION%%/site-packages/console.pyo lib/%%PYTHON_VERSION%%/site-packages/dynamips_lib.pyo +lib/%%PYTHON_VERSION%%/site-packages/pemu_lib.pyo +lib/%%PYTHON_VERSION%%/site-packages/pemubin.pyo +lib/%%PYTHON_VERSION%%/site-packages/pemuwrapper.pyo lib/%%PYTHON_VERSION%%/site-packages/validate.pyo -%%EXAMPLESDIR%%/sample_labs/simple1/simple1.net -%%EXAMPLESDIR%%/sample_labs/multiserver/multiserver.net +%%EXAMPLESDIR%%/sample_labs/ethernet_switch/ethsw1.net %%EXAMPLESDIR%%/sample_labs/frame_relay/frame_relay1.net +%%EXAMPLESDIR%%/sample_labs/multiserver/multiserver.net +%%EXAMPLESDIR%%/sample_labs/pix/pixtest.net +%%EXAMPLESDIR%%/sample_labs/simple1/simple1.net %%EXAMPLESDIR%%/sample_labs/simple2/simple2.net -%%EXAMPLESDIR%%/sample_labs/ethernet_switch/ethsw1.net %%EXAMPLESDIR%%/sample_labs/all_config_options.txt -@dirrm %%EXAMPLESDIR%%/sample_labs/simple1 -@dirrm %%EXAMPLESDIR%%/sample_labs/multiserver +@dirrm %%EXAMPLESDIR%%/sample_labs/ethernet_switch @dirrm %%EXAMPLESDIR%%/sample_labs/frame_relay +@dirrm %%EXAMPLESDIR%%/sample_labs/multiserver +@dirrm %%EXAMPLESDIR%%/sample_labs/pix +@dirrm %%EXAMPLESDIR%%/sample_labs/simple1 @dirrm %%EXAMPLESDIR%%/sample_labs/simple2 -@dirrm %%EXAMPLESDIR%%/sample_labs/ethernet_switch @dirrm %%EXAMPLESDIR%%/sample_labs @dirrm %%EXAMPLESDIR%% %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image001.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image002.gif +%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image002.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image003.gif +%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image003.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image004.gif +%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image004.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image005.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image006.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image007.jpg @@ -38,9 +55,13 @@ %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image009.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image010.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image011.gif +%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image011.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image012.gif +%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image012.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image013.gif +%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image013.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image014.gif +%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image014.jpg %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image015.gif %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image016.gif %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image017.gif --- dynagen-0.11.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: