5 files changed, 33 insertions, 14 deletions

diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index 4690dc3135b6..1abf77924b5d 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dynagen
-PORTVERSION=	0.8.3
+PORTVERSION=	0.9.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dyna-gen
@@ -20,6 +20,7 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 ALL_TARGET=	# empty
 USE_GCC=	3.4+
+USE_DOS2UNIX=	yes
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/dynagen ${PREFIX}/bin
diff --git a/emulators/dynagen/distinfo b/emulators/dynagen/distinfo
index 57652997098a..82585d674a40 100644
--- a/emulators/dynagen/distinfo
+++ b/emulators/dynagen/distinfo
@@ -1,3 +1,3 @@
-MD5 (dynagen-0.8.3.tar.gz) = 740c7a8cacff143385903ddf1c63915d
-SHA256 (dynagen-0.8.3.tar.gz) = 17795aed0da0e2787e0d45397cc28b6f6f743cefc0a84b960819b0b780e9ec45
-SIZE (dynagen-0.8.3.tar.gz) = 397813
+MD5 (dynagen-0.9.0.tar.gz) = fc7b2708f37ba1f4714f2042eed72352
+SHA256 (dynagen-0.9.0.tar.gz) = 7f77ab371889c42e0a0e2080375543045754cf3158131922785dba089e106ed5
+SIZE (dynagen-0.9.0.tar.gz) = 235944
diff --git a/emulators/dynagen/files/patch-dynagen b/emulators/dynagen/files/patch-dynagen
index fb1c0e352d5a..42460a940dcd 100644
--- a/emulators/dynagen/files/patch-dynagen
+++ b/emulators/dynagen/files/patch-dynagen
@@ -1,9 +1,9 @@
---- dynagen.orig	Fri Dec  1 15:13:21 2006
-+++ dynagen	Wed Jan  3 10:48:50 2007
-@@ -32,7 +32,7 @@
+--- dynagen.orig	Sun Feb 18 17:28:09 2007
++++ dynagen	Mon Feb 26 16:50:51 2007
+@@ -34,7 +34,7 @@
  
  # Constants
- VERSION = '0.8.3.123106'
+ VERSION = '0.9.0.021807'
 -CONFIGSPECPATH = [ "/usr/share/dynagen", "/usr/local/share" ]
 +CONFIGSPECPATH = [ "/usr/local/share/dynagen", "/usr/share/dynagen", "/usr/local/share" ]
  CONFIGSPEC = 'configspec'
diff --git a/emulators/dynagen/files/patch-dynamips_lib.py b/emulators/dynagen/files/patch-dynamips_lib.py
new file mode 100644
index 000000000000..94c2fc34f866
--- /dev/null
+++ b/emulators/dynagen/files/patch-dynamips_lib.py
@@ -0,0 +1,24 @@
+--- dynamips_lib.py.orig	Sun Feb 18 17:28:09 2007
++++ dynamips_lib.py	Mon Feb 26 21:05:00 2007
+@@ -820,7 +820,7 @@
+         self.__mmap = True
+         self.__state = 'stopped'
+         self.__ghost_status = 0
+-        self._sparsemem = 0
++        self.__sparsemem = 0
+         self.__idlemax = 1500
+         self.__idlesleep = 30
+ 
+@@ -1295,7 +1295,11 @@
+             flag = '1'
+         else:
+             flag = '0'
+-        send(self.__d, 'vm set_sparse_mem %s %s' % (self.__name, flag))
++
++	# Workaround for "*** Error: Unknown command 'set_sparse_mem'" message
++	# with dynamips-0.2.5.
++	if flag == 1:
++        	send(self.__d, 'vm set_sparse_mem %s %s' % (self.__name, flag))
+ 
+     def __getsparsemem(self):
+         """ Returns the sparsemem
diff --git a/emulators/dynagen/pkg-plist b/emulators/dynagen/pkg-plist
index 89b824e571b8..69961ee0b1f6 100644
--- a/emulators/dynagen/pkg-plist
+++ b/emulators/dynagen/pkg-plist
@@ -42,17 +42,11 @@ lib/%%PYTHON_VERSION%%/site-packages/validate.pyo
 %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image013.gif
 %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image014.gif
 %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image015.gif
-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image015.jpg
 %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image016.gif
-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image016.jpg
 %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image017.gif
-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image017.jpg
 %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image018.gif
-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image018.jpg
 %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image019.gif
-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image019.jpg
 %%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image020.gif
-%%PORTDOCS%%%%DOCSDIR%%/tutorial_files/image020.jpg
 %%PORTDOCS%%%%DOCSDIR%%/tutorial.htm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial_files
 %%PORTDOCS%%@dirrm %%DOCSDIR%%