Re: pkg/43363: update emulators/simh V3.8-1, with fixes for build on Linux

To: gnats-bugs%netbsd.org@localhost
Subject: Re: pkg/43363: update emulators/simh V3.8-1, with fixes for build on Linux
From: Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>
Date: Wed, 26 May 2010 23:54:36 +0900

> >  How about minimalize patch and use gmake (USE_TOOLS+=gmake)?
> >  And it will be acceptable for upstream.
> 
> Hmm, I'll test it on NetBSD and CentOS.

Attached is updated one.

 * USE_TOOLS+= gmake and remove OSTYPE from MAKE_FLAGS
 * remove ${CC} change in the previous patch-aa
   since -std=c99 seems mandatory (otherwise too many warnings)
 * remove patch-ad

---

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/simh/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile    25 Aug 2009 11:57:45 -0000      1.29
+++ Makefile    26 May 2010 14:49:36 -0000
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.29 2009/08/25 11:57:45 wiz Exp $
 #
 
-DISTNAME=      simhv38-0
-PKGNAME=       simh-3.8.0
+DISTNAME=      simhv38-1
+PKGNAME=       simh-3.8.1
 CATEGORIES=    emulators
 MASTER_SITES=  http://simh.trailing-edge.com/sources/
 EXTRACT_SUFX=  .zip
@@ -14,6 +14,8 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+USE_TOOLS+=    gmake
+
 BUILDLINK_API_DEPENDS.libpcap+=        libpcap>=0.6
 
 WRKSRC=                        ${WRKDIR}
@@ -27,6 +29,7 @@
 INSTALLATION_DIRS=     bin share/simh share/doc/simh
 
 MAKE_FILE=             makefile
+MAKE_FLAGS+=           USE_NETWORK=YES
 
 post-extract:
        ${MKDIR} ${WRKSRC}/BIN
