Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Jan 2006 05:04:28 -0500 (EST)
From:      "Jeffrey H. Johnson" <CPE1704TKS@bellsouth.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        CPE1704TKS@bellsouth.net, mmendez@gmail.com
Subject:   ports/92300: [PATCH] emulators/sim: update to V3.5-2
Message-ID:  <20060125100428.336623983C@offworld.cqasys.com>
Resent-Message-ID: <200601251010.k0PAA3PK058654@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         92300
>Category:       ports
>Synopsis:       [PATCH] emulators/sim: update to V3.5-2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 25 10:10:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Jeffrey H. Johnson
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD offworld.cqasys.com 6.0-STABLE FreeBSD 6.0-STABLE #21: Wed Jan 18 22:35:45 EST 2006
>Description:
- Update to V3.5-2
- Add OPTIONS for network support
- Clean-up Makefile
- Update descriptions to cover new support

Port maintainer (mmendez@gmail.com) is cc'd.

PS - Is there any better way to detect ports libpcap?
Detection here based on the tcpdump/libpcap fixes recently comitted.

Generated with FreeBSD Port Tools 0.63

>How-To-Repeat:
>Fix:

--- sim-3.5.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/emulators/sim/Makefile /usr/home/trn/port-work/sim/Makefile
--- /usr/ports/emulators/sim/Makefile	Tue Nov 22 11:23:51 2005
+++ /usr/home/trn/port-work/sim/Makefile	Wed Jan 25 04:56:23 2006
@@ -6,40 +6,47 @@
 #
 
 PORTNAME=	sim
-PORTVERSION=	3.5.1
+PORTVERSION=	3.5.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
-DISTNAME=	${PORTNAME}hv35-1
+DISTNAME=	${PORTNAME}hv35-2
 
 MAINTAINER=	mmendez@gmail.com
-COMMENT=	PDP-8, PDP-11, PDP-1, other 18b PDP, Nova, and IBM 1401 simulators
+COMMENT=	Emulates classic DEC, HP, GRI, IBM, Altair, SDS, Honeywell, and others
 
 USE_ZIP=	yes
+EXTRACT_BEFORE_ARGS=	-qoa
 USE_GMAKE=	yes
-RESTRICTED=	"Non-commercial use only"
+RESTRICTED=	Non-commercial use only
 MAKEFILE=	makefile
 NO_WRKSUBDIR=	yes
 
 SHELL=${SH}
 
-BIN_FILES=	pdp1 pdp4 pdp7 pdp8 pdp9 \
-		pdp15 pdp11 pdp10 vax nova \
-		eclipse h316 hp2100 i1401 \
-		i1620 s3 altair altairz80 \
-		gri ibm1130 id16 id32 sds lgp
+OPTIONS=	NETWORK	"Enable Sim_Ether module (and ports libpcap)"	on
+
+BIN_FILES=	altair    h316   ibm1130 nova  pdp15 pdp9 vax780 \
+		altairz80 hp2100 id16    pdp1  pdp4  s3          \
+		eclipse   i1401  id32    pdp10 pdp7  sds         \
+		gri       i1620  lgp     pdp11 pdp8  vax
 
 PORTDOCS=	0readme_35.txt simh_doc.txt simh_swre.txt \
 		0readme_ethernet.txt simh_faq.txt
 
-PLIST_FILES=	${BIN_FILES:S/^/bin\//g} share/sim/ka655.bin share/sim/ka655x.bin
+PLIST_FILES=	${BIN_FILES:S/^/bin\//g} share/sim/ka655x.bin
 PLIST_DIRS=	share/sim
 
+.include <bsd.port.pre.mk>
+
+# XXX How do we know that libpcap.a is really the correct >0.9.x version?!
+.if defined (WITH_NETWORK)
+RUN_DEPENDS=	${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
+BUILD_DEPENDS=	${RUN_DEPENDS}
+MAKE_ENV=	USE_NETWORK=1
+.endif
+
 pre-patch:
 	@${MKDIR} ${WRKSRC}/BIN
-	@for i in ${WRKSRC}/makefile `${FIND} ${WRKSRC} -name "*.[hc]"`; do \
-		${CAT} $$i | ${TR} -d '\r' > $$i.new; \
-		${MV} $$i.new $$i; \
-	done
 
 do-install:
 .for file in ${BIN_FILES}
@@ -47,7 +54,7 @@
 .endfor
 
 	@${MKDIR} ${PREFIX}/share/sim
-	${INSTALL_DATA} ${WRKDIR}/VAX/ka655*.bin ${PREFIX}/share/sim
+	${INSTALL_DATA} ${WRKDIR}/VAX/ka655x.bin ${PREFIX}/share/sim
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -59,4 +66,4 @@
 post-install:
 	@${CAT} pkg-message
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/emulators/sim/distinfo /usr/home/trn/port-work/sim/distinfo
--- /usr/ports/emulators/sim/distinfo	Tue Nov 22 11:23:51 2005
+++ /usr/home/trn/port-work/sim/distinfo	Wed Jan 25 03:31:02 2006
@@ -1,3 +1,3 @@
-MD5 (simhv35-1.zip) = ead371c802d6a7feba99031bf55895fe
-SHA256 (simhv35-1.zip) = 5828c754cc46f3f9e7cdf5637e5e348684c4c22265b71ef3904fd5321f67a20c
-SIZE (simhv35-1.zip) = 2236017
+MD5 (simhv35-2.zip) = e3d2a168f2da62e10e0013f1f9111d82
+SHA256 (simhv35-2.zip) = 12c6e6290b599b7f131027a533ee12add8d68735128805e012309db46f2ab9fb
+SIZE (simhv35-2.zip) = 2259795
diff -ruN --exclude=CVS /usr/ports/emulators/sim/pkg-descr /usr/home/trn/port-work/sim/pkg-descr
--- /usr/ports/emulators/sim/pkg-descr	Sat Nov  8 15:33:01 1997
+++ /usr/home/trn/port-work/sim/pkg-descr	Wed Jan 25 04:59:03 2006
@@ -1,9 +1,17 @@
-PDP-8, PDP-11, PDP-1, other 18b PDP, Nova, and IBM 1401 simulators.
+SIMH is a higly portable, multi-system simulator.
 
-The simulators have been tested on VAX VMS, Alpha VMS, Alpha UNIX, Intel
-FreeBSD and Intel LINUX; a port to Windows 95 and Windows NT is in progress
-but lacks terminal emulation code.  Porting to other environments will
-require changes to the operating system dependent code in scp_tty.c.
+SIMH implements simulators for: 
+ - Data General Nova, Eclipse 
+ - Digital Equipment Corporation PDP-1, PDP-4, PDP-7, PDP-8, PDP-9, 
+      PDP-10, PDP-11, PDP-15, VAX 
+ - GRI Corporation GRI-909 
+ - IBM 1401, 1620, 1130, System 3 
+ - Interdata (Perkin-Elmer) 16b and 32b systems 
+ - Hewlett-Packard 2116, 2100, 21MX 
+ - Honeywell H316/H516 
+ - MITS Altair 8800, with both 8080 and Z80 
+ - Royal-Mcbee LGP-30, LGP-21 
+ - Scientific Data Systems SDS 940
 
 These simulators are capable of running the Unix V5, V6 and V7 binaries
 licenced for non-commercial use by SCO.  See ${WRKDIR}/simh_doc.txt for
--- sim-3.5.2.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060125100428.336623983C>