Thu Feb 23 10:18:06 2017 UTC ()
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.


(rin)
diff -r1.45 -r1.46 pkgsrc/emulators/simh/Makefile
cvs diff -r1.45 -r1.46 pkgsrc/emulators/simh/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/simh/Makefile 2017/02/15 01:27:00 1.45
+++ pkgsrc/emulators/simh/Makefile 2017/02/23 10:18:06 1.46
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.45 2017/02/15 01:27:00 maya Exp $ 1# $NetBSD: Makefile,v 1.46 2017/02/23 10:18:06 rin Exp $
2 2
3DISTNAME= simh-4.0.0 3DISTNAME= simh-4.0.0
4PKGNAME= simh-4.0.0.20161218 4PKGNAME= simh-4.0.0.20161218
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= emulators 6CATEGORIES= emulators
7MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=simh/}
8GITHUB_PROJECT= simh 8GITHUB_PROJECT= simh
9GITHUB_TAG= 7964e2b72d9cad0309afa7da08dd7e5e2336cd37 9GITHUB_TAG= 7964e2b72d9cad0309afa7da08dd7e5e2336cd37
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://simh.trailing-edge.com/ 12HOMEPAGE= http://simh.trailing-edge.com/
13COMMENT= Bob Supniks historical computer simulator 13COMMENT= Bob Supniks historical computer simulator
14 14
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16 16
17BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9 17BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9
18 18
@@ -23,42 +23,41 @@ BUILDLINK_TRANSFORM+= rm:-fwhole-program @@ -23,42 +23,41 @@ BUILDLINK_TRANSFORM+= rm:-fwhole-program
23 23
24.if (${MACHINE_ARCH} == "arm") 24.if (${MACHINE_ARCH} == "arm")
25BUILDLINK_TRANSFORM+= rm:-O2 25BUILDLINK_TRANSFORM+= rm:-O2
26.endif 26.endif
27 27
28# Needed for PDP11/pdp11_dc.c on gcc 4.1.3 28# Needed for PDP11/pdp11_dc.c on gcc 4.1.3
29.if (${MACHINE_ARCH} == "vax") 29.if (${MACHINE_ARCH} == "vax")
30CFLAGS+= -fforce-addr 30CFLAGS+= -fforce-addr
31.endif 31.endif
32 32
33CFLAGS.SunOS+= -DBSD_COMP 33CFLAGS.SunOS+= -DBSD_COMP
34LDFLAGS.SunOS+= -lm 34LDFLAGS.SunOS+= -lm
35 35
36CFLAGS+= -DUSE_NETWORK 
37LDFLAGS+= -lpcap 
38 
39INSTALLATION_DIRS= bin share/simh share/doc/simh 36INSTALLATION_DIRS= bin share/simh share/doc/simh
40 37
41MAKE_FILE= makefile 38MAKE_FILE= makefile
42INCLUDES= ${PREFIX:Q}/include:\ 39INCLUDES= ${PREFIX:Q}/include:\
43 ${BUILDLINK_PREFIX.SDL_ttf:Q}/include/SDL:\ 40 ${BUILDLINK_PREFIX.SDL_ttf:Q}/include/SDL:\
44 ${BUILDLINK_PREFIX.libpcap:Q}/include/pcap:\ 41 ${BUILDLINK_PREFIX.libpcap:Q}/include/pcap:\
45 ${BUILDLINK_PREFIX.pcre:Q}/include/pcre:\ 42 ${BUILDLINK_PREFIX.pcre:Q}/include/pcre:\
46 ${BUILDLINK_PREFIX.png:Q}/include 43 ${BUILDLINK_PREFIX.png:Q}/include:\
 44 /usr/include
47LIBRARIES= ${PREFIX:Q}/lib:\ 45LIBRARIES= ${PREFIX:Q}/lib:\
48 ${BUILDLINK_PREFIX.SDL_ttf:Q}/lib${LIBABISUFFIX}:\ 46 ${BUILDLINK_PREFIX.SDL_ttf:Q}/lib${LIBABISUFFIX}:\
49 ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\ 47 ${BUILDLINK_PREFIX.libpcap:Q}/lib${LIBABISUFFIX}:\
50 ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\ 48 ${BUILDLINK_PREFIX.pcre:Q}/lib${LIBABISUFFIX}:\
51 ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX} 49 ${BUILDLINK_PREFIX.png:Q}/lib${LIBABISUFFIX}:\
 50 /usr/lib${LIBABISUFFIX}
52MAKE_ENV+= INCLUDES=${INCLUDES:Q} 51MAKE_ENV+= INCLUDES=${INCLUDES:Q}
53MAKE_ENV+= LIBRARIES=${LIBRARIES:Q} 52MAKE_ENV+= LIBRARIES=${LIBRARIES:Q}
54MAKE_ENV+= GCC=${CC:Q} 53MAKE_ENV+= GCC=${CC:Q}
55MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q} 54MAKE_ENV+= OS_LDFLAGS=${LDFLAGS:Q} CFLAGS_O=${CFLAGS:Q}
56 55
57post-extract: 56post-extract:
58 ${MKDIR} ${WRKSRC}/BIN 57 ${MKDIR} ${WRKSRC}/BIN
59 58
60do-install: 59do-install:
61 (cd ${WRKSRC}/BIN && for BIN in *; do \ 60 (cd ${WRKSRC}/BIN && for BIN in *; do \
62 if [ -f $$BIN ] ; then \ 61 if [ -f $$BIN ] ; then \
63 ${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \ 62 ${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \
64 fi ; \ 63 fi ; \