CVS commit: pkgsrc/emulators/simh

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Thu Feb 23 10:18:06 UTC 2017

Modified Files:
        pkgsrc/emulators/simh: Makefile

Log Message:
PR pkg/51970: Ethernet (libpcap) support not compiled in

Make sure that /usr/include and /usr/lib${LIBABISUFFIX} always appear in the
search paths for headers and libraries, respectively.

Fix the broken ethernet support (and etc) on platforms like NetBSD.

Thanks hans for his valuable suggestions.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/emulators/simh/Makefile

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.45 pkgsrc/emulators/simh/Makefile:1.46
--- pkgsrc/emulators/simh/Makefile:1.45 Wed Feb 15 01:27:00 2017
+++ pkgsrc/emulators/simh/Makefile      Thu Feb 23 10:18:06 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2017/02/15 01:27:00 maya Exp $
+# $NetBSD: Makefile,v 1.46 2017/02/23 10:18:06 rin Exp $
 
 DISTNAME=      simh-4.0.0
 PKGNAME=       simh-4.0.0.20161218
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=simh/}
 GITHUB_PROJECT=        simh
@@ -33,9 +33,6 @@ CFLAGS+=      -fforce-addr
 CFLAGS.SunOS+= -DBSD_COMP
 LDFLAGS.SunOS+=        -lm
 
-CFLAGS+=               -DUSE_NETWORK
-LDFLAGS+=              -lpcap
-
 INSTALLATION_DIRS=     bin share/simh share/doc/simh
 
 MAKE_FILE=             makefile
@@ -43,12 +40,14 @@ INCLUDES=           ${PREFIX:Q}/include:\
                        ${BUILDLINK_PREFIX.SDL_ttf:Q}/include/SDL:\
                        ${BUILDLINK_PREFIX.libpcap:Q}/include/pcap:\
                        ${BUILDLINK_PREFIX.pcre:Q}/include/pcre:\
-                       ${BUILDLINK_PREFIX.png:Q}/include
+                       ${BUILDLINK_PREFIX.png:Q}/include:\
+                       /usr/include
 LIBRARIES=             ${PREFIX:Q}/lib:\
                        ${BUILDLINK_PREFIX.SDL_ttf:Q}/lib${LIBABISUFFIX}:\
                        ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\
                        ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\
-                       ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}
+                       ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}:\
+                       /usr/lib${LIBABISUFFIX}
 MAKE_ENV+=             INCLUDES=${INCLUDES:Q}
 MAKE_ENV+=             LIBRARIES=${LIBRARIES:Q}
 MAKE_ENV+=             GCC=${CC:Q}