<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/221af6136ad3decd05e21261ac37b4b6c21e5d91">https://github.com/macports/macports-ports/commit/221af6136ad3decd05e21261ac37b4b6c21e5d91</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 221af61 simh: Update to 3.9-0
</span>221af61 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 221af6136ad3decd05e21261ac37b4b6c21e5d91
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Oct 7 18:06:06 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> simh: Update to 3.9-0
</span>---
emulators/simh/Portfile | 40 ++++++++++++++---------------------
emulators/simh/files/sim_ether.c.diff | 35 ------------------------------
2 files changed, 16 insertions(+), 59 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simh/Portfile b/emulators/simh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e78cecb..5d8e221 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/simh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/simh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name simh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version v38-1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 e15f65a82e21ea49e14b438326d93d5c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 5eac2f8e50be11600727983e05072690a7066702 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f085c52ec92425f84f65b3f3605cb7aba8be7b32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup simh simh 3.9-0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a464e7d1fc6d58dd23a3ef623c3c018d5d60b050 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e49b259b66ad6311ca9066dee3d3693cd915106a6938a52ed685cdbada8eda3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3103657
</span>
categories emulators
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,16 +25,17 @@ long_description The Computer History Simulation Project is a loose \
</span> copies of significant or representative software.
homepage http://simh.trailing-edge.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://simh.trailing-edge.com/sources/
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# These lines are expected to go away once releases occur on GitHub
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://simh.trailing-edge.com/sources/
</span> use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}v[string map {. {}} ${version}]
</span> extract.mkdir yes
depends_lib port:libpcap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -locale C "s|/usr(/lib/libpcap.A.dylib)|${prefix}\\1|g" ${worksrcpath}/sim_ether.c
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,29 +44,21 @@ pre-build {
</span> file mkdir ${worksrcpath}/BIN
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target "USE_NETWORK=1 all"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# system "export OSTYPE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && OSTYPE=darwin make USE_NETWORK=1 all"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args GCC="${configure.cc} [get_canonical_archflags]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCPATH="${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBPATH="${prefix}/lib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_NETWORK=1
</span>
destroot {
set binaries {altair altairz80 eclipse gri h316 hp2100 i1401 i1620 i7094
ibm1130 id16 id32 lgp nova pdp1 pdp10 pdp11 pdp15 pdp4 pdp7
pdp8 pdp9 s3 sds vax vax780}
foreach binary $binaries {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install -c -m 755 ${worksrcpath}/BIN/${binary} ${destroot}${prefix}/bin/simh-${binary}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -c -m 755 ${worksrcpath}/BIN/${binary} ${destroot}${prefix}/bin/simh-${binary}
</span> }
xinstall -d -m 755 ${destroot}${prefix}/share/simh/VAX
xinstall -c -m 644 ${worksrcpath}/VAX/ka655x.bin ${destroot}${prefix}/share/simh/VAX
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 10 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ticket #26181
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sim_ether.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}v(\\d+-\\d+)[quotemeta ${extract.suffix}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.livecheck.regex {([0-9.-]+)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/simh/files/sim_ether.c.diff b/emulators/simh/files/sim_ether.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index be4f46f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/simh/files/sim_ether.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sim_ether.c.orig 2008-04-24 17:11:42.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sim_ether.c 2011-08-18 03:09:39.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,6 +138,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Modification history:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 20-Aug-10 TVO Fix for Mac OSX 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 17-May-07 DTH Fixed non-ethernet device removal loop (from Naoki Hamada)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 15-May-07 DTH Added dynamic loading of wpcap.dll;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Corrected exceed max index bug in ethX lookup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -630,7 +631,7 @@ int eth_devices (int max, ETH_LIST* dev)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* OpenVMS Alpha uses a WinPcap port and an associated execlet */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*============================================================================*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined (xBSD) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (xBSD) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/ioctl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <net/bpf.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* xBSD */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -975,6 +976,15 @@ t_stat eth_open(ETH_DEV* dev, char* name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* !defined (USE_READER_THREAD */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Deliver packets immediately, needed for OS X 10.6.2 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * (Snow-Leopard).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * See this thread on libpcap and Mac Os X 10.6 Snow Leopard on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * the tcpdump mailinglist: http://seclists.org/tcpdump/2010/q1/110
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int v = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ioctl(pcap_fileno(dev->handle), BIOCIMMEDIATE, &v);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return SCPE_OK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>