Sun Sep 21 19:46:00 2008 UTC ()
Switch to libarchive in src/external/bsd.


(joerg)
diff -r1.5 -r1.6 src/external/bsd/Makefile
diff -r1.1 -r1.2 src/external/lib/Makefile
diff -r1.126 -r1.127 src/lib/Makefile
diff -r1.7 -r0 src/lib/libarchive/Makefile
diff -r1.5 -r0 src/lib/libarchive/config_netbsd.h
diff -r1.2 -r0 src/lib/libarchive/shlib_version
cvs diff -r1.5 -r1.6 src/external/bsd/Makefile (expand / switch to unified diff)

--- src/external/bsd/Makefile 2008/09/19 21:41:51 1.5
+++ src/external/bsd/Makefile 2008/09/21 19:45:59 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2008/09/19 21:41:51 christos Exp $ 1# $NetBSD: Makefile,v 1.6 2008/09/21 19:45:59 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5SUBDIR+= am-utils dhcpcd 5SUBDIR+= am-utils dhcpcd libarchive
6.if (${MKLDAP} != "no") 6.if (${MKLDAP} != "no")
7SUBDIR+= openldap 7SUBDIR+= openldap
8.endif 8.endif
9.if (${MKPCC} != "no") 9.if (${MKPCC} != "no")
10SUBDIR+= pcc 10SUBDIR+= pcc
11.endif 11.endif
12SUBDIR+= top 12SUBDIR+= top
13 13
14.include <bsd.subdir.mk> 14.include <bsd.subdir.mk>
cvs diff -r1.1 -r1.2 src/external/lib/Attic/Makefile (expand / switch to unified diff)

--- src/external/lib/Attic/Makefile 2008/05/22 14:12:21 1.1
+++ src/external/lib/Attic/Makefile 2008/09/21 19:45:59 1.2
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2008/05/22 14:12:21 lukem Exp $ 1# $NetBSD: Makefile,v 1.2 2008/09/21 19:45:59 joerg Exp $
2 2
3# 3#
4# This Makefile exists to provide a single point to build 4# This Makefile exists to provide a single point to build
5# all libraries provided by external packages that may 5# all libraries provided by external packages that may
6# be used by other applications in the system. 6# be used by other applications in the system.
7# 7#
8 8
9.include <bsd.own.mk> 9.include <bsd.own.mk>
10 10
11.if (${MKLDAP} != "no") 11.if (${MKLDAP} != "no")
12SUBDIR+= ../bsd/openldap/lib 12SUBDIR+= ../bsd/openldap/lib
13.endif 13.endif
14 14
 15SUBDIR+= ../bsd/libarchive/lib
 16
15.include <bsd.subdir.mk> 17.include <bsd.subdir.mk>
cvs diff -r1.126 -r1.127 src/lib/Makefile (expand / switch to unified diff)

--- src/lib/Makefile 2008/07/29 13:17:40 1.126
+++ src/lib/Makefile 2008/09/21 19:46:00 1.127
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.126 2008/07/29 13:17:40 pooka Exp $ 1# $NetBSD: Makefile,v 1.127 2008/09/21 19:46:00 joerg Exp $
2# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 2# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6SUBDIR= csu libc .WAIT libarch \ 6SUBDIR= csu libc .WAIT libarch \
7 libbsdmalloc libbluetooth libbz2 \ 7 libbsdmalloc libbluetooth libbz2 \
8 libcompat libcrypt \ 8 libcompat libcrypt \
9 libcurses libevent libintl libkvm libl libm \ 9 libcurses libevent libintl libkvm libl libm \
10 libossaudio libpcap libpci libpmc libposix libprop libpthread \ 10 libossaudio libpcap libpci libpmc libposix libprop libpthread \
11 libpthread_dbg libpuffs libresolv librmt librpcsvc librt libsdp \ 11 libpthread_dbg libpuffs libresolv librmt librpcsvc librt libsdp \
12 libterm libusbhid libutil libwrap liby libz 12 libterm libusbhid libutil libwrap liby libz
13 13
14.if (${MKATF} != "no") 14.if (${MKATF} != "no")
@@ -55,28 +55,26 @@ SUBDIR+= libtelnet @@ -55,28 +55,26 @@ SUBDIR+= libtelnet
55SUBDIR+= libipsec 55SUBDIR+= libipsec
56 56
57# I18N modules 57# I18N modules
58SUBDIR+= i18n_module 58SUBDIR+= i18n_module
59 59
60 60
61# 61#
62# Libraries that depend upon any listed previously 62# Libraries that depend upon any listed previously
63# (and those that depend upon these [and ...]) 63# (and those that depend upon these [and ...])
64# 64#
65#==================== 1st library dependency barrier ==================== 65#==================== 1st library dependency barrier ====================
66SUBDIR+= .WAIT 66SUBDIR+= .WAIT
67 67
68SUBDIR+= libarchive # depends on libbz2 and libz 
69 
70SUBDIR+= libedit # depends on libterm 68SUBDIR+= libedit # depends on libterm
71 69
72SUBDIR+= libmagic # depends on libz 70SUBDIR+= libmagic # depends on libz
73 71
74SUBDIR+= libradius # depends on libcrypto - only if ${MKCRYPTO} 72SUBDIR+= libradius # depends on libcrypto - only if ${MKCRYPTO}
75 73
76.if (${MKISCSI} != "no") 74.if (${MKISCSI} != "no")
77SUBDIR+= libiscsi # depends on libpthread 75SUBDIR+= libiscsi # depends on libpthread
78.endif 76.endif
79 77
80.if (${MKCRYPTO} != "no") 78.if (${MKCRYPTO} != "no")
81SUBDIR+= libssl # depends on libcrypto 79SUBDIR+= libssl # depends on libcrypto
82SUBDIR+= libssh # depends on libcrypto 80SUBDIR+= libssh # depends on libcrypto
File Deleted: src/lib/libarchive/Attic/Makefile
File Deleted: src/lib/libarchive/Attic/config_netbsd.h
File Deleted: src/lib/libarchive/Attic/shlib_version