simh: fix build failure when SDL_ttf is installed.

SDL2 check in makefile does not work propelry so it incorrectly fallbacks
to using SDL_ttf without buildlink3.
XXX: too many SDL related fixes in upstream

Also rename a patch file for a future maintainability.
Bump PKGREVISION.

4 files changed, 54 insertions, 43 deletions

diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 7576f98f945..9f64ca3cf86 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2017/04/07 13:30:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2017/12/31 08:50:00 tsutsui Exp $
 
 DISTNAME=	simh-4.0.0
 PKGNAME=	simh-4.0.0.20170406
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=simh/}
 GITHUB_PROJECT=	simh
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index 73b39f63642..d7ae33bf0ec 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2017/04/07 13:30:01 ryoon Exp $
+$NetBSD: distinfo,v 1.29 2017/12/31 08:50:00 tsutsui Exp $
 
 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-makefile) = bdc247baec8751b4ac7d4ac03182c44e10a674a4
 SHA1 (patch-sim__ether.c) = 5a67f2cdde8917a32c7655853e5e79d4294d0790
diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
deleted file mode 100644
index 2b3ae5abb04..00000000000
--- a/emulators/simh/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.17 2016/12/18 11:11:28 hans Exp $
-
-Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
-Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
-Make -O2 conditional so can be overridden by environment
-
---- makefile.orig	2012-04-23 16:28:04.000000000 +0000
-+++ makefile
-@@ -187,7 +187,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
-       endif

-     endif

-   endif

--  LTO_EXCLUDE_VERSIONS = 

-+  LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0

-   PCAPLIB = pcap

-   ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?

-     OS_CCDEFS = -D_GNU_SOURCE

-@@ -903,11 +903,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
- endif

- ifneq ($(DEBUG),)

-   CFLAGS_G = -g -ggdb -g3

--  CFLAGS_O = -O0

-+  CFLAGS_O ?= -O0

-   BUILD_FEATURES = - debugging support

- else

-   ifneq (clang,$(findstring clang,$(COMPILER_NAME)))

--    CFLAGS_O = -O2

-+    CFLAGS_O ?= -O2

-     ifeq (Darwin,$(OSTYPE))

-       NO_LTO = 1

-     endif

-@@ -916,7 +916,7 @@ else
-     ifeq (Darwin,$(OSTYPE))

-       CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program

-     else

--      CFLAGS_O := -O2 -fno-strict-overflow 

-+      CFLAGS_O ?= -O2 -fno-strict-overflow 

-     endif

-   endif

-   LDFLAGS_O = 

diff --git a/emulators/simh/patches/patch-makefile b/emulators/simh/patches/patch-makefile
new file mode 100644
index 00000000000..21145fa83f2
--- /dev/null
+++ b/emulators/simh/patches/patch-makefile
@@ -0,0 +1,50 @@
+$NetBSD: patch-makefile,v 1.1 2017/12/31 08:50:00 tsutsui Exp $
+
+Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
+Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
+Make -O2 conditional so can be overridden by environment
+Fix SDL2 detection
+
+--- makefile.orig	2017-04-05 19:51:28.000000000 +0000
++++ makefile
+@@ -190,7 +190,7 @@ ifeq ($(WIN32),)  #*nix Environments (&&
+       endif

+     endif

+   endif

+-  LTO_EXCLUDE_VERSIONS = 

++  LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0

+   PCAPLIB = pcap

+   ifeq (agcc,$(findstring agcc,$(GCC))) # Android target build?

+     OS_CCDEFS = -D_GNU_SOURCE

+@@ -912,11 +912,11 @@ ifneq (,$(UNSUPPORTED_BUILD))

+ endif

+ ifneq ($(DEBUG),)

+   CFLAGS_G = -g -ggdb -g3

+-  CFLAGS_O = -O0

++  CFLAGS_O ?= -O0

+   BUILD_FEATURES = - debugging support

+ else

+   ifneq (clang,$(findstring clang,$(COMPILER_NAME)))

+-    CFLAGS_O = -O2

++    CFLAGS_O ?= -O2

+     ifeq (Darwin,$(OSTYPE))

+       NO_LTO = 1

+     endif

+@@ -925,7 +925,7 @@ else

+     ifeq (Darwin,$(OSTYPE))

+       CFLAGS_O += -O4 -fno-strict-overflow -flto -fwhole-program

+     else

+-      CFLAGS_O := -O2 -fno-strict-overflow 

++      CFLAGS_O ?= -O2 -fno-strict-overflow 

+     endif

+   endif

+   LDFLAGS_O = 

+@@ -1473,7 +1473,7 @@ ifneq (,$(BESM6_BUILD))

+       $(info *** No SDL ttf support available.  BESM-6 video panel disabled.)

+       $(info ***)

+       BESM6_OPT = -I ${BESM6D} -DUSE_INT64 

+-  else ifneq (,$(and $(findstring SDL2,${VIDEO_LDFLAGS}),$(call find_include,SDL2/SDL_ttf),$(call find_lib,SDL2_ttf)))

++  else ifneq (,$(and $(findstring sdl2,${VIDEO_LDFLAGS}),$(call find_include,SDL2/SDL_ttf),$(call find_lib,SDL2_ttf)))

+       $(info using libSDL2_ttf: $(call find_lib,SDL2_ttf) $(call find_include,SDL2/SDL_ttf))

+       $(info ***)

+       BESM6_OPT = -I ${BESM6D} -DFONTFILE=${FONTFILE} -DUSE_INT64 ${VIDEO_CCDEFS} ${VIDEO_LDFLAGS} -lSDL2_ttf