[src/trunk]: src/external/bsd/file Fix sun2 (static linking)

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4f07d9abc07f
branches:  trunk
changeset: 466331:4f07d9abc07f
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Dec 17 18:59:39 2019 +0000

description:
Fix sun2 (static linking)

diffstat:

 external/bsd/file/Makefile.inc |  7 ++++++-
 external/bsd/file/bin/Makefile |  7 ++++---
 external/bsd/file/lib/Makefile |  6 ++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r 137db87565f3 -r 4f07d9abc07f external/bsd/file/Makefile.inc
--- a/external/bsd/file/Makefile.inc    Tue Dec 17 18:35:57 2019 +0000
+++ b/external/bsd/file/Makefile.inc    Tue Dec 17 18:59:39 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.6 2017/02/22 12:34:49 maya Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2019/12/17 18:59:39 christos Exp $
 
 WARNS=4
 DIST=${NETBSDSRCDIR}/external/bsd/file/dist
@@ -21,3 +21,8 @@
 CPPFLAGS+=     -I${.CURDIR}/../include -I${DIST}/src
 
 .PATH:         ${DIST}/src ${DIST}/doc
+
+DPLIBS+=     lzma    ${NETBSDSRCDIR}/external/public-domain/xz/lib
+DPLIBS+=     bz2     ${NETBSDSRCDIR}/lib/libbz2
+DPLIBS+=     z       ${NETBSDSRCDIR}/lib/libz
+
diff -r 137db87565f3 -r 4f07d9abc07f external/bsd/file/bin/Makefile
--- a/external/bsd/file/bin/Makefile    Tue Dec 17 18:35:57 2019 +0000
+++ b/external/bsd/file/bin/Makefile    Tue Dec 17 18:59:39 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2014/01/16 01:15:33 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2019/12/17 18:59:39 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -10,8 +10,9 @@
 .endif
 
 PROG=          file
-LDADD+=                -lmagic -lz
-DPADD+=                ${LIBMAGIC} ${LIBZ}
+LDADD+=                -lmagic
+DPADD+=                ${LIBMAGIC} 
+PROGDPLIBS     += ${DPLIBS}
 MAN=           file.1 magic.5
 
 CLEANFILES+=   magic.mgc
diff -r 137db87565f3 -r 4f07d9abc07f external/bsd/file/lib/Makefile
--- a/external/bsd/file/lib/Makefile    Tue Dec 17 18:35:57 2019 +0000
+++ b/external/bsd/file/lib/Makefile    Tue Dec 17 18:59:39 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2019/12/17 13:35:43 christos Exp $
+#      $NetBSD: Makefile,v 1.15 2019/12/17 18:59:39 christos Exp $
 #
 
 USE_FORT?= yes # data driven bugs?
@@ -8,9 +8,7 @@
 .include "../Makefile.inc"
 
 LIB=           magic
-LIBDPLIBS+=    lzma    ${NETBSDSRCDIR}/external/public-domain/xz/lib
-LIBDPLIBS+=    bz2     ${NETBSDSRCDIR}/lib/libbz2
-LIBDPLIBS+=    z       ${NETBSDSRCDIR}/lib/libz
+LIBDPLIBS+=    ${DPLIBS}
 CPPFLAGS+=-I.
 
 .if ${MACHINE_ARCH} == "i386"