@@ -37,9 +40,7 @@
                ${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \
                fi ;                                                    \
        done)
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/simh
        ${INSTALL_DATA} ${WRKSRC}/VAX/ka655x.bin ${DESTDIR}${PREFIX}/share/simh
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/simh
        (cd ${WRKSRC} && for TXT in *.txt */*.txt; do                   \
                ${INSTALL_DATA} $$TXT ${DESTDIR}${PREFIX}/share/doc/simh;       
        \
        done)
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/simh/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo    20 Nov 2008 21:30:05 -0000      1.14
+++ distinfo    26 May 2010 14:49:36 -0000
@@ -1,9 +1,8 @@
 $NetBSD: distinfo,v 1.14 2008/11/20 21:30:05 chuck Exp $
 
-SHA1 (simhv38-0.zip) = e1afbebede7dc4b2e0f7b13fca3ee6aa8d34f9c1
-RMD160 (simhv38-0.zip) = f1986d45f9b17a905957d1dca4eaa70098a7cae6
-Size (simhv38-0.zip) = 2775593 bytes
-SHA1 (patch-aa) = 427aa8eca1f1ac17f9279708e666d066b24dde7e
+SHA1 (simhv38-1.zip) = 5eac2f8e50be11600727983e05072690a7066702
+RMD160 (simhv38-1.zip) = f085c52ec92425f84f65b3f3605cb7aba8be7b32
+Size (simhv38-1.zip) = 2954982 bytes
+SHA1 (patch-aa) = 88567baeed5af2d834b105935ea1c8706dab1133
 SHA1 (patch-ab) = 85b36e3d92a2bfbd886dbb2e08a0af967edeb0bd
-SHA1 (patch-ac) = 78ecdc9abe248eb8c9a1dc3c297a4a7e5eb812d6
-SHA1 (patch-ad) = 4ab9108d50bc89b41aea3efdf58cc95089137937
+SHA1 (patch-ac) = 16673f3bb5c42cdfd0497cd1f0657cbbe3bbecdb
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/simh/patches/patch-aa,v
retrieving revision 1.8
diff -u -r1.8 patch-aa
--- patches/patch-aa    1 Nov 2008 05:15:42 -0000       1.8
+++ patches/patch-aa    26 May 2010 14:49:36 -0000
@@ -1,83 +1,29 @@
-$NetBSD: patch-aa,v 1.8 2008/11/01 05:15:42 obache Exp $
+$NetBSD$
 
---- makefile.orig      2008-06-06 06:00:46.000000000 +0000
+--- makefile.orig      2008-11-19 12:53:48.000000000 +0000
 +++ makefile
-@@ -1,32 +1,36 @@
- #
- # CC Command
- #
--ifeq ($(WIN32),)
-+#ifeq ($(WIN32),)
+@@ -5,17 +5,17 @@
    #Unix Environments
--  ifneq (,$(findstring solaris,$(OSTYPE)))
--    OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
--  else
+   ifneq (,$(findstring solaris,$(OSTYPE)))
+     OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
++  else ifneq (,$(findstring darwin,$(OSTYPE)))
++    OS_CCDEFS = -D_GNU_SOURCE
++  else ifneq (,$(findstring linux,$(OSTYPE)))
++    OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
+   else
 -    ifneq (,$(findstring darwin,$(OSTYPE)))
 -      OS_CCDEFS = -D_GNU_SOURCE
 -    else
 -      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
 -    endif
--  endif
++    OS_CCDEFS = -lm -D_GNU_SOURCE
+   endif
 -  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
--  ifeq ($(USE_NETWORK),)
--  else
++  CC = gcc -std=c99 -U__STRICT_ANSI__ -g -O2 $(OS_CCDEFS) -I .
+   ifeq ($(USE_NETWORK),)
+   else
 -    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include 
/usr/local/lib/libpcap.a
--  endif
--else
--  #Win32 Environments
--  LDFLAGS = -lm -lwsock32 -lwinmm
--  CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I.
--  EXE = .exe
--  ifeq ($(USE_NETWORK),)
--  else
--    NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
--  endif
--endif
-+#  ifneq (,$(findstring solaris,$(OSTYPE)))
-+#    OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
-+#  else
-+#    ifneq (,$(findstring darwin,$(OSTYPE)))
-+#      OS_CCDEFS = -D_GNU_SOURCE
-+#    else
-+#      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
-+#    endif
-+#  endif
-+#  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
-+CC ?= gcc
-+CC := ${CC} -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
-+     NETWORK_OPT = -DUSE_NETWORK -lpcap
-+#  endif
-+#else
-+#  #Win32 Environments
-+#  LDFLAGS = -lm -lwsock32 -lwinmm
-+#  CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I.
-+#  EXE = .exe
-+#  ifeq ($(USE_NETWORK),)
-+#  else
-+#    NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
-+#  endif
-+#endif
- 
- #
- # Common Libraries
-@@ -259,11 +263,11 @@ ALL = pdp1 pdp4 pdp7 pdp8 pdp9 pdp15 pdp
- all : ${ALL}
- 
- clean :
--ifeq ($(WIN32),)
--      ${RM} ${BIN}*
--else
--      if exist BIN\*.exe del /q BIN\*.exe
--endif
-+#ifeq ($(WIN32),)
-+      rm ${BIN}*
-+#else
-+#     if exist BIN\*.exe del /q BIN\*.exe
-+#endif
- 
- #
- # Individual builds
++    NETWORK_OPT = -DUSE_NETWORK -lpcap
+   endif
+ else
+   #Win32 Environments
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/simh/patches/patch-ac,v
retrieving revision 1.5
diff -u -r1.5 patch-ac
--- patches/patch-ac    1 Nov 2008 05:15:42 -0000       1.5
+++ patches/patch-ac    26 May 2010 14:49:36 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2008/11/01 05:15:42 obache Exp $
+$NetBSD$
 
---- sim_console.c.orig 2006-10-01 14:26:58.000000000 +0200
+--- sim_console.c.orig 2008-11-20 04:50:44.000000000 +0000
 +++ sim_console.c
-@@ -391,7 +391,7 @@ for (i = 0; i < sec; i++) {             
+@@ -429,7 +429,7 @@
      if (tmxr_poll_conn (&sim_con_tmxr) >= 0) {          /* poll connect */
          sim_con_ldsc.rcve = 1;                          /* rcv enabled */
          if (i) {                                        /* if delayed */
@@ -11,9 +11,9 @@
              fflush (stdout);
              }
          return SCPE_OK;                                 /* ready to proceed */
-@@ -399,7 +399,7 @@ for (i = 0; i < sec; i++) {             
-     c = sim_os_poll_kbd ();                             /* check for stop 
char */
-     if ((c == SCPE_STOP) || stop_cpu) return SCPE_STOP;
+@@ -438,7 +438,7 @@
+     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");

---
Izumi Tsutsui

References:
- Re: pkg/43363: update emulators/simh V3.8-1, with fixes for build on Linux
  - From: Izumi Tsutsui

Prev by Date: Re: pkg/43352: [net/bftpd]Update to 2.8
Next by Date: Re: pkg/43363: update emulators/simh V3.8-1, with fixes for build on Linux
Previous by Thread: Re: pkg/43363: update emulators/simh V3.8-1, with fixes for build on Linux
Next by Thread: Re: pkg/43363: update emulators/simh V3.8-1, with fixes for build on Linux
Indexes:

Home | Main Index | Thread Index | Old Index