Attachment 125327 Details for Bug 168937 – dynagen-0.11.0_2.patch

[patch] dynagen-0.11.0_2.patch

dynagen-0.11.0_2.patch (text/plain), 7.22 KB, created by Pavel I Volkov on 2012-06-11 02:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel I Volkov

Created: 2012-06-11 02:30:11 UTC

Size: 7.22 KB

patch

obsolete

>diff -ruN --exclude=CVS ../dynagen.orig/Makefile ./Makefile
>--- ../dynagen.orig/Makefile	2012-06-10 15:04:39.000000000 +0400
>+++ ./Makefile	2012-06-10 21:50:49.000000000 +0400
>@@ -7,15 +7,30 @@
> 
> PORTNAME=	dynagen
> PORTVERSION=	0.11.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	emulators
> MASTER_SITES=	SF/dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION}
> 
> MAINTAINER=	pavelivolkov@googlemail.com
> COMMENT=	Text-based front end for Dynamips development version
> 
>-RUN_DEPENDS=	dynamips:${PORTSDIR}/emulators/dynamips-community
>+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 \
>+	%%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
>+
>+PORTDOCS=	*
>+PORTEXAMPLES=	*
>+PORTDATA=	*
> 
> USE_PYTHON=	yes
> USE_PYDISTUTILS=	yes
>@@ -25,20 +40,19 @@
> post-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/dynagen ${PREFIX}/bin
> 	${INSTALL_DATA} ${WRKSRC}/dynagen.ini ${PREFIX}/etc/dynagen.ini.sample
>-
>-	@if [ ! -f ${PREFIX}/etc/dynagen.ini ]; then \
>-		${CP} -p ${PREFIX}/etc/dynagen.ini.sample ${PREFIX}/etc/dynagen.ini ; \
>-	fi
>+	@[ -e ${PREFIX}/etc/dynagen.ini ] || ${CP} -p ${PREFIX}/etc/dynagen.ini.sample ${PREFIX}/etc/dynagen.ini
> 
> 	${MKDIR} ${DATADIR}
> 	${INSTALL_DATA} ${WRKSRC}/configspec ${DATADIR}/configspec
> 
>-.if !defined(NOPORTDOCS)
>+.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
>@@ -54,5 +68,6 @@
> 	${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
> 
> .include <bsd.port.mk>
>diff -ruN --exclude=CVS ../dynagen.orig/files/patch-setup.py ./files/patch-setup.py
>--- ../dynagen.orig/files/patch-setup.py	2012-06-10 15:04:39.000000000 +0400
>+++ ./files/patch-setup.py	2012-06-10 23:13:34.000000000 +0400
>@@ -1,6 +1,6 @@
> --- /dev/null	2008-06-11 11:33:00.000000000 +0400
> +++ setup.py	2008-06-11 11:38:41.000000000 +0400
>-@@ -0,0 +1,22 @@
>+@@ -0,0 +1,21 @@
> +#!/usr/bin/env python
> +
> +"""Setup script for the dynagen module distribution."""
>@@ -16,9 +16,8 @@
> +    author_email = "dynagen@gmail.com",
> +    url = "http://sourceforge.net/projects/dyna-gen",
> +
>-+    py_modules = ['confConsole','configobj','console','dynamips_lib',
>-+	'pemu_lib', 'pemubin', 'pemuwrapper',
>-+	'validate']
>++    py_modules = ['confConsole','console','dynamips_lib',
>++	'pemu_lib', 'pemubin', 'pemuwrapper']
> +)
> +
> +print "If you have installed the modules, copy dynagen to some "
>diff -ruN --exclude=CVS ../dynagen.orig/pkg-plist ./pkg-plist
>--- ../dynagen.orig/pkg-plist	2012-06-10 15:04:39.000000000 +0400
>+++ ./pkg-plist	1970-01-01 03:00:00.000000000 +0300
>@@ -1,78 +0,0 @@
>-bin/dynagen
>-@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
>-%%PYTHON_SITELIBDIR%%/confConsole.py
>-%%PYTHON_SITELIBDIR%%/configobj.py
>-%%PYTHON_SITELIBDIR%%/console.py
>-%%PYTHON_SITELIBDIR%%/dynamips_lib.py
>-%%PYTHON_SITELIBDIR%%/pemu_lib.py
>-%%PYTHON_SITELIBDIR%%/pemubin.py
>-%%PYTHON_SITELIBDIR%%/pemuwrapper.py
>-%%PYTHON_SITELIBDIR%%/validate.py
>-%%PYTHON_SITELIBDIR%%/confConsole.pyc
>-%%PYTHON_SITELIBDIR%%/configobj.pyc
>-%%PYTHON_SITELIBDIR%%/console.pyc
>-%%PYTHON_SITELIBDIR%%/dynamips_lib.pyc
>-%%PYTHON_SITELIBDIR%%/pemu_lib.pyc
>-%%PYTHON_SITELIBDIR%%/pemubin.pyc
>-%%PYTHON_SITELIBDIR%%/pemuwrapper.pyc
>-%%PYTHON_SITELIBDIR%%/validate.pyc
>-%%PYTHON_SITELIBDIR%%/confConsole.pyo
>-%%PYTHON_SITELIBDIR%%/configobj.pyo
>-%%PYTHON_SITELIBDIR%%/console.pyo
>-%%PYTHON_SITELIBDIR%%/dynamips_lib.pyo
>-%%PYTHON_SITELIBDIR%%/pemu_lib.pyo
>-%%PYTHON_SITELIBDIR%%/pemubin.pyo
>-%%PYTHON_SITELIBDIR%%/pemuwrapper.pyo
>-%%PYTHON_SITELIBDIR%%/validate.pyo
>-%%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/all_config_options.txt
>-@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
>-@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
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image008.jpg
>-%%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
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image018.gif
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image019.gif
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image020.gif
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image021.gif
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image022.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image023.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial.htm
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial_files
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>-%%DATADIR%%/configspec
>-@dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 168937: 125327 | 125328