Sat Dec 11 14:35:57 2021 UTC ()
emulators/simh: update to 2021.12.11, fixing a dhcp problem.

On a microvax 3900 with qt0 ethernet, dhcp did not work because
a) netbsd doesn't receive broadcasts on qt0 (unless promiscuous mode is set)
b) the dhcp reply was sent as a broadcast.
This update fixes b) which is under control of simh.

Changes since previous snapshot (new to old):

ETHER: Fix NAT dhcp behavior to properly respond to the MAC of the requestor
SCP, makefile: Rename build conditional HAVE_DLOPEN to SIM_HAVE_DLOPEN
SCP: Prefer Posix 'command -v' over 'which'
AltairZ80: Improved vector interrupt implementation
SCSI, VAX & PDP11: Force Read Only attach for CDROM  devices
SCP: Provide commit id information when archived simh content is used
H316: The UDP code doesn't need anything from h316_defs.h.
DISK: Properly allow/disallow containers of reasonable/unreasonavle sizes
DISK: Preserve container dates when adding or removing container meta data
FIO: Add support to set file access and modify times
makefile: Fix minor line ending inconsistencies
makefile: Support both .so and .a link libraries on Linux
FIO: Emit reasonable error message when shm_open() API isn't available locally
PDP8: Fix device conflict warnings to report problems correctly
3b2: Remove glibc-specific longjmp
TIMER: Be less aggressive to disable throttling after initial calibration
H316: Call the host interface TX service routine.
H316: Fix debugging host interface messages.
H316: Signal the host/IMP ready bits in the host interface.
H316: Fix reading messages from the host interface.
H316: Fix host interface word counts.


(rhialto)
diff -r1.59 -r1.60 pkgsrc/emulators/simh/Makefile
diff -r1.35 -r1.36 pkgsrc/emulators/simh/distinfo
diff -r1.5 -r1.6 pkgsrc/emulators/simh/patches/patch-makefile
cvs diff -r1.59 -r1.60 pkgsrc/emulators/simh/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/simh/Makefile 2021/12/08 16:04:18 1.59
+++ pkgsrc/emulators/simh/Makefile 2021/12/11 14:35:57 1.60
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.59 2021/12/08 16:04:18 adam Exp $ 1# $NetBSD: Makefile,v 1.60 2021/12/11 14:35:57 rhialto Exp $
2 2
3DISTNAME= simh-4.0.0 3DISTNAME= simh-4.0.0
4PKGNAME= simh-4.0.0.20211012 4PKGNAME= simh-4.0.0.20211211
5PKGREVISION= 3 
6CATEGORIES= emulators 5CATEGORIES= emulators
7MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/}
8GITHUB_PROJECT= simh 7GITHUB_PROJECT= simh
9GITHUB_TAG= 06a8447d26810110a8b168d7525955479bcd3f3a 8GITHUB_TAG= b35d36407d9316e9d47099b78bff02b1d43c1b15
10 9
11MAINTAINER= rhialto@NetBSD.org 10MAINTAINER= rhialto@NetBSD.org
12HOMEPAGE= http://simh.trailing-edge.com/ 11HOMEPAGE= http://simh.trailing-edge.com/
13COMMENT= Bob Supniks historical computer simulator 12COMMENT= Bob Supniks historical computer simulator
14LICENSE= mit 13LICENSE= mit
15 14
16DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf 15DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
17 16
18USE_TOOLS+= gmake 17USE_TOOLS+= gmake
19 18
20BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9 19BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9
21 20
22.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
cvs diff -r1.35 -r1.36 pkgsrc/emulators/simh/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/simh/distinfo 2021/10/26 10:24:00 1.35
+++ pkgsrc/emulators/simh/distinfo 2021/12/11 14:35:57 1.36
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.35 2021/10/26 10:24:00 nia Exp $ 1$NetBSD: distinfo,v 1.36 2021/12/11 14:35:57 rhialto Exp $
2 2
3BLAKE2s (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = de6c352d3d0d4d5d47b13ee7861782748d5bab4d5988a85ea70d4136600a8504 3BLAKE2s (simh-4.0.0-b35d36407d9316e9d47099b78bff02b1d43c1b15.tar.gz) = 7a881e92efa0f4086dc878e0835b1a9579759e0de4fde7d2c7f0a4f399b54f15
4SHA512 (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 30a2ef10225a7c6a07829ddf7f559748eb8bb42bd4e2e6430da8547642063ff6b1a0729101d80e470259f8607411a1b2a3baa51ec69bac7d1ba4d99ca83a4b3e 4SHA512 (simh-4.0.0-b35d36407d9316e9d47099b78bff02b1d43c1b15.tar.gz) = 663f300d547b0ab49ba85964cec2790559c136df35508bc51bf26299af1da3856de87a13743b6673e20cf57167356fa3ea15595edb403d2189135a05ae50e27e
5Size (simh-4.0.0-06a8447d26810110a8b168d7525955479bcd3f3a.tar.gz) = 29376656 bytes 5Size (simh-4.0.0-b35d36407d9316e9d47099b78bff02b1d43c1b15.tar.gz) = 29386806 bytes
6SHA1 (patch-makefile) = 03834ab4dabb39ef4d9b275b29a0722ca5dadbac 6SHA1 (patch-makefile) = 883af00fa62cedaf12e14b6aa159f7a85d603891
cvs diff -r1.5 -r1.6 pkgsrc/emulators/simh/patches/patch-makefile (expand / switch to unified diff)

--- pkgsrc/emulators/simh/patches/patch-makefile 2021/10/19 20:34:48 1.5
+++ pkgsrc/emulators/simh/patches/patch-makefile 2021/12/11 14:35:57 1.6
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: patch-makefile,v 1.5 2021/10/19 20:34:48 rhialto Exp $ 1$NetBSD: patch-makefile,v 1.6 2021/12/11 14:35:57 rhialto Exp $
2 2
3Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6) 3Exclude -flto for gcc 4.1.3 (used in NetBSD/vax 6)
4Exclude -flto for clang on NetBSD 4Exclude -flto for clang on NetBSD
5Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1) 5Exclude -flto for gcc 4.4.7 (Used in DragonFly 2.13 - 3.1)
6NO_LTO=1 is in effect for gcc and clang, except Darwin. 6NO_LTO=1 is in effect for gcc and clang, except Darwin.
7Fix png16 detection. 7Fix png16 detection.
8Let INCLUDES and LIBRARIES be the sole source for INCPATH and LIBPATH, 8Let INCLUDES and LIBRARIES be the sole source for INCPATH and LIBPATH,
9to avoid seeing non-pkgsrc libraries (except MacOS platform). 9to avoid seeing non-pkgsrc libraries (except MacOS platform).
10 10
11--- makefile.orig 2021-10-13 01:53:56.000000000 +0000 11--- makefile.orig 2021-12-11 02:17:18.000000000 +0000
12+++ makefile 12+++ makefile
13@@ -298,7 +298,7 @@ ifeq (${WIN32},) #*nix Environments (&& 13@@ -298,7 +298,7 @@ ifeq (${WIN32},) #*nix Environments (&&
14 $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H$(GIT_EXTRA_FILES)%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)  14 $(shell git log -1 --pretty="SIM_GIT_COMMIT_ID %H$(GIT_EXTRA_FILES)%nSIM_GIT_COMMIT_TIME $(isodate)" >.git-commit-id)
15 endif  15 endif
16 endif  16 endif
17- LTO_EXCLUDE_VERSIONS =  17- LTO_EXCLUDE_VERSIONS =
18+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0  18+ LTO_EXCLUDE_VERSIONS = 4.1.3 4.4.7 4.8.3 4.8.4 4.8.5 5.3.0 5.4.0
19 PCAPLIB = pcap  19 PCAPLIB = pcap
20 ifeq (agcc,$(findstring agcc,${GCC})) # Android target build?  20 ifeq (agcc,$(findstring agcc,${GCC})) # Android target build?
21 OS_CCDEFS = -D_GNU_SOURCE -DSIM_ASYNCH_IO  21 OS_CCDEFS = -D_GNU_SOURCE -DSIM_ASYNCH_IO
22@@ -339,16 +339,16 @@ ifeq (${WIN32},) #*nix Environments (&& 22@@ -339,16 +339,16 @@ ifeq (${WIN32},) #*nix Environments (&&
23 ifeq (Darwin,$(OSTYPE))  23 ifeq (Darwin,$(OSTYPE))
24 OSNAME = OSX  24 OSNAME = OSX
@@ -63,37 +63,37 @@ to avoid seeing non-pkgsrc libraries (ex @@ -63,37 +63,37 @@ to avoid seeing non-pkgsrc libraries (ex
63 endif  63 endif
64 ifneq (,$(shell if ${TEST} -d /system/lib; then echo systemlib; fi))  64 ifneq (,$(shell if ${TEST} -d /system/lib; then echo systemlib; fi))
65- LIBPATH += /system/lib  65- LIBPATH += /system/lib
66+ # LIBPATH += /system/lib  66+ # LIBPATH += /system/lib
67 endif  67 endif
68- LIBPATH += $(LD_LIBRARY_PATH)  68- LIBPATH += $(LD_LIBRARY_PATH)
69+ # LIBPATH += $(LD_LIBRARY_PATH)  69+ # LIBPATH += $(LD_LIBRARY_PATH)
70 endif  70 endif
71 ifeq (ldconfig,$(shell if ${TEST} -e /sbin/ldconfig; then echo ldconfig; fi))  71 ifeq (ldconfig,$(shell if ${TEST} -e /sbin/ldconfig; then echo ldconfig; fi))
72- LIBPATH := $(sort $(foreach lib,$(shell /sbin/ldconfig -p | grep ' => /' | sed 's/^.* => //'),$(dir $(lib))))  72- LIBPATH := $(sort $(foreach lib,$(shell /sbin/ldconfig -p | grep ' => /' | sed 's/^.* => //'),$(dir $(lib))))
73+ # LIBPATH := $(sort $(foreach lib,$(shell /sbin/ldconfig -p | grep ' => /' | sed 's/^.* => //'),$(dir $(lib))))  73+ # LIBPATH := $(sort $(foreach lib,$(shell /sbin/ldconfig -p | grep ' => /' | sed 's/^.* => //'),$(dir $(lib))))
74 endif  74 endif
75 endif  75 endif
76 LIBEXT = so  76 LIBSOEXT = so
77@@ -383,7 +383,7 @@ ifeq (${WIN32},) #*nix Environments (&& 77@@ -384,7 +384,7 @@ ifeq (${WIN32},) #*nix Environments (&&
78 ifeq (SunOS,$(OSTYPE))  78 ifeq (SunOS,$(OSTYPE))
79 OSNAME = Solaris  79 OSNAME = Solaris
80 ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))  80 ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
81- LIBPATH := $(shell LANG=C; crle | grep 'Default Library Path' | awk '{ print $$5 }' | sed 's/:/ /g')  81- LIBPATH := $(shell LANG=C; crle | grep 'Default Library Path' | awk '{ print $$5 }' | sed 's/:/ /g')
82+ # LIBPATH := $(shell LANG=C; crle | grep 'Default Library Path' | awk '{ print $$5 }' | sed 's/:/ /g')  82+ # LIBPATH := $(shell LANG=C; crle | grep 'Default Library Path' | awk '{ print $$5 }' | sed 's/:/ /g')
83 endif  83 endif
84 LIBEXT = so  84 LIBEXT = so
85 OS_LDFLAGS += -lsocket -lnsl  85 OS_LDFLAGS += -lsocket -lnsl
86@@ -392,27 +392,27 @@ ifeq (${WIN32},) #*nix Environments (&& 86@@ -393,27 +393,27 @@ ifeq (${WIN32},) #*nix Environments (&&
87 OS_CCDEFS += -I/opt/sfw/include  87 OS_CCDEFS += -I/opt/sfw/include
88 endif  88 endif
89 ifeq (libsfw,$(shell if ${TEST} -d /opt/sfw/lib; then echo libsfw; fi))  89 ifeq (libsfw,$(shell if ${TEST} -d /opt/sfw/lib; then echo libsfw; fi))
90- LIBPATH += /opt/sfw/lib  90- LIBPATH += /opt/sfw/lib
91- OS_LDFLAGS += -L/opt/sfw/lib -R/opt/sfw/lib  91- OS_LDFLAGS += -L/opt/sfw/lib -R/opt/sfw/lib
92+ # LIBPATH += /opt/sfw/lib  92+ # LIBPATH += /opt/sfw/lib
93+ # OS_LDFLAGS += -L/opt/sfw/lib -R/opt/sfw/lib  93+ # OS_LDFLAGS += -L/opt/sfw/lib -R/opt/sfw/lib
94 endif  94 endif
95 OS_CCDEFS += -D_LARGEFILE_SOURCE  95 OS_CCDEFS += -D_LARGEFILE_SOURCE
96 else  96 else
97 ifeq (cygwin,$(OSTYPE))  97 ifeq (cygwin,$(OSTYPE))
98 # use 0readme_ethernet.txt documented Windows pcap build components  98 # use 0readme_ethernet.txt documented Windows pcap build components
99- INCPATH += ../windows-build/winpcap/WpdPack/Include  99- INCPATH += ../windows-build/winpcap/WpdPack/Include
@@ -109,49 +109,49 @@ to avoid seeing non-pkgsrc libraries (ex @@ -109,49 +109,49 @@ to avoid seeing non-pkgsrc libraries (ex
109- INCPATH += /opt/freeware/include  109- INCPATH += /opt/freeware/include
110- OS_CCDEFS += -I/opt/freeware/include  110- OS_CCDEFS += -I/opt/freeware/include
111+ # INCPATH += /opt/freeware/include  111+ # INCPATH += /opt/freeware/include
112+ # OS_CCDEFS += -I/opt/freeware/include  112+ # OS_CCDEFS += -I/opt/freeware/include
113 endif  113 endif
114 ifeq (libopt,$(shell if ${TEST} -d /opt/freeware/lib; then echo libopt; fi))  114 ifeq (libopt,$(shell if ${TEST} -d /opt/freeware/lib; then echo libopt; fi))
115- LIBPATH += /opt/freeware/lib  115- LIBPATH += /opt/freeware/lib
116- OS_LDFLAGS += -L/opt/freeware/lib  116- OS_LDFLAGS += -L/opt/freeware/lib
117+ # LIBPATH += /opt/freeware/lib  117+ # LIBPATH += /opt/freeware/lib
118+ # OS_LDFLAGS += -L/opt/freeware/lib  118+ # OS_LDFLAGS += -L/opt/freeware/lib
119 endif  119 endif
120 else  120 else
121 ifneq (,$(findstring Haiku,$(OSTYPE)))  121 ifneq (,$(findstring Haiku,$(OSTYPE)))
122@@ -423,9 +423,9 @@ ifeq (${WIN32},) #*nix Environments (&& 122@@ -424,9 +424,9 @@ ifeq (${WIN32},) #*nix Environments (&&
123 ifeq ($(HAIKU_ARCH),x86_gcc2)  123 ifeq ($(HAIKU_ARCH),x86_gcc2)
124 $(error Unsupported arch x86_gcc2. Run setarch x86 and retry)  124 $(error Unsupported arch x86_gcc2. Run setarch x86 and retry)
125 endif  125 endif
126- INCPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_HEADERS_DIRECTORY)  126- INCPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_HEADERS_DIRECTORY)
127- INCPATH += $(shell findpaths -e B_FIND_PATH_HEADERS_DIRECTORY posix)  127- INCPATH += $(shell findpaths -e B_FIND_PATH_HEADERS_DIRECTORY posix)
128- LIBPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_DEVELOP_LIB_DIRECTORY)  128- LIBPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_DEVELOP_LIB_DIRECTORY)
129+ # INCPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_HEADERS_DIRECTORY)  129+ # INCPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_HEADERS_DIRECTORY)
130+ # INCPATH += $(shell findpaths -e B_FIND_PATH_HEADERS_DIRECTORY posix)  130+ # INCPATH += $(shell findpaths -e B_FIND_PATH_HEADERS_DIRECTORY posix)
131+ # LIBPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_DEVELOP_LIB_DIRECTORY)  131+ # LIBPATH := $(shell findpaths -e -a $(HAIKU_ARCH) B_FIND_PATH_DEVELOP_LIB_DIRECTORY)
132 OS_LDFLAGS += -lnetwork  132 OS_LDFLAGS += -lnetwork
133 else  133 else
134 ifeq (,$(findstring NetBSD,$(OSTYPE)))  134 ifeq (,$(findstring NetBSD,$(OSTYPE)))
135@@ -433,7 +433,7 @@ ifeq (${WIN32},) #*nix Environments (&& 135@@ -434,7 +434,7 @@ ifeq (${WIN32},) #*nix Environments (&&
136 LDSEARCH :=$(shell LANG=C; ldconfig -r | grep 'search directories' | awk '{print $$3}' | sed 's/:/ /g')  136 LDSEARCH :=$(shell LANG=C; ldconfig -r | grep 'search directories' | awk '{print $$3}' | sed 's/:/ /g')
137 endif  137 endif
138 ifneq (,$(LDSEARCH))  138 ifneq (,$(LDSEARCH))
139- LIBPATH := $(LDSEARCH)  139- LIBPATH := $(LDSEARCH)
140+ # LIBPATH := $(LDSEARCH)  140+ # LIBPATH := $(LDSEARCH)
141 else  141 else
142 ifeq (,$(strip $(LPATH)))  142 ifeq (,$(strip $(LPATH)))
143 $(info *** Warning ***)  143 $(info *** Warning ***)
144@@ -445,22 +445,22 @@ ifeq (${WIN32},) #*nix Environments (&& 144@@ -446,22 +446,22 @@ ifeq (${WIN32},) #*nix Environments (&&
145 $(info *** Warning *** variable.)  145 $(info *** Warning *** variable.)
146 $(info *** Warning ***)  146 $(info *** Warning ***)
147 else  147 else
148- LIBPATH = $(subst :, ,$(LPATH))  148- LIBPATH = $(subst :, ,$(LPATH))
149+ # LIBPATH = $(subst :, ,$(LPATH))  149+ # LIBPATH = $(subst :, ,$(LPATH))
150 endif  150 endif
151 endif  151 endif
152- OS_LDFLAGS += $(patsubst %,-L%,${LIBPATH})  152- OS_LDFLAGS += $(patsubst %,-L%,${LIBPATH})
153+ # OS_LDFLAGS += $(patsubst %,-L%,${LIBPATH})  153+ # OS_LDFLAGS += $(patsubst %,-L%,${LIBPATH})
154 endif  154 endif
155 endif  155 endif
156 endif  156 endif
157 ifeq (usrpkglib,$(shell if ${TEST} -d /usr/pkg/lib; then echo usrpkglib; fi))  157 ifeq (usrpkglib,$(shell if ${TEST} -d /usr/pkg/lib; then echo usrpkglib; fi))
@@ -162,72 +162,72 @@ to avoid seeing non-pkgsrc libraries (ex @@ -162,72 +162,72 @@ to avoid seeing non-pkgsrc libraries (ex
162+ # LIBPATH += /usr/pkg/lib  162+ # LIBPATH += /usr/pkg/lib
163+ # INCPATH += /usr/pkg/include  163+ # INCPATH += /usr/pkg/include
164+ # OS_LDFLAGS += -L/usr/pkg/lib -R/usr/pkg/lib  164+ # OS_LDFLAGS += -L/usr/pkg/lib -R/usr/pkg/lib
165+ # OS_CCDEFS += -I/usr/pkg/include  165+ # OS_CCDEFS += -I/usr/pkg/include
166 endif  166 endif
167 ifeq (/usr/local/lib,$(findstring /usr/local/lib,${LIBPATH}))  167 ifeq (/usr/local/lib,$(findstring /usr/local/lib,${LIBPATH}))
168- INCPATH += /usr/local/include  168- INCPATH += /usr/local/include
169- OS_CCDEFS += -I/usr/local/include  169- OS_CCDEFS += -I/usr/local/include
170+ # INCPATH += /usr/local/include  170+ # INCPATH += /usr/local/include
171+ # OS_CCDEFS += -I/usr/local/include  171+ # OS_CCDEFS += -I/usr/local/include
172 endif  172 endif
173 ifneq (,$(findstring NetBSD,$(OSTYPE))$(findstring FreeBSD,$(OSTYPE))$(findstring AIX,$(OSTYPE)))  173 ifneq (,$(findstring NetBSD,$(OSTYPE))$(findstring FreeBSD,$(OSTYPE))$(findstring AIX,$(OSTYPE)))
174 LIBEXT = so  174 LIBEXT = so
175@@ -484,12 +484,12 @@ ifeq (${WIN32},) #*nix Environments (&& 175@@ -488,12 +488,12 @@ ifeq (${WIN32},) #*nix Environments (&&
176 endif  176 endif
177 ifeq (,$(filter /lib/,$(LIBPATH)))  177 ifeq (,$(filter /lib/,$(LIBPATH)))
178 ifeq (existlib,$(shell if $(TEST) -d /lib/; then echo existlib; fi))  178 ifeq (existlib,$(shell if $(TEST) -d /lib/; then echo existlib; fi))
179- LIBPATH += /lib/  179- LIBPATH += /lib/
180+ # LIBPATH += /lib/  180+ # LIBPATH += /lib/
181 endif  181 endif
182 endif  182 endif
183 ifeq (,$(filter /usr/lib/,$(LIBPATH)))  183 ifeq (,$(filter /usr/lib/,$(LIBPATH)))
184 ifeq (existusrlib,$(shell if $(TEST) -d /usr/lib/; then echo existusrlib; fi))  184 ifeq (existusrlib,$(shell if $(TEST) -d /usr/lib/; then echo existusrlib; fi))
185- LIBPATH += /usr/lib/  185- LIBPATH += /usr/lib/
186+ # LIBPATH += /usr/lib/  186+ # LIBPATH += /usr/lib/
187 endif  187 endif
188 endif  188 endif
189 export CPATH = $(subst $() $(),:,$(INCPATH))  189 export CPATH = $(subst $() $(),:,$(INCPATH))
190@@ -598,9 +598,9 @@ ifeq (${WIN32},) #*nix Environments (&& 190@@ -602,9 +602,9 @@ ifeq (${WIN32},) #*nix Environments (&&
191 OS_CCDEFS += -DHAVE_UTIME  191 OS_CCDEFS += -DHAVE_UTIME
192 endif  192 endif
193 ifneq (,$(call find_include,png))  193 ifneq (,$(call find_include,png))
194- ifneq (,$(call find_lib,png))  194- ifneq (,$(call find_lib,png))
195+ ifneq (,$(call find_lib,png16))  195+ ifneq (,$(call find_lib,png16))
196 OS_CCDEFS += -DHAVE_LIBPNG  196 OS_CCDEFS += -DHAVE_LIBPNG
197- OS_LDFLAGS += -lpng  197- OS_LDFLAGS += -lpng
198+ OS_LDFLAGS += -lpng16  198+ OS_LDFLAGS += -lpng16
199 $(info using libpng: $(call find_lib,png) $(call find_include,png))  199 $(info using libpng: $(call find_lib,png) $(call find_include,png))
200 ifneq (,$(call find_include,zlib))  200 ifneq (,$(call find_include,zlib))
201 ifneq (,$(call find_lib,z))  201 ifneq (,$(call find_lib,z))
202@@ -790,7 +790,7 @@ ifeq (${WIN32},) #*nix Environments (&& 202@@ -794,7 +794,7 @@ ifeq (${WIN32},) #*nix Environments (&&
203 NETWORK_FEATURES = - dynamic networking support using libpcap components from www.tcpdump.org and locally installed libpcap.${LIBEXT}  203 NETWORK_FEATURES = - dynamic networking support using libpcap components from www.tcpdump.org and locally installed libpcap.${LIBEXT}
204 $(info using libpcap: $(call find_include,pcap))  204 $(info using libpcap: $(call find_include,pcap))
205 else  205 else
206- LIBPATH += /usr/local/lib  206- LIBPATH += /usr/local/lib
207+ # LIBPATH += /usr/local/lib  207+ # LIBPATH += /usr/local/lib
208 LIBEXT = a  208 LIBEXT = a
209 ifneq (,$(call find_lib,$(PCAPLIB)))  209 ifneq (,$(call find_lib,$(PCAPLIB)))
210 $(info using libpcap: $(call find_lib,$(PCAPLIB)) $(call find_include,pcap))  210 $(info using libpcap: $(call find_lib,$(PCAPLIB)) $(call find_include,pcap))
211@@ -1185,11 +1185,11 @@ ifneq (,$(UNSUPPORTED_BUILD))  211@@ -1189,11 +1189,11 @@ ifneq (,$(UNSUPPORTED_BUILD))
212 endif  212 endif
213 ifneq ($(DEBUG),)  213 ifneq ($(DEBUG),)
214 CFLAGS_G = -g -ggdb -g3  214 CFLAGS_G = -g -ggdb -g3
215- CFLAGS_O = -O0  215- CFLAGS_O = -O0
216+ CFLAGS_O += -O0  216+ CFLAGS_O += -O0
217 BUILD_FEATURES = - debugging support  217 BUILD_FEATURES = - debugging support
218 else  218 else
219 ifneq (,$(findstring clang,$(COMPILER_NAME))$(findstring LLVM,$(COMPILER_NAME)))  219 ifneq (,$(findstring clang,$(COMPILER_NAME))$(findstring LLVM,$(COMPILER_NAME)))
220- CFLAGS_O = -O2 -fno-strict-overflow  220- CFLAGS_O = -O2 -fno-strict-overflow
221+ CFLAGS_O += -O2 -fno-strict-overflow  221+ CFLAGS_O += -O2 -fno-strict-overflow
222 GCC_OPTIMIZERS_CMD = ${GCC} --help  222 GCC_OPTIMIZERS_CMD = ${GCC} --help
223 NO_LTO = 1  223 NO_LTO = 1
224 else  224 else
225@@ -1197,7 +1197,7 @@ else  225@@ -1201,7 +1201,7 @@ else
226 ifeq (Darwin,$(OSTYPE))  226 ifeq (Darwin,$(OSTYPE))
227 CFLAGS_O += -O4 -flto -fwhole-program  227 CFLAGS_O += -O4 -flto -fwhole-program
228 else  228 else
229- CFLAGS_O := -O2  229- CFLAGS_O := -O2
230+ CFLAGS_O += -O2  230+ CFLAGS_O += -O2
231 endif  231 endif
232 endif  232 endif
233 LDFLAGS_O =  233 LDFLAGS_O =