From owner-svn-ports-all@FreeBSD.ORG Wed Jun 11 16:38:52 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16FED27D; Wed, 11 Jun 2014 16:38:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC1CF2AB3; Wed, 11 Jun 2014 16:38:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5BGcpf4071922; Wed, 11 Jun 2014 16:38:51 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5BGcoIi071910; Wed, 11 Jun 2014 16:38:50 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406111638.s5BGcoIi071910@svn.freebsd.org> From: John Marino Date: Wed, 11 Jun 2014 16:38:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357506 - in head/emulators/dynagen: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jun 2014 16:38:52 -0000 Author: marino Date: Wed Jun 11 16:38:50 2014 New Revision: 357506 URL: http://svnweb.freebsd.org/changeset/ports/357506 QAT: https://qat.redports.org/buildarchive/r357506/ Log: emulators/dynagen: Add stage support In addition: * Update maintainer address * minor tweaks PR: 190923 submitted by: maintainer (Pavel Volkoy) Modified: head/emulators/dynagen/Makefile head/emulators/dynagen/files/patch-setup.py head/emulators/dynagen/pkg-deinstall head/emulators/dynagen/pkg-descr head/emulators/dynagen/pkg-install Modified: head/emulators/dynagen/Makefile ============================================================================== --- head/emulators/dynagen/Makefile Wed Jun 11 16:38:43 2014 (r357505) +++ head/emulators/dynagen/Makefile Wed Jun 11 16:38:50 2014 (r357506) @@ -3,21 +3,21 @@ PORTNAME= dynagen PORTVERSION= 0.11.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators -MASTER_SITES= SF/dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION} -MAINTAINER= pavelivolkov@googlemail.com +MAINTAINER= pavelivolkov@gmail.com COMMENT= Text-based front end for Dynamips development version LICENSE= GPLv2 -# Note that it *should* be dynamips-devel but that port installs it as dynamips RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.4.0:${PORTSDIR}/devel/py-configobj \ dynamips:${PORTSDIR}/emulators/dynamips-community PLIST_FILES= bin/dynagen \ - etc/dynagen.ini.sample \ + "@sample etc/dynagen.ini.sample" \ %%PYTHON_SITELIBDIR%%/confConsole.py \ %%PYTHON_SITELIBDIR%%/confConsole.pyc \ %%PYTHON_SITELIBDIR%%/confConsole.pyo \ @@ -43,44 +43,35 @@ PORTDATA= * USES= dos2unix USE_PYTHON= yes -USE_PYDISTUTILS= yes +USE_PYDISTUTILS=yes ALL_TARGET= # empty -NO_STAGE= yes post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/dynagen ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/dynagen.ini ${PREFIX}/etc/dynagen.ini.sample - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/configspec ${DATADIR}/configspec - -.ifndef NOPORTDOCS - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/tutorial.htm ${DOCSDIR} - @${MKDIR} ${DOCSDIR}/tutorial_files - ${INSTALL_DATA} ${WRKSRC}/docs/tutorial_files/* ${DOCSDIR}/tutorial_files -.endif - -.ifndef NOPORTEXAMPLES - @${MKDIR} ${EXAMPLESDIR} - @${MKDIR} ${EXAMPLESDIR}/sample_labs - @${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 - ${INSTALL_DATA} ${WRKSRC}/sample_labs/all_config_options.txt ${EXAMPLESDIR}/sample_labs -.endif + ${INSTALL_SCRIPT} ${WRKSRC}/dynagen ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/dynagen.ini ${STAGEDIR}${PREFIX}/etc/dynagen.ini.sample -pre-deinstall: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} DEINSTALL + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/configspec ${STAGEDIR}${DATADIR}/configspec + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/tutorial.htm ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/tutorial_files + ${INSTALL_DATA} ${WRKSRC}/docs/tutorial_files/* ${STAGEDIR}${DOCSDIR}/tutorial_files + + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample_labs + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample_labs/ethernet_switch + ${INSTALL_DATA} ${WRKSRC}/sample_labs/ethernet_switch/ethsw1.net ${STAGEDIR}${EXAMPLESDIR}/sample_labs/ethernet_switch + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample_labs/frame_relay + ${INSTALL_DATA} ${WRKSRC}/sample_labs/frame_relay/frame_relay1.net ${STAGEDIR}${EXAMPLESDIR}/sample_labs/frame_relay + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample_labs/multiserver + ${INSTALL_DATA} ${WRKSRC}/sample_labs/multiserver/multiserver.net ${STAGEDIR}${EXAMPLESDIR}/sample_labs/multiserver + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample_labs/pix + ${INSTALL_DATA} ${WRKSRC}/sample_labs/pix/pixtest.net ${STAGEDIR}${EXAMPLESDIR}/sample_labs/pix + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample_labs/simple1 + ${INSTALL_DATA} ${WRKSRC}/sample_labs/simple1/simple1.net ${STAGEDIR}${EXAMPLESDIR}/sample_labs/simple1 + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample_labs/simple2 + ${INSTALL_DATA} ${WRKSRC}/sample_labs/simple2/simple2.net ${STAGEDIR}${EXAMPLESDIR}/sample_labs/simple2 + ${INSTALL_DATA} ${WRKSRC}/sample_labs/all_config_options.txt ${STAGEDIR}${EXAMPLESDIR}/sample_labs .include Modified: head/emulators/dynagen/files/patch-setup.py ============================================================================== --- head/emulators/dynagen/files/patch-setup.py Wed Jun 11 16:38:43 2014 (r357505) +++ head/emulators/dynagen/files/patch-setup.py Wed Jun 11 16:38:50 2014 (r357506) @@ -15,9 +15,9 @@ + author = "Greg Anuzelli", + author_email = "dynagen@gmail.com", + url = "http://sourceforge.net/projects/dyna-gen", -+ -+ py_modules = ['confConsole','console','dynamips_lib', -+ 'pemu_lib', 'pemubin', 'pemuwrapper'] ++ license = "GPLv2", ++ long_description = """Dynagen is a utility for use with the dynamips Cisco router simulator. It allows you to quickly provision and manage virtual networks using an INI like configuration file.""", ++ py_modules = ['confConsole','console','dynamips_lib','pemu_lib', 'pemubin', 'pemuwrapper'] +) + +print "If you have installed the modules, copy dynagen to some " Modified: head/emulators/dynagen/pkg-deinstall ============================================================================== --- head/emulators/dynagen/pkg-deinstall Wed Jun 11 16:38:43 2014 (r357505) +++ head/emulators/dynagen/pkg-deinstall Wed Jun 11 16:38:50 2014 (r357506) @@ -1,6 +0,0 @@ -#!/bin/sh -if [ "$2" = "DEINSTALL" ]; then - cmp -s -z "${PKG_PREFIX}/etc/dynagen.ini.sample" "${PKG_PREFIX}/etc/dynagen.ini" && \ - rm -f "${PKG_PREFIX}/etc/dynagen.ini" -fi -exit 0 Modified: head/emulators/dynagen/pkg-descr ============================================================================== --- head/emulators/dynagen/pkg-descr Wed Jun 11 16:38:43 2014 (r357505) +++ head/emulators/dynagen/pkg-descr Wed Jun 11 16:38:50 2014 (r357506) @@ -6,4 +6,4 @@ specifying bridges, frame-relay, ATM swi a management CLI for listing devices, suspending and reloading instances, etc. -WWW: http://dyna-gen.sourceforge.net/ +WWW: http://dyna-gen.sourceforge.net/ Modified: head/emulators/dynagen/pkg-install ============================================================================== --- head/emulators/dynagen/pkg-install Wed Jun 11 16:38:43 2014 (r357505) +++ head/emulators/dynagen/pkg-install Wed Jun 11 16:38:50 2014 (r357506) @@ -1,4 +0,0 @@ -#!/bin/sh -[ "$2" = "POST-INSTALL" -a ! -e ${PKG_PREFIX}/etc/dynagen.ini ] && \ - cp -p ${PKG_PREFIX}/etc/dynagen.ini.sample ${PKG_PREFIX}/etc/dynagen.ini -exit 0