CVS commit: pkgsrc/emulators/simh

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Apr  7 13:30:01 UTC 2017

Modified Files:
        pkgsrc/emulators/simh: Makefile PLIST distinfo

Log Message:
Update to 4.0.0.20140406

* Use SDL2 instead of SDL
* Build and install BESM-6 simulator

Changelog:
* Add MDS-225 simulator


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/emulators/simh/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/emulators/simh/PLIST
cvs rdiff -u -r1.27 -r1.28 pkgsrc/emulators/simh/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/simh/Makefile
diff -u pkgsrc/emulators/simh/Makefile:1.46 pkgsrc/emulators/simh/Makefile:1.47
--- pkgsrc/emulators/simh/Makefile:1.46 Thu Feb 23 10:18:06 2017
+++ pkgsrc/emulators/simh/Makefile      Fri Apr  7 13:30:01 2017
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.46 2017/02/23 10:18:06 rin Exp $
+# $NetBSD: Makefile,v 1.47 2017/04/07 13:30:01 ryoon Exp $
 
 DISTNAME=      simh-4.0.0
-PKGNAME=       simh-4.0.0.20161218
-PKGREVISION=   2
+PKGNAME=       simh-4.0.0.20170406
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=simh/}
 GITHUB_PROJECT=        simh
-GITHUB_TAG=    7964e2b72d9cad0309afa7da08dd7e5e2336cd37
+GITHUB_TAG=    2ddb7162f3b7602afac290505c5d3352007cf26d
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://simh.trailing-edge.com/
 COMMENT=       Bob Supniks historical computer simulator
 
+DEPENDS+=      dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
+
 USE_TOOLS+=    gmake
 
 BUILDLINK_API_DEPENDS.libpcap+=        libpcap>=0.9
@@ -37,13 +38,13 @@ INSTALLATION_DIRS=  bin share/simh share/
 
 MAKE_FILE=             makefile
 INCLUDES=              ${PREFIX:Q}/include:\
-                       ${BUILDLINK_PREFIX.SDL_ttf:Q}/include/SDL:\
+                       ${BUILDLINK_PREFIX.SDL2:Q}/include/SDL2:\
                        ${BUILDLINK_PREFIX.libpcap:Q}/include/pcap:\
                        ${BUILDLINK_PREFIX.pcre:Q}/include/pcre:\
                        ${BUILDLINK_PREFIX.png:Q}/include:\
                        /usr/include
 LIBRARIES=             ${PREFIX:Q}/lib:\
-                       ${BUILDLINK_PREFIX.SDL_ttf:Q}/lib${LIBABISUFFIX}:\
+                       ${BUILDLINK_PREFIX.SDL2:Q}/lib${LIBABISUFFIX}:\
                        ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\
                        ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\
                        ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}:\
@@ -52,6 +53,9 @@ MAKE_ENV+=            INCLUDES=${INCLUDES:Q}
 MAKE_ENV+=             LIBRARIES=${LIBRARIES:Q}
 MAKE_ENV+=             GCC=${CC:Q}
 MAKE_ENV+=             OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q}
+MAKE_ENV+=             FONTPATH=/usr/pkg/share/fonts/X11/TTF
+
+BUILD_TARGET=          all besm6
 
 post-extract:
        ${MKDIR} ${WRKSRC}/BIN
@@ -69,8 +73,8 @@ do-install:
                ${INSTALL_DATA} $$TXT ${DESTDIR}${PREFIX}/share/doc/simh;               \
        done)
 
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/SDL_ttf/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../fonts/SDL2_ttf/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"

Index: pkgsrc/emulators/simh/PLIST
diff -u pkgsrc/emulators/simh/PLIST:1.15 pkgsrc/emulators/simh/PLIST:1.16
--- pkgsrc/emulators/simh/PLIST:1.15    Sun Dec 18 11:11:28 2016
+++ pkgsrc/emulators/simh/PLIST Fri Apr  7 13:30:01 2017
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.15 2016/12/18 11:11:28 hans Exp $
+@comment $NetBSD: PLIST,v 1.16 2017/04/07 13:30:01 ryoon Exp $
 bin/simh-altair
 bin/simh-altairz80
 bin/simh-b5500
+bin/simh-besm6
 bin/simh-cdc1700
 bin/simh-eclipse
 bin/simh-gri
@@ -14,6 +15,7 @@ bin/simh-i7094
 bin/simh-ibm1130
 bin/simh-id16
 bin/simh-id32
+bin/simh-imds-225
 bin/simh-isys8010
 bin/simh-isys8020
 bin/simh-isys8024
@@ -43,8 +45,8 @@ bin/simh-vax730
 bin/simh-vax750
 bin/simh-vax780
 bin/simh-vax8600
-share/doc/simh/0readme_39.txt
 share/doc/simh/0readmeAsynchIO.txt
+share/doc/simh/0readme_39.txt
 share/doc/simh/0readme_ethernet.txt
 share/doc/simh/CDC1700-Diagnostics.txt
 share/doc/simh/CDC1700-MSOS.txt
@@ -54,6 +56,7 @@ share/doc/simh/eclipse.txt
 share/doc/simh/haltguide.txt
 share/doc/simh/hp2100_bugfixes.txt
 share/doc/simh/hp2100_diag.txt
+share/doc/simh/hp2100_release.txt
 share/doc/simh/hp3000_diag.txt
 share/doc/simh/hp3000_release.txt
 share/doc/simh/i7094_bug_history.txt
@@ -63,9 +66,9 @@ share/doc/simh/m68k_parse.y.txt
 share/doc/simh/pdp10_bug_history.txt
 share/doc/simh/pdp18b_diag.txt
 share/doc/simh/pdp1_diag.txt
+share/doc/simh/readme-sage.txt
 share/doc/simh/readme1130.txt
 share/doc/simh/readme_s3.txt
-share/doc/simh/readme-sage.txt
 share/doc/simh/readme_update.txt
 share/doc/simh/sds_diag.txt
 share/doc/simh/sigma_bugs.txt

Index: pkgsrc/emulators/simh/distinfo
diff -u pkgsrc/emulators/simh/distinfo:1.27 pkgsrc/emulators/simh/distinfo:1.28
--- pkgsrc/emulators/simh/distinfo:1.27 Sun Dec 18 11:11:28 2016
+++ pkgsrc/emulators/simh/distinfo      Fri Apr  7 13:30:01 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2016/12/18 11:11:28 hans Exp $
+$NetBSD: distinfo,v 1.28 2017/04/07 13:30:01 ryoon Exp $
 
-SHA1 (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = 83ec0e23ef79e13d7149d9c4077d479f1e3c2b2c
-RMD160 (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = c77adffe16248aa6c0a3f14de321b599c772c3ab
-SHA512 (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = 8ceae000df2442df925fae0eb2e9142ba4d6be732ae930b88addc9530ba21257bb03f30493ccdf941e06d4f04deeffdfcf12e1f41b3855c34bf7a116edc4d31c
-Size (simh-4.0.0-7964e2b72d9cad0309afa7da08dd7e5e2336cd37.tar.gz) = 9915006 bytes
+SHA1 (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = a6b17f1b16bd2a21d7ae797c0bd8282267b30c1a
+RMD160 (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = 4f172b66a8efcd3b0870fa5d8e4a8dc76b9c7f87
+SHA512 (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = 56656dcc57460aa3f4a42ed5fbc3f9bc8c567498f394450f631f26475dc20f2b1282569cabc053049a4d07d3d0aee3fd8bb41b67aab9bef9c722e28ffb971cdf
+Size (simh-4.0.0-2ddb7162f3b7602afac290505c5d3352007cf26d.tar.gz) = 10046376 bytes
 SHA1 (patch-aa) = 01ee641734c029fc2ea0de6947971c0bbdc0e267
 SHA1 (patch-sim__ether.c) = 5a67f2cdde8917a32c7655853e5e79d4294d0790