Attachment 143669 Details for Bug 190923 – patch for emulators/dynagen

[patch] patch for emulators/dynagen

dynagen.patch (text/plain), 6.58 KB, created by Pavel Volkov on 2014-06-11 11:59:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Volkov

Created: 2014-06-11 11:59:54 UTC

Size: 6.58 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with /usr/local/bin/cdiff
>diff -ruN ../dynagen.orig/Makefile ./Makefile
>--- ../dynagen.orig/Makefile	2014-06-11 12:35:46.000000000 +0400
>+++ ./Makefile	2014-06-11 15:03:33.000000000 +0400
>@@ -3,21 +3,21 @@
> 
> PORTNAME=	dynagen
> PORTVERSION=	0.11.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	emulators
>-MASTER_SITES=	SF/dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION}
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=	dyna-gen/${PORTNAME}%20source%20_%20Linux/${PORTNAME}%20${PORTVERSION}
> 
>-MAINTAINER=	pavelivolkov@googlemail.com
>+MAINTAINER=	pavelivolkov@gmail.com
> COMMENT=	Text-based front end for Dynamips development version
> 
> 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 \
>+		"@sample etc/dynagen.ini.sample" \
> 		%%PYTHON_SITELIBDIR%%/confConsole.py \
> 		%%PYTHON_SITELIBDIR%%/confConsole.pyc \
> 		%%PYTHON_SITELIBDIR%%/confConsole.pyo \
>@@ -41,46 +41,37 @@
> PORTEXAMPLES=	*
> PORTDATA=	*
> 
>-USES=		dos2unix
>+USES=	dos2unix
> USE_PYTHON=	yes
> USE_PYDISTUTILS=	yes
> ALL_TARGET=	# empty
> 
>-NO_STAGE=	yes
> post-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/dynagen ${PREFIX}/bin
>-	${INSTALL_DATA} ${WRKSRC}/dynagen.ini ${PREFIX}/etc/dynagen.ini.sample
>-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>-
>-	@${MKDIR} ${DATADIR}
>-	${INSTALL_DATA} ${WRKSRC}/configspec ${DATADIR}/configspec
>-
>-.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
>-	${INSTALL_DATA} ${WRKSRC}/sample_labs/ethernet_switch/ethsw1.net ${EXAMPLESDIR}/sample_labs/ethernet_switch
>-	@${MKDIR} ${EXAMPLESDIR}/sample_labs/frame_relay
>-	${INSTALL_DATA} ${WRKSRC}/sample_labs/frame_relay/frame_relay1.net ${EXAMPLESDIR}/sample_labs/frame_relay
>-	@${MKDIR} ${EXAMPLESDIR}/sample_labs/multiserver
>-	${INSTALL_DATA} ${WRKSRC}/sample_labs/multiserver/multiserver.net ${EXAMPLESDIR}/sample_labs/multiserver
>-	@${MKDIR} ${EXAMPLESDIR}/sample_labs/pix
>-	${INSTALL_DATA} ${WRKSRC}/sample_labs/pix/pixtest.net ${EXAMPLESDIR}/sample_labs/pix
>-	@${MKDIR} ${EXAMPLESDIR}/sample_labs/simple1
>-	${INSTALL_DATA} ${WRKSRC}/sample_labs/simple1/simple1.net ${EXAMPLESDIR}/sample_labs/simple1
>-	@${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
>+	${INSTALL_SCRIPT} ${WRKSRC}/dynagen ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_DATA} ${WRKSRC}/dynagen.ini ${STAGEDIR}${PREFIX}/etc/dynagen.ini.sample
> 
>-pre-deinstall:
>-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} DEINSTALL
>+	@${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 <bsd.port.mk>
>diff -ruN ../dynagen.orig/files/patch-setup.py ./files/patch-setup.py
>--- ../dynagen.orig/files/patch-setup.py	2014-06-11 12:35:46.000000000 +0400
>+++ ./files/patch-setup.py	2014-06-11 14:24:48.000000000 +0400
>@@ -15,9 +15,9 @@
> +    author = "Greg Anuzelli",
> +    author_email = "dynagen@gmail.com",
> +    url = "http://sourceforge.net/projects/dyna-gen",
>-+
>-+    py_modules = ['confConsole','console','dynamips_lib',
>-+	'pemu_lib', 'pemubin', 'pemuwrapper']
>++    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 "
>diff -ruN ../dynagen.orig/pkg-deinstall ./pkg-deinstall
>--- ../dynagen.orig/pkg-deinstall	2014-06-11 12:35:46.000000000 +0400
>+++ ./pkg-deinstall	1970-01-01 03:00:00.000000000 +0300
>@@ -1,6 +0,0 @@
>-#!/bin/sh
>-if [ "$2" = "DEINSTALL" ]; then
>-	cmp -s -z "${PKG_PREFIX}/etc/dynagen.ini.sample" "${PKG_PREFIX}/etc/dynagen.ini" && \
>-		rm -f "${PKG_PREFIX}/etc/dynagen.ini"
>-fi
>-exit 0
>diff -ruN ../dynagen.orig/pkg-descr ./pkg-descr
>--- ../dynagen.orig/pkg-descr	2014-06-11 12:35:46.000000000 +0400
>+++ ./pkg-descr	2014-06-11 12:56:36.000000000 +0400
>@@ -6,4 +6,4 @@
> a management CLI for listing devices, suspending and reloading
> instances, etc.
> 
>-WWW:	http://dyna-gen.sourceforge.net/
>+WWW: http://dyna-gen.sourceforge.net/
>diff -ruN ../dynagen.orig/pkg-install ./pkg-install
>--- ../dynagen.orig/pkg-install	2014-06-11 12:35:46.000000000 +0400
>+++ ./pkg-install	1970-01-01 03:00:00.000000000 +0300
>@@ -1,4 +0,0 @@
>-#!/bin/sh
>-[ "$2" = "POST-INSTALL" -a ! -e ${PKG_PREFIX}/etc/dynagen.ini ] && \
>-	cp -p ${PKG_PREFIX}/etc/dynagen.ini.sample ${PKG_PREFIX}/etc/dynagen.ini
>-exit 0
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 190923: 143669