8 files changed, 36 insertions, 73 deletions

diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index a40c60f887a0..be1f6ff8c03c 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -42,9 +42,24 @@ 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
 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 --git a/emulators/dynagen/files/patch-confConsole.py b/emulators/dynagen/files/patch-confConsole.py
deleted file mode 100644
index 9e5fe341d9b9..000000000000
--- a/emulators/dynagen/files/patch-confConsole.py
+++ /dev/null
@@ -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 --git a/emulators/dynagen/files/patch-console.py b/emulators/dynagen/files/patch-console.py
deleted file mode 100644
index 375940fc086e..000000000000
--- a/emulators/dynagen/files/patch-console.py
+++ /dev/null
@@ -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 --git a/emulators/dynagen/files/patch-dynagen b/emulators/dynagen/files/patch-dynagen
deleted file mode 100644
index 3531ff437ce4..000000000000
--- a/emulators/dynagen/files/patch-dynagen
+++ /dev/null
@@ -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 --git a/emulators/dynagen/files/patch-dynamips_lib.py b/emulators/dynagen/files/patch-dynamips_lib.py
deleted file mode 100644
index 2b9840e1a7dc..000000000000
--- a/emulators/dynagen/files/patch-dynamips_lib.py
+++ /dev/null
@@ -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 --git a/emulators/dynagen/files/patch-pemu_lib.py b/emulators/dynagen/files/patch-pemu_lib.py
deleted file mode 100644
index 55611ffcb8ec..000000000000
--- a/emulators/dynagen/files/patch-pemu_lib.py
+++ /dev/null
@@ -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 --git a/emulators/dynagen/files/patch-setup.py b/emulators/dynagen/files/patch-setup.py
deleted file mode 100644
index c42bb6988cff..000000000000
--- a/emulators/dynagen/files/patch-setup.py
+++ /dev/null
@@ -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 --git a/emulators/dynagen/files/setup.py b/emulators/dynagen/files/setup.py
new file mode 100644
index 000000000000..c5a3ca264629
--- /dev/null
+++ b/emulators/dynagen/files/setup.py
@@ -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/."