Index: head/emulators/dynagen/Makefile =================================================================== --- head/emulators/dynagen/Makefile (revision 386570) +++ head/emulators/dynagen/Makefile (revision 386571) @@ -1,90 +1,81 @@ # Created by: trasz # $FreeBSD$ PORTNAME= dynagen PORTVERSION= 0.11.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= SF/dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION} MAINTAINER= pavelivolkov@gmail.com COMMENT= Text-based front end for Dynamips development version LICENSE= GPLv2 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.4.0:${PORTSDIR}/devel/py-configobj \ dynamips:${PORTSDIR}/emulators/dynamips-community -PLIST_FILES= bin/dynagen \ - "@sample etc/dynagen.ini.sample" \ - %%PYTHON_SITELIBDIR%%/confConsole.py \ - %%PYTHON_SITELIBDIR%%/confConsole.pyc \ - %%PYTHON_SITELIBDIR%%/confConsole.pyo \ - %%PYTHON_SITELIBDIR%%/console.py \ - %%PYTHON_SITELIBDIR%%/console.pyc \ - %%PYTHON_SITELIBDIR%%/console.pyo \ - %%PYTHON_SITELIBDIR%%/dynamips_lib.py \ - %%PYTHON_SITELIBDIR%%/dynamips_lib.pyc \ - %%PYTHON_SITELIBDIR%%/dynamips_lib.pyo \ - %%PYTHON_SITELIBDIR%%/pemu_lib.py \ - %%PYTHON_SITELIBDIR%%/pemu_lib.pyc \ - %%PYTHON_SITELIBDIR%%/pemu_lib.pyo \ - %%PYTHON_SITELIBDIR%%/pemubin.py \ - %%PYTHON_SITELIBDIR%%/pemubin.pyc \ - %%PYTHON_SITELIBDIR%%/pemubin.pyo \ - %%PYTHON_SITELIBDIR%%/pemuwrapper.py \ - %%PYTHON_SITELIBDIR%%/pemuwrapper.pyc \ - %%PYTHON_SITELIBDIR%%/pemuwrapper.pyo +PLIST_FILES= bin/dynagen "@sample etc/dynagen.ini.sample" PORTDOCS= * PORTEXAMPLES= * PORTDATA= * USES= dos2unix python USES+= shebangfix SHEBANG_FILES= *.py dynagen pemu-start.sh SHEBANG_LANG= python_env python_bol python_cnf python_CMD= ${PYTHON_CMD} python_env_OLD_CMD=/usr/bin/env[[:space:]]*python python_env_CMD= ${PYTHON_CMD} python_bol_OLD_CMD=the an incredible combination python_bol_CMD=|;9s|^python|${PYTHON_CMD} python_cnf_OLD_CMD=the an incredible combination python_cnf_CMD=|;s|^CONFIGSPECPATH.*|CONFIGSPECPATH = ['${PREFIX}/share/dynagen'] -USE_PYTHON= distutils +USE_PYTHON= distutils autoplist ALL_TARGET= # empty +.include +.include + post-extract: @${CP} ${FILESDIR}/setup.py ${WRKSRC} +post-patch: +.if ${PYTHON_MAJOR_VER} >= 3 + @${ECHO_MSG} "===> Converting to python${PYTHON_MAJOR_VER}" + ${PYTHONBASE}/bin/2to3-${PYTHON_VER} --no-diffs --write ${WRKSRC} ${WRKSRC}/dynagen + @${ECHO_MSG} "===> end of converting" +.endif + post-install: ${INSTALL_SCRIPT} ${WRKSRC}/dynagen ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/dynagen.ini ${STAGEDIR}${PREFIX}/etc/dynagen.ini.sample @${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 +.include Index: head/emulators/dynagen/files/setup.py =================================================================== --- head/emulators/dynagen/files/setup.py (revision 386570) +++ head/emulators/dynagen/files/setup.py (revision 386571) @@ -1,21 +1,21 @@ #!/usr/bin/python """Setup script for the dynagen module distribution.""" # run this like python setup --root=/usr/local from distutils.core import setup, Extension setup( # Distribution meta-data name = "dynagen", version = "0.11.0", description = "A frontend for dynamips", author = "Greg Anuzelli", author_email = "dynagen@gmail.com", url = "http://sourceforge.net/projects/dyna-gen", 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'] + py_modules = ['confConsole','console','dynamips_lib','pemu_lib','pemubin','pemuwrapper'] ) print "If you have installed the modules, copy dynagen to some " print "place in your $PATH, like /usr/local/bin/." Property changes on: head/emulators/dynagen/files/setup.py ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -ON \ No newline at end of property +yes \ No newline at end of property