Wed Sep 18 18:30:54 2019 UTC ()
lsof: needs -D__NAMECACHE_PRIVATE for "struct namecache" on -current

This only fixes the build, path names still seem to be somewhat broken.


(tnn)
diff -r1.134 -r1.135 pkgsrc/sysutils/lsof/Makefile
cvs diff -r1.134 -r1.135 pkgsrc/sysutils/lsof/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/lsof/Makefile 2019/08/11 13:23:09 1.134
+++ pkgsrc/sysutils/lsof/Makefile 2019/09/18 18:30:54 1.135
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.134 2019/08/11 13:23:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.135 2019/09/18 18:30:54 tnn Exp $
2 2
3DISTNAME= lsof_4.91 3DISTNAME= lsof_4.91
4PKGNAME= ${DISTNAME:S/_/-/} 4PKGNAME= ${DISTNAME:S/_/-/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ftp://ftp.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/ 7MASTER_SITES= ftp://ftp.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/
8MASTER_SITES+= ftp://ftp.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/ 8MASTER_SITES+= ftp://ftp.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/
9MASTER_SITES+= ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/ 9MASTER_SITES+= ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/
10MASTER_SITES+= ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/OLD/ 10MASTER_SITES+= ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/OLD/
11EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://people.freebsd.org/~abe/ 14HOMEPAGE= https://people.freebsd.org/~abe/
@@ -37,27 +37,27 @@ REPLACE_AWK+= scripts/xusers.awk @@ -37,27 +37,27 @@ REPLACE_AWK+= scripts/xusers.awk
37USE_TOOLS+= digest perl:run 37USE_TOOLS+= digest perl:run
38 38
39TEST_DIRS= tests 39TEST_DIRS= tests
40TEST_TARGET= test 40TEST_TARGET= test
41INTERACTIVE_STAGE+= test 41INTERACTIVE_STAGE+= test
42 42
43.include "../../mk/bsd.prefs.mk" 43.include "../../mk/bsd.prefs.mk"
44.include "options.mk" 44.include "options.mk"
45 45
46REAL_GROUP= ${REAL_ROOT_GROUP} 46REAL_GROUP= ${REAL_ROOT_GROUP}
47.if ${OPSYS} == "NetBSD" 47.if ${OPSYS} == "NetBSD"
48REAL_GROUP= kmem 48REAL_GROUP= kmem
49CONFIGURE_ENV+= NETBSD_SYS="${NETBSDSRCDIR}/sys" 49CONFIGURE_ENV+= NETBSD_SYS="${NETBSDSRCDIR}/sys"
50CPPFLAGS+= -D_KMEMUSER 50CPPFLAGS+= -D_KMEMUSER -D__NAMECACHE_PRIVATE
51.elif ${OPSYS} == "FreeBSD" 51.elif ${OPSYS} == "FreeBSD"
52BUILDLINK_PASSTHRU_DIRS+= /usr/src/sys 52BUILDLINK_PASSTHRU_DIRS+= /usr/src/sys
53.elif ${OPSYS} == "SunOS" 53.elif ${OPSYS} == "SunOS"
54REAL_GROUP= sys 54REAL_GROUP= sys
55MAKE_ENV+= CPPFLAGS= 55MAKE_ENV+= CPPFLAGS=
56CONFIGURE_ENV+= LSOF_RANLIB="/bin/true" 56CONFIGURE_ENV+= LSOF_RANLIB="/bin/true"
57.endif 57.endif
58INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 share/doc/lsof share/examples/lsof 58INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 share/doc/lsof share/examples/lsof
59 59
60post-extract: 60post-extract:
61.if ${OPSYS} == "FreeBSD" 61.if ${OPSYS} == "FreeBSD"
62 if [ ! -x /usr/src/sys ]; then \ 62 if [ ! -x /usr/src/sys ]; then \
63 ${ECHO} "Lsof requires kernel sources to be found in /usr/src/sys." ; \ 63 ${ECHO} "Lsof requires kernel sources to be found in /usr/src/sys." ; \