 @@ -1,40 +1,45 @@
-# $NetBSD: Makefile,v 1.36 2012/05/26 08:50:53 obache Exp $
+# $NetBSD: Makefile,v 1.37 2012/06/16 14:58:35 abs Exp $
 DISTNAME=	simhv39-0
 PKGNAME=	simh-3.9.0
 PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
 EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://simh.trailing-edge.com/
 COMMENT=	Bob Supniks historical computer simulator
 PKG_DESTDIR_SUPPORT=	user-destdir
 USE_TOOLS+=	gmake
 BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.9
 WRKSRC=			${WRKDIR}
 .include "../../mk/bsd.prefs.mk"
 .if (${MACHINE_ARCH} == "arm")
 BUILDLINK_TRANSFORM+=	rm:-O2
 .endif
 # Needed for PDP11/pdp11_dc.c on gcc 4.1.3
 .if (${MACHINE_ARCH} == "vax")
 CFLAGS+=	-fforce-addr
 .endif
 INSTALLATION_DIRS=	bin share/simh share/doc/simh
 MAKE_FILE=		makefile
 MAKE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR:Q}
 MAKE_ENV+=		GCC=${CC:Q}
 MAKE_ENV+=		OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q}
 post-extract:
 	${MKDIR} ${WRKSRC}/BIN
 do-install:
 	(cd ${WRKSRC}/BIN && for BIN in *; do				\
 		if [ -f $$BIN ] ; then					\

 @@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2012/05/26 08:50:53 obache Exp $
+$NetBSD: distinfo,v 1.19 2012/06/16 14:58:35 abs Exp $
 SHA1 (simhv39-0.zip) = 1de3938f0dcb51d55b0e53aea8ae9769ccc57bdb
 RMD160 (simhv39-0.zip) = a464e7d1fc6d58dd23a3ef623c3c018d5d60b050
 Size (simhv39-0.zip) = 3103657 bytes
-SHA1 (patch-aa) = c2f9eda37314040fd4405d9d04567bc5023d42fa
+SHA1 (patch-aa) = 198ec84295792523d52c8713aa144c4ece2f0fbd
-SHA1 (patch-ab) = c82bb9a1ca5f149e994e1894a1753a99bccdec89
+SHA1 (patch-ab) = aa6f7fa5246b469ec7de28182922d2e6e18ce0de
-SHA1 (patch-ac) = 16673f3bb5c42cdfd0497cd1f0657cbbe3bbecdb
+SHA1 (patch-ac) = 9d12df82e971b057be33d4cf54b1539597ae94f3

 @@ -1,29 +1,25 @@
-$NetBSD: patch-aa,v 1.10 2012/05/26 08:50:53 obache Exp $
+$NetBSD: patch-aa,v 1.11 2012/06/16 14:58:35 abs Exp $
---- makefile.orig	2012-04-23 07:28:04.000000000 +0000
+Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
 Make -O2 conditional so can be overridden by environment
 --- makefile.orig	2012-06-13 16:46:32.000000000 +0000
 +++ makefile
-@@ -72,8 +72,8 @@ ifeq ($(WIN32),)  #*nix Environments (&&
+@@ -63,7 +63,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
-     endif
+     OSNAME = windows-build
      OS_LDFLAGS = -lm
    else # Non-Android Builds
 -    INCPATH:=/usr/include
 -    LIBPATH:=/usr/lib
 +    INCPATH:=${BUILDLINK_DIR}/include /usr/include
 +    LIBPATH:=${BUILDLINK_DIR}/lib /usr/lib
      OS_CCDEFS = -D_GNU_SOURCE
      GCC_OPTIMIZERS_CMD = $(GCC) -v --help 2>&1
      GCC_WARNINGS_CMD = $(GCC) -v --help 2>&1
@@ -141,11 +141,11 @@ ifeq ($(WIN32),)  #*nix Environments (&&
    endif
    ifneq (,$(call find_lib,pthread))
      ifneq (,$(call find_include,pthread))
 -      OS_CCDEFS += -DUSE_READER_THREAD
 +      OS_CCDEFS += -DUSE_READER_THREAD ${PTHREAD_CFLAGS}
        ifeq (,$(NOASYNCH))
          OS_CCDEFS += -DSIM_ASYNCH_IO
        endif
 -      OS_LDFLAGS += -lpthread
 +      OS_LDFLAGS += ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
        $(info using libpthread: $(call find_lib,pthread) $(call find_include,pthread))
      endif
    endif
    GCC_VERSION = $(shell $(GCC) -v /dev/null 2>&1 | grep 'gcc version' | awk '{ print $$3 }')
 -  LTO_EXCLUDE_VERSIONS =
 +  LTO_EXCLUDE_VERSIONS = 4.1.3
    PCAPLIB = pcap
    ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?
      OS_CCDEFS = -D_GNU_SOURCE
@@ -300,7 +300,7 @@ ifneq ($(DEBUG),)
    CFLAGS_O = -O0
    BUILD_FEATURES = - debugging support
  else
 -  CFLAGS_O = -O2
 +  CFLAGS_O ?= -O2
    LDFLAGS_O =
    GCC_MAJOR_VERSION = $(firstword $(subst  ., ,$(GCC_VERSION)))
    ifneq (3,$(GCC_MAJOR_VERSION))

 @@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.7 2012/05/04 09:38:23 hans Exp $
+$NetBSD: patch-ab,v 1.8 2012/06/16 14:58:36 abs Exp $
---- sim_ether.c.orig	2012-03-30 16:30:26.000000000 +0200
+--- sim_ether.c.orig	2012-03-30 15:30:26.000000000 +0000
-+++ sim_ether.c	2012-05-03 23:31:13.438944514 +0200
++++ sim_ether.c
 @@ -806,6 +806,8 @@ void eth_show_dev (FILE* st, ETH_DEV* de
  #include <sys/ioctl.h>
  #include <net/if.h>
  #include <linux/if_tun.h>
 +#elif defined(__sun)
 +#undef USE_TAP_NETWORK
  #elif defined(USE_BSDTUNTAP)
  #include <sys/types.h>
  #include <net/if_types.h>

 @@ -1,22 +1,22 @@
-$NetBSD: patch-ac,v 1.6 2010/05/28 13:21:26 tsutsui Exp $
+$NetBSD: patch-ac,v 1.7 2012/06/16 14:58:36 abs Exp $
---- sim_console.c.orig	2008-11-20 04:50:44.000000000 +0000
+--- sim_console.c.orig	2012-03-18 08:40:08.000000000 +0000
 +++ sim_console.c
-@@ -429,7 +429,7 @@
+@@ -430,7 +430,7 @@ for (i = 0; i < sec; i++) {
      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 */
-@@ -438,7 +438,7 @@
+@@ -439,7 +439,7 @@ for (i = 0; i < sec; i++) {
      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 */