ports/105148: [PATCH] emulators/hercules: fix bin/dasdlist

[trasz]

>Number:         105148
>Category:       ports
>Synopsis:       [PATCH] emulators/hercules: fix bin/dasdlist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 04 17:53:38 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     trasz
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sat Jun  3 01:12:10 CEST
>Description:
Fix dasdlist utility.

Added file(s):
- files/patch-util-dasdlist

Port maintainer (bzeeb+freebsdports at zabbadoz.net) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- hercules-3.04.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/emulators/hercules/Makefile /home/trasz/hercules/Makefile
--- /usr/ports/emulators/hercules/Makefile	Thu Sep 21 21:55:34 2006
+++ /home/trasz/hercules/Makefile	Sat Nov  4 17:17:09 2006
@@ -13,6 +13,8 @@
 MAINTAINER=	bzeeb+freebsdports at zabbadoz.net
 COMMENT=	The Hercules System/370, ESA/390, and z/Architecture Emulator
 
+RUN_DEPENDS=	${LOCALBASE}/bin/god:${PORTSDIR}/sysutils/coreutils
+
 OPTIONS=	PTHREADS "Build with pthreads instead of fthreads." on \
 		NLS "Build with native language support." on \
 		DEBUG "Enable for debugging hercules itself." off
diff -ruN --exclude=CVS /usr/ports/emulators/hercules/files/patch-util-dasdlist /home/trasz/hercules/files/patch-util-dasdlist
--- /usr/ports/emulators/hercules/files/patch-util-dasdlist	Thu Jan  1 01:00:00 1970
+++ /home/trasz/hercules/files/patch-util-dasdlist	Sat Nov  4 17:17:09 2006
@@ -0,0 +1,36 @@
+--- util/dasdlist.orig	Sat Nov  4 16:30:04 2006
++++ util/dasdlist	Sat Nov  4 16:30:22 2006
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # This command prints a track from a CKD DASD image file.
+ # It uses the GNU Octal Dump (od) command to firstly obtain
+@@ -22,7 +22,7 @@
+ #
+ # Check the first 8 bytes of the header for valid CKD DASD image file
+ #
+-ckdid=`od -An -s --read-bytes=8 $filename`
++ckdid=`god -An -s --read-bytes=8 $filename`
+ if [ $ckdid != "CKD_P370" ]; then
+     echo "File $filename is not a CKD DASD image file"
+     exit 2
+@@ -31,8 +31,8 @@
+ #
+ # The next 8 bytes contain the tracks/cyl and track length constants
+ #
+-heads=`od -An -tu4 --skip-bytes=8 --read-bytes=4 $filename`
+-trklen=`od -An -tu4 --skip-bytes=12 --read-bytes=4 $filename`
++heads=`god -An -tu4 --skip-bytes=8 --read-bytes=4 $filename`
++trklen=`god -An -tu4 --skip-bytes=12 --read-bytes=4 $filename`
+ 
+ echo "$filename $(($heads)) trks/cyl, $(($trklen)) bytes/trk"
+ 
+@@ -54,5 +54,5 @@
+ # Dump the requested track
+ #
+ echo "$filename Cyl $(($cyl)) Head $(($head))"
+-echo "od -Ax -tx1 --skip-bytes=$offset --read-bytes=$num $filename"
+-od -Ax -tx1 --skip-bytes=$offset --read-bytes=$num $filename
++echo "god -Ax -tx1 --skip-bytes=$offset --read-bytes=$num $filename"
++god -Ax -tx1 --skip-bytes=$offset --read-bytes=$num $filename
--- hercules-3.04.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: