Attachment 152705 Details for Bug 194215 – This is a new patch, with 'shebangfix'.

[patch] This is a new patch, with 'shebangfix'.

dynagen-20141116-with-shebangfix.diff (text/plain), 3.58 KB, created by Pavel Volkov on 2015-02-08 09:00:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Volkov

Created: 2015-02-08 09:00:48 UTC

Size: 3.58 KB

patch

obsolete

>diff -ruN emulators/dynagen.orig/Makefile emulators/dynagen/Makefile
>--- emulators/dynagen.orig/Makefile	2015-02-08 08:01:14.000000000 +0000
>+++ emulators/dynagen/Makefile	2015-02-08 08:54:21.000000000 +0000
>@@ -42,9 +42,21 @@
> PORTDATA=	*
> 
> USES=		dos2unix python
>+
>+USES+=		shebangfix
>+SHEBANG_FILES=	*.py dynagen pemu-start.sh
>+python_CMD=	${PYTHON_CMD}
>+
> USE_PYTHON=	distutils
> ALL_TARGET=	# empty
> 
>+post-patch:
>+	${FIND} ${WRKSRC} -type f -name \*.py -or -name dynagen -or -name pemu-start.sh \
>+		| ${XARGS} ${REINPLACE_CMD} -i '' \
>+		-e '1s|^\#![[:space:]]*/usr/bin/env python|\#!${PYTHON_CMD}|' \
>+		-e 's|^python |${PYTHON_CMD} |' \
>+		-e "s|^CONFIGSPECPATH = .*|CONFIGSPECPATH = \['${PREFIX}/share/dynagen'\]|"
>+
> 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-02-08 08:01:14.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-02-08 08:01:14.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-02-08 08:01:14.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-02-08 08:01:14.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-02-08 08:01:14.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 -*-
>- 
>- """

Flags:

pavelivolkov: maintainer-approval+

Actions: View | Diff

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