diff options
author | tv <tv> | 2006-01-31 20:19:02 +0000 |
---|---|---|
committer | tv <tv> | 2006-01-31 20:19:02 +0000 |
commit | 1bf85a33a7f0af352174332dac11865971217df5 (patch) | |
tree | ac38b597af8194f97ef08d4fd0ea67ec8fae54d6 /emulators/simh | |
parent | fb412398b2a8cd982d1920218452cdaea52847a6 (diff) | |
download | pkgsrc-1bf85a33a7f0af352174332dac11865971217df5.tar.gz |
Backport a change from 1.5.22 to 1.5.18 that fixes some issues withtv_libtool_1_5_18_tmpdirfix
temp dir creation when using relink-based finalization.
Diffstat (limited to 'emulators/simh')
-rw-r--r-- | emulators/simh/DESCR | 7 | ||||
-rw-r--r-- | emulators/simh/Makefile | 46 | ||||
-rw-r--r-- | emulators/simh/PLIST | 62 | ||||
-rw-r--r-- | emulators/simh/distinfo | 8 | ||||
-rw-r--r-- | emulators/simh/patches/patch-aa | 71 | ||||
-rw-r--r-- | emulators/simh/patches/patch-ab | 47 | ||||
-rw-r--r-- | emulators/simh/patches/patch-ac | 20 |
7 files changed, 0 insertions, 261 deletions
diff --git a/emulators/simh/DESCR b/emulators/simh/DESCR deleted file mode 100644 index b0054bc752a..00000000000 --- a/emulators/simh/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -Bob Supnik's historical computer simulator, including: - - altair altairz80 eclipse gri h316 hp2100 i1401 i1620 ibm1130 id16 id32 - nova pdp1 pdp10 pdp11 pdp15 pdp4 pdp7 pdp8 pdp9 s3 sds vax - -See http://www.netbsd.org/Ports/vax/emulator-howto.html on how to install -NetBSD/vax on simh! diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile deleted file mode 100644 index fe4f21b4eaf..00000000000 --- a/emulators/simh/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:51 jlam Exp $ -# - -DISTNAME= simhv33-0 -PKGNAME= simh-3.3.0 -CATEGORIES= emulators -MASTER_SITES= http://simh.trailing-edge.com/sources/ -EXTRACT_SUFX= .zip -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://simh.trailing-edge.com/ -COMMENT= Bob Supnik's historical computer simulator - -BUILDLINK_DEPENDS.libpcap+= libpcap>=0.6 - -EXTRACT_CMD= unzip -aoq ${DOWNLOADED_DISTFILE} -WRKSRC= ${WRKDIR} - -.include "../../mk/bsd.prefs.mk" - -.if (${MACHINE_ARCH} == "arm") -.if (${CFLAGS:M-O2} == "-O2") -CFLAGS:= ${CFLAGS:S/-O2//} -.endif -.endif - -INSTALLATION_DIRS= bin - -post-extract: - ${MKDIR} ${WRKSRC}/BIN - ${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile - -do-install: - (cd ${WRKSRC}/BIN && for BIN in *; do \ - ${INSTALL_PROGRAM} $$BIN ${PREFIX}/bin/simh-$$BIN; \ - done) - ${INSTALL_DATA_DIR} ${PREFIX}/share/simh - ${INSTALL_DATA} ${WRKSRC}/VAX/ka655.bin ${PREFIX}/share/simh - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh - (cd ${WRKSRC} && for TXT in *.txt */*.txt; do \ - ${INSTALL_DATA} $$TXT ${PREFIX}/share/doc/simh; \ - done) - -.include "../../net/libpcap/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/emulators/simh/PLIST b/emulators/simh/PLIST deleted file mode 100644 index 37d68c46102..00000000000 --- a/emulators/simh/PLIST +++ /dev/null @@ -1,62 +0,0 @@ -@comment $NetBSD: PLIST,v 1.8 2004/12/22 21:07:01 skrll Exp $ -bin/simh-altair -bin/simh-altairz80 -bin/simh-eclipse -bin/simh-gri -bin/simh-h316 -bin/simh-hp2100 -bin/simh-i1401 -bin/simh-i1620 -bin/simh-ibm1130 -bin/simh-id16 -bin/simh-id32 -bin/simh-lgp -bin/simh-nova -bin/simh-pdp1 -bin/simh-pdp10 -bin/simh-pdp11 -bin/simh-pdp15 -bin/simh-pdp4 -bin/simh-pdp7 -bin/simh-pdp8 -bin/simh-pdp9 -bin/simh-s3 -bin/simh-sds -bin/simh-vax -share/doc/simh/0readme_33.txt -share/doc/simh/0readme_ethernet.txt -share/doc/simh/altair.txt -share/doc/simh/altairz80_doc.txt -share/doc/simh/eclipse.txt -share/doc/simh/gri_doc.txt -share/doc/simh/h316_doc.txt -share/doc/simh/haltguide.txt -share/doc/simh/hp2100_diag.txt -share/doc/simh/hp2100_doc.txt -share/doc/simh/i1401_doc.txt -share/doc/simh/i1620_doc.txt -share/doc/simh/id_diag.txt -share/doc/simh/id_doc.txt -share/doc/simh/lgp_doc.txt -share/doc/simh/nova_doc.txt -share/doc/simh/pdp10_diag.txt -share/doc/simh/pdp10_doc.txt -share/doc/simh/pdp11_doc.txt -share/doc/simh/pdp18b_diag.txt -share/doc/simh/pdp18b_doc.txt -share/doc/simh/pdp1_doc.txt -share/doc/simh/pdp8_doc.txt -share/doc/simh/readme1130.txt -share/doc/simh/readme_s3.txt -share/doc/simh/readme_update.txt -share/doc/simh/sds_diag.txt -share/doc/simh/sds_doc.txt -share/doc/simh/simh_doc.txt -share/doc/simh/simh_faq.txt -share/doc/simh/simh_swre.txt -share/doc/simh/system3.txt -share/doc/simh/vax780_doc.txt -share/doc/simh/vax_doc.txt -share/simh/ka655.bin -@dirrm share/simh -@dirrm share/doc/simh diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo deleted file mode 100644 index 8a20309c868..00000000000 --- a/emulators/simh/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.12 2005/02/23 18:49:20 agc Exp $ - -SHA1 (simhv33-0.zip) = 99a021afe2fd8dfb32bb479e383347e2b883e0f9 -RMD160 (simhv33-0.zip) = 778cc7836b4558b57f1b9ca54427f3d2e8da94a4 -Size (simhv33-0.zip) = 2153444 bytes -SHA1 (patch-aa) = a1c1e10f81b5883c5388084d1b9f31d3560353fe -SHA1 (patch-ab) = aff84028d4184b773b2bd4ebf2ee166357f18924 -SHA1 (patch-ac) = 0f1ddee6f69c0337c8ea02cf24ed6fdecc0ca1f4 diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa deleted file mode 100644 index 402c4d444a9..00000000000 --- a/emulators/simh/patches/patch-aa +++ /dev/null @@ -1,71 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2004/12/22 21:07:01 skrll Exp $ - ---- Makefile.orig 2004-10-30 18:32:50.000000000 +0100 -+++ Makefile -@@ -3,28 +3,30 @@ - # Note: -O2 is sometimes broken in GCC when setjump/longjump is being - # used. Try -O2 only with released simulators. - # --ifeq ($(WIN32),) -+#ifeq ($(WIN32),) - #Unix Environments --ifeq ($(OSTYPE),solaris) --OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE --else --OS_CCDEFS = -D_GNU_SOURCE --endif --CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I . --ifeq ($(USE_NETWORK),) --else --NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a --endif --else -+#ifeq ($(OSTYPE),solaris) -+#OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE -+#else -+#OS_CCDEFS = -D_GNU_SOURCE -+#endif -+#CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I . -+CC = gcc -O2 -g -lm -I . -DDONT_USE_PCAP_FINDALLDEVS -DNEED_PCAP_SENDPACKET -+#ifeq ($(USE_NETWORK),) -+#else -+#NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a -+NETWORK_OPT = -DUSE_NETWORK -lpcap -+#endif -+#else - #Win32 Environments --LDFLAGS = -lm -lwsock32 --CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I. --EXE = .exe --ifeq ($(USE_NETWORK),) --else --NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket --endif --endif -+#LDFLAGS = -lm -lwsock32 -+#CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I. -+#EXE = .exe -+#ifeq ($(USE_NETWORK),) -+#else -+#NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket -+#endif -+#endif - - - # -@@ -252,11 +254,11 @@ ALL = ${BIN}pdp1${EXE} ${BIN}pdp4${EXE} - all : ${ALL} - - clean : --ifeq ($(WIN32),) -+#ifeq ($(WIN32),) - ${RM} ${ALL} --else -- if exist BIN\*.exe del /q BIN\*.exe --endif -+#else -+# if exist BIN\*.exe del /q BIN\*.exe -+#endif - # - # Individual builds - # diff --git a/emulators/simh/patches/patch-ab b/emulators/simh/patches/patch-ab deleted file mode 100644 index 11179bfc0b0..00000000000 --- a/emulators/simh/patches/patch-ab +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2004/12/22 21:07:01 skrll Exp $ - ---- sim_ether.c.orig 2004-03-31 13:38:58.000000000 +0100 -+++ sim_ether.c -@@ -830,6 +830,15 @@ void eth_callback(u_char* info, const st - tmp_packet.len = header->len; - memcpy(tmp_packet.msg, data, header->len); - -+ /* -+ * Pad packet to minimum ethernet len, in case it comes from the local -+ * host. -+ */ -+ if (header->len < 60) { -+ tmp_packet.len = 60; -+ memset(dev->read_packet->msg + header->len, 0, 60 - header->len); -+ } -+ - eth_packet_trace (dev, tmp_packet.msg, tmp_packet.len, "rcvqd"); - - pthread_mutex_lock (&dev->lock); -@@ -840,6 +849,15 @@ void eth_callback(u_char* info, const st - dev->read_packet->len = header->len; - memcpy(dev->read_packet->msg, data, header->len); - -+ /* -+ * Pad packet to minimum ethernet len, in case it comes from the local -+ * host. -+ */ -+ if (header->len <60) { -+ dev->read_packet->len = 60; -+ memset(dev->read_packet->msg + header->len, 0, 60 - header->len); -+ } -+ - eth_packet_trace (dev, dev->read_packet->msg, dev->read_packet->len, "reading"); - - /* call optional read callback function */ -@@ -1080,8 +1098,10 @@ int eth_host_devices(int used, int max, - - int eth_devices(int max, ETH_LIST* list) - { -+#ifndef DONT_USE_PCAP_FINDALLDEVS - pcap_if_t* alldevs; - pcap_if_t* dev; -+#endif - int i = 0; - char errbuf[PCAP_ERRBUF_SIZE]; - diff --git a/emulators/simh/patches/patch-ac b/emulators/simh/patches/patch-ac deleted file mode 100644 index 02ef9cec68d..00000000000 --- a/emulators/simh/patches/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2004/12/22 21:07:01 skrll Exp $ - ---- sim_console.c.orig 2004-11-05 19:39:24.000000000 +0000 -+++ sim_console.c -@@ -347,13 +347,13 @@ for (i = 0; i < sec; i++) { /* loop * - if (tmxr_poll_conn (&sim_con_tmxr) >= 0) { /* poll connect */ - sim_con_ldsc.rcve = 1; /* rcv enabled */ - if (i) { /* if delayed */ -- printf ("Running\n"); /* print transition */ -+ printf ("Running\r\n"); /* print transition */ - fflush (stdout); } - return SCPE_OK; } /* ready to proceed */ - c = sim_os_poll_kbd (); /* check for stop char */ - if ((c == SCPE_STOP) || stop_cpu) return SCPE_STOP; - if ((i % 10) == 0) { /* Status every 10 sec */ -- printf ("Waiting for console Telnet connection\n"); -+ printf ("Waiting for console Telnet connection\r\n"); - fflush (stdout); } - sim_os_sleep (1); /* wait 1 second */ - } |