Attachment 154615 Details for Bug 194215 – This is a new patch, with use only 'shebangfix', and single line.

[patch] This is a new patch, with use only 'shebangfix', and single line.

dynagen-20150321-with-only-shebangfix.diff (text/plain), 6.03 KB, created by Pavel Volkov on 2015-03-21 08:18:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Volkov

Created: 2015-03-21 08:18:16 UTC

Size: 6.03 KB

patch

obsolete

>diff -ruN emulators/dynagen.orig/Makefile emulators/dynagen/Makefile
>--- emulators/dynagen.orig/Makefile	2015-03-21 07:55:04.000000000 +0000
>+++ emulators/dynagen/Makefile	2015-03-21 07:28:52.000000000 +0000
>@@ -42,9 +42,24 @@
> 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
> ALL_TARGET=	# empty
> 
>+post-extract:
>+	@${CP} ${FILESDIR}/setup.py ${WRKSRC}
>+
> post-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/dynagen ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_DATA} ${WRKSRC}/dynagen.ini ${STAGEDIR}${PREFIX}/etc/dynagen.ini.sample
>diff -ruN emulators/dynagen.orig/files/patch-confConsole.py emulators/dynagen/files/patch-confConsole.py
>--- emulators/dynagen.orig/files/patch-confConsole.py	2015-03-21 07:55:04.000000000 +0000
>+++ emulators/dynagen/files/patch-confConsole.py	1970-01-01 00:00:00.000000000 +0000
>@@ -1,8 +0,0 @@
>---- 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 emulators/dynagen.orig/files/patch-console.py emulators/dynagen/files/patch-console.py
>--- emulators/dynagen.orig/files/patch-console.py	2015-03-21 07:55:04.000000000 +0000
>+++ emulators/dynagen/files/patch-console.py	1970-01-01 00:00:00.000000000 +0000
>@@ -1,8 +0,0 @@
>---- 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 emulators/dynagen.orig/files/patch-dynagen emulators/dynagen/files/patch-dynagen
>--- emulators/dynagen.orig/files/patch-dynagen	2015-03-21 07:55:04.000000000 +0000
>+++ emulators/dynagen/files/patch-dynagen	1970-01-01 00:00:00.000000000 +0000
>@@ -1,17 +0,0 @@
>---- 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.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']
>- INIFILE = 'dynagen.ini'
>diff -ruN emulators/dynagen.orig/files/patch-dynamips_lib.py emulators/dynagen/files/patch-dynamips_lib.py
>--- emulators/dynagen.orig/files/patch-dynamips_lib.py	2015-03-21 07:55:04.000000000 +0000
>+++ emulators/dynagen/files/patch-dynamips_lib.py	1970-01-01 00:00:00.000000000 +0000
>@@ -1,8 +0,0 @@
>---- 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 -*-
>- 
>- """
>diff -ruN emulators/dynagen.orig/files/patch-pemu_lib.py emulators/dynagen/files/patch-pemu_lib.py
>--- emulators/dynagen.orig/files/patch-pemu_lib.py	2015-03-21 07:55:04.000000000 +0000
>+++ emulators/dynagen/files/patch-pemu_lib.py	1970-01-01 00:00:00.000000000 +0000
>@@ -1,8 +0,0 @@
>---- 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 emulators/dynagen.orig/files/patch-setup.py emulators/dynagen/files/patch-setup.py
>--- emulators/dynagen.orig/files/patch-setup.py	2015-03-21 07:55:04.000000000 +0000
>+++ emulators/dynagen/files/patch-setup.py	1970-01-01 00:00:00.000000000 +0000
>@@ -1,24 +0,0 @@
>---- /dev/null	2008-06-11 11:33:00.000000000 +0400
>-+++ setup.py	2008-06-11 11:38:41.000000000 +0400
>-@@ -0,0 +1,21 @@
>-+#!/usr/bin/env 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']
>-+)
>-+
>-+print "If you have installed the modules, copy dynagen to some "
>-+print "place in your $PATH, like /usr/local/bin/."
>diff -ruN emulators/dynagen.orig/files/setup.py emulators/dynagen/files/setup.py
>--- emulators/dynagen.orig/files/setup.py	1970-01-01 00:00:00.000000000 +0000
>+++ emulators/dynagen/files/setup.py	2015-03-21 07:16:30.000000000 +0000
>@@ -0,0 +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']
>+)
>+
>+print "If you have installed the modules, copy dynagen to some "
>+print "place in your $PATH, like /usr/local/bin/."

Flags:

pavelivolkov: maintainer-approval+

Actions: View | Diff

Attachments on bug 194215: 148057 | 149472 | 152705 | 152995 | 154615