Index: head/lib/Makefile =================================================================== --- head/lib/Makefile (revision 274884) +++ head/lib/Makefile (revision 274885) @@ -1,307 +1,308 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ .include # The SUBDIR_ORDERED list is a small set of libraries which are used by many # of the other libraries. These are built first with a .WAIT between them # and the main list to avoid needing a SUBDIR_DEPEND line on every library # naming just these few items. SUBDIR_ORDERED= ${_csu} \ .WAIT \ libc \ libc_nonshared \ libcompiler_rt \ ${_libcplusplus} \ ${_libcxxrt} \ libelf \ msun # The main list; please keep these sorted alphabetically. SUBDIR= ${SUBDIR_ORDERED} \ .WAIT \ libalias \ libarchive \ ${_libatm} \ libauditd \ libbegemot \ libblocksruntime \ ${_libbluetooth} \ ${_libbsnmp} \ libbsdstat \ libbsm \ libbz2 \ libcalendar \ libcam \ ${_libcapsicum} \ ${_libcasper} \ ${_libcom_err} \ libcompat \ libcrypt \ libdevinfo \ libdevstat \ libdpv \ libdwarf \ libedit \ ${_libevent} \ libexecinfo \ libexpat \ libfetch \ libfigpar \ libgeom \ ${_libgpib} \ ${_libgssapi} \ ${_librpcsec_gss} \ ${_libiconv_modules} \ libipsec \ libjail \ libkiconv \ libkvm \ ${_libldns} \ liblzma \ libmagic \ libmandoc \ libmemstat \ libmd \ ${_libmilter} \ ${_libmp} \ ${_libnandfs} \ libnetbsd \ ${_libnetgraph} \ ${_libngatm} \ libnv \ libohash \ libopie \ libpam \ libpcap \ libpjdlog \ ${_libpmc} \ ${_libproc} \ libprocstat \ libradius \ librpcsvc \ librt \ ${_librtld_db} \ libsbuf \ ${_libsdp} \ ${_libsm} \ ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} \ + libsqlite3 \ libstand \ libstdbuf \ libstdthreads \ libtacplus \ ${_libtelnet} \ ${_libthr} \ libthread_db \ libucl \ libufs \ libugidfw \ libulog \ ${_libunbound} \ ${_libusbhid} \ ${_libusb} \ libutil \ ${_libvgl} \ ${_libvmmapi} \ libwrap \ libxo \ liby \ ${_libypclnt} \ libz \ ncurses \ ${_atf} \ ${_clang} \ ${_cuse} \ ${_tests} # Inter-library dependencies. When the makefile for a library contains LDADD # libraries, those libraries should be listed as build order dependencies here. SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd SUBDIR_DEPEND_libatm= libmd SUBDIR_DEPEND_libauditdm= libbsm SUBDIR_DEPEND_libbsnmp= ${_libnetgraph} SUBDIR_DEPEND_libc++= libcxxrt SUBDIR_DEPEND_libc= libcompiler_rt SUBDIR_DEPEND_libcam= libsbuf SUBDIR_DEPEND_libcapsicum= libnv SUBDIR_DEPEND_libcasper= libcapsicum libnv libpjdlog SUBDIR_DEPEND_libdevstat= libkvm SUBDIR_DEPEND_libdpv= libfigpar ncurses libutil SUBDIR_DEPEND_libedit= ncurses SUBDIR_DEPEND_libg++= msun SUBDIR_DEPEND_libgeom= libexpat libsbuf SUBDIR_DEPEND_liblibrpcsec_gss= libgssapi SUBDIR_DEPEND_libmagic= libz SUBDIR_DEPEND_libmemstat= libkvm SUBDIR_DEPEND_libopie= libmd SUBDIR_DEPEND_libpam= libcrypt libopie libradius librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} SUBDIR_DEPEND_libpjdlog= libutil SUBDIR_DEPEND_libprocstat= libkvm libutil SUBDIR_DEPEND_libradius= libmd SUBDIR_DEPEND_libreadline= ncurses SUBDIR_DEPEND_libsmb= libkiconv SUBDIR_DEPEND_libstdc++= msun SUBDIR_DEPEND_libtacplus= libmd SUBDIR_DEPEND_libulog= libmd SUBDIR_DEPEND_libunbound= ${_libldns} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf .elif exists(${.CURDIR}/csu/${MACHINE_ARCH}) _csu=csu/${MACHINE_ARCH} .elif exists(${.CURDIR}/csu/${MACHINE_CPUARCH}/Makefile) _csu=csu/${MACHINE_CPUARCH} .else _csu=csu .endif # NB: keep these sorted by MK_* knobs .if ${MK_ATM} != "no" _libngatm= libngatm .endif .if ${MK_BLUETOOTH} != "no" _libbluetooth= libbluetooth _libsdp= libsdp .endif .if ${MK_BSNMP} != "no" _libbsnmp= libbsnmp .endif .if ${MK_CASPER} != "no" _libcapsicum= libcapsicum _libcasper= libcasper .endif .if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) _clang= clang .endif .if ${MK_CUSE} != "no" _cuse= libcuse .endif .if ${MK_GPIB} != "no" _libgpib= libgpib .endif .if ${MK_GSSAPI} != "no" _libgssapi= libgssapi _librpcsec_gss= librpcsec_gss .endif .if ${MK_ICONV} != "no" _libiconv_modules= libiconv_modules .endif .if ${MK_KERBEROS_SUPPORT} != "no" _libcom_err= libcom_err .endif .if ${MK_LDNS} != "no" _libldns= libldns .endif .if ${MK_LIBCPLUSPLUS} != "no" _libcxxrt= libcxxrt _libcplusplus= libc++ .endif .if ${MK_LIBTHR} != "no" _libthr= libthr .endif .if ${MK_NAND} != "no" _libnandfs= libnandfs .endif .if ${MK_NETGRAPH} != "no" _libnetgraph= libnetgraph .endif .if ${MK_NIS} != "no" _libypclnt= libypclnt .endif .if ${MK_PF} != "no" _libevent= libevent .endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _libsmb= libsmb _libvgl= libvgl _libproc= libproc _librtld_db= librtld_db .endif .if ${MACHINE_CPUARCH} == "amd64" _libvmmapi= libvmmapi .endif .if ${MACHINE_CPUARCH} == "mips" _libproc= libproc _librtld_db= librtld_db .endif .if ${MACHINE_CPUARCH} == "powerpc" _libproc= libproc _librtld_db= librtld_db _libsmb= libsmb .endif .if ${MACHINE_CPUARCH} == "sparc64" _libsmb= libsmb .endif .if ${MK_OPENSSL} != "no" _libmp= libmp .endif .if ${MK_PMC} != "no" _libpmc= libpmc .endif .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm _libsmdb= libsmdb _libsmutil= libsmutil .endif .if ${MK_TELNET} != "no" _libtelnet= libtelnet .endif .if ${MK_TESTS_SUPPORT} != "no" _atf= atf .endif .if ${MK_TESTS} != "no" _tests= tests .endif .if ${MK_UNBOUND} != "no" _libunbound= libunbound .endif .if ${MK_USB} != "no" _libusbhid= libusbhid _libusb= libusb .endif .if !defined(LIBRARIES_ONLY) afterinstall: ${INSTALL_SYMLINK} ../include ${DESTDIR}/usr/lib/include .endif .if !make(install) SUBDIR_PARALLEL= .endif .include Index: head/lib/libsqlite3/Makefile =================================================================== --- head/lib/libsqlite3/Makefile (nonexistent) +++ head/lib/libsqlite3/Makefile (revision 274885) @@ -0,0 +1,38 @@ +# $FreeBSD$ + +PRIVATELIB= yes +LIB= sqlite3 +SHLIB_MAJOR?= 0 + +SRCS= sqlite3.c + +SQLITE= ${.CURDIR}/../../contrib/sqlite3 +.PATH: ${SQLITE} + +WARNS= 3 +CFLAGS+= -I${SQLITE} \ + -DSTDC_HEADERS=1 \ + -DHAVE_SYS_TYPES_H=1 \ + -DHAVE_SYS_STAT_H=1 \ + -DUSE_PREAD=1 \ + -DHAVE_STDLIB_H=1 \ + -DHAVE_STRING_H=1 \ + -DHAVE_MEMORY_H=1 \ + -DHAVE_STRINGS_H=1 \ + -DHAVE_INTTYPES_H=1 \ + -DHAVE_STDINT_H=1 \ + -DHAVE_UNISTD_H=1 \ + -DHAVE_DLFCN_H=1 \ + -DHAVE_USLEEP=1 \ + -DHAVE_LOCALTIME_R=1 \ + -DHAVE_GMTIME_R=1 \ + -DHAVE_DECL_STRERROR_R=1 \ + -DHAVE_STRERROR_R=1 \ + -DHAVE_POSIX_FALLOCATE=1 \ + -D_REENTRANT=1 \ + -DSQLITE_THREADSAFE=1 \ + -DSQLITE_ENABLE_FTS3 \ + -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_RTREE + +.include Property changes on: head/lib/libsqlite3/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/usr.bin/svn/Makefile.inc =================================================================== --- head/usr.bin/svn/Makefile.inc (revision 274884) +++ head/usr.bin/svn/Makefile.inc (revision 274885) @@ -1,61 +1,58 @@ # $FreeBSD$ .include .if ${MK_SVN} == "yes" SVNLITE?= .else SVNLITE?= lite .endif .if !defined(SVNDIR) SVNDIR= ${.CURDIR}/../../../contrib/subversion/subversion APRU= ${.CURDIR}/../../../contrib/apr-util APR= ${.CURDIR}/../../../contrib/apr -SQLITE= ${.CURDIR}/../../../contrib/sqlite3 WARNS?= 0 # defintely not warns friendly .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" .endif LIBAPRDIR= ${.OBJDIR}/../lib/libapr LIBAPR_UTILDIR= ${.OBJDIR}/../lib/libapr_util -LIBSQLITEDIR= ${.OBJDIR}/../lib/libsqlite3 LIBSERFDIR= ${.OBJDIR}/../lib/libserf LIBSVN_CLIENTDIR= ${.OBJDIR}/../lib/libsvn_client LIBSVN_DELTADIR= ${.OBJDIR}/../lib/libsvn_delta LIBSVN_DIFFDIR= ${.OBJDIR}/../lib/libsvn_diff LIBSVN_FSDIR= ${.OBJDIR}/../lib/libsvn_fs LIBSVN_FS_FSDIR= ${.OBJDIR}/../lib/libsvn_fs_fs LIBSVN_FS_UTILDIR= ${.OBJDIR}/../lib/libsvn_fs_util LIBSVN_RADIR= ${.OBJDIR}/../lib/libsvn_ra LIBSVN_RA_LOCALDIR= ${.OBJDIR}/../lib/libsvn_ra_local LIBSVN_RA_SVNDIR= ${.OBJDIR}/../lib/libsvn_ra_svn LIBSVN_RA_SERFDIR= ${.OBJDIR}/../lib/libsvn_ra_serf LIBSVN_REPOSDIR= ${.OBJDIR}/../lib/libsvn_repos LIBSVN_SUBRDIR= ${.OBJDIR}/../lib/libsvn_subr LIBSVN_WCDIR= ${.OBJDIR}/../lib/libsvn_wc LIBAPR= ${LIBAPRDIR}/libapr.a LIBAPR_UTIL= ${LIBAPR_UTILDIR}/libapr-util.a -LIBSQLITE= ${LIBSQLITEDIR}/libsqlite3.a LIBSERF= ${LIBSERFDIR}/libserf.a LIBSVN_CLIENT= ${LIBSVN_CLIENTDIR}/libsvn_client.a LIBSVN_DELTA= ${LIBSVN_DELTADIR}/libsvn_delta.a LIBSVN_DIFF= ${LIBSVN_DIFFDIR}/libsvn_diff.a LIBSVN_FS= ${LIBSVN_FSDIR}/libsvn_fs.a LIBSVN_FS_FS= ${LIBSVN_FS_FSDIR}/libsvn_fs_fs.a LIBSVN_FS_UTIL= ${LIBSVN_FS_UTILDIR}/libsvn_fs_util.a LIBSVN_RA= ${LIBSVN_RADIR}/libsvn_ra.a LIBSVN_RA_LOCAL= ${LIBSVN_RA_LOCALDIR}/libsvn_ra_local.a LIBSVN_RA_SVN= ${LIBSVN_RA_SVNDIR}/libsvn_ra_svn.a LIBSVN_RA_SERF= ${LIBSVN_RA_SERFDIR}/libsvn_ra_serf.a LIBSVN_REPOS= ${LIBSVN_REPOSDIR}/libsvn_repos.a LIBSVN_SUBR= ${LIBSVN_SUBRDIR}/libsvn_subr.a LIBSVN_WC= ${LIBSVN_WCDIR}/libsvn_wc.a .endif Index: head/usr.bin/svn/lib/libsqlite3/Makefile =================================================================== --- head/usr.bin/svn/lib/libsqlite3/Makefile (revision 274884) +++ head/usr.bin/svn/lib/libsqlite3/Makefile (nonexistent) @@ -1,25 +0,0 @@ -# $FreeBSD$ - -.include "${.CURDIR}/../Makefile.inc" - -INTERNALLIB= yes -LIB= sqlite3 - -SRCS= sqlite3.c - -.PATH: ${SQLITE} - -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} \ - -I${APR}/include/arch/unix -I${APR}/include - -CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \ - -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \ - -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \ - -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE_USLEEP=1 \ - -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 \ - -DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 \ - -DHAVE_READLINE=1 -DHAVE_POSIX_FALLOCATE=1 \ - -I${SQLITE} -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 \ - -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE - -.include Property changes on: head/usr.bin/svn/lib/libsqlite3/Makefile ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/usr.bin/svn/lib/Makefile =================================================================== --- head/usr.bin/svn/lib/Makefile (revision 274884) +++ head/usr.bin/svn/lib/Makefile (revision 274885) @@ -1,8 +1,8 @@ # $FreeBSD$ -SUBDIR= libapr libapr_util libserf libsqlite3 \ +SUBDIR= libapr libapr_util libserf \ libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_fs \ libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_serf \ libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc .include Index: head/usr.bin/svn/svn/Makefile =================================================================== --- head/usr.bin/svn/svn/Makefile (revision 274884) +++ head/usr.bin/svn/svn/Makefile (revision 274885) @@ -1,68 +1,69 @@ # $FreeBSD$ .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svn PROG= svn${SVNLITE} SRCS= add-cmd.c blame-cmd.c cat-cmd.c changelist-cmd.c checkout-cmd.c \ cl-conflicts.c cleanup-cmd.c commit-cmd.c conflict-callbacks.c \ copy-cmd.c delete-cmd.c deprecated.c diff-cmd.c export-cmd.c \ file-merge.c help-cmd.c import-cmd.c info-cmd.c list-cmd.c \ lock-cmd.c log-cmd.c merge-cmd.c mergeinfo-cmd.c mkdir-cmd.c \ move-cmd.c notify.c patch-cmd.c propdel-cmd.c propedit-cmd.c \ propget-cmd.c proplist-cmd.c props.c propset-cmd.c relocate-cmd.c \ resolve-cmd.c resolved-cmd.c revert-cmd.c status-cmd.c status.c \ svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ -I${.CURDIR}/../lib/libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ -I${.CURDIR}/../lib/libapr_util \ -I${APRU}/include/private \ -I${APRU}/include LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ -L${LIBSVN_WCDIR} -lsvn_wc \ -L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ - -L${LIBSQLITEDIR} -lsqlite3 \ + ${LDSQLITE3} \ -lz -lcrypt -lmagic -lcrypto -lssl -lpthread DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \ ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \ ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ + ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} +USEPRIVATELIB= sqlite3 CLEANFILES+= svnlite.1 .if(defined(ORGANIZATION) && !empty(ORGANIZATION)) DPSRCS+= freebsd-organization.h CLEANFILES+= freebsd-organization.h CFLAGS+= -I. -DHAS_ORGANIZATION_NAME freebsd-organization.h: @echo '#define ORGANIZATION_NAME ${ORGANIZATION}' \ > freebsd-organization.h .endif svnlite.1: svn.1 # Avoid the website sed -E 's,(^| |B|`)svn,\1svnlite,g' ${SVNDIR}/svn/svn.1 > ${.OBJDIR}/svnlite.1 .include Index: head/usr.bin/svn/svnadmin/Makefile =================================================================== --- head/usr.bin/svn/svnadmin/Makefile (revision 274884) +++ head/usr.bin/svn/svnadmin/Makefile (revision 274885) @@ -1,37 +1,39 @@ # $FreeBSD$ MAN= .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svnadmin PROG= svn${SVNLITE}admin SRCS= svnadmin.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ -I${.CURDIR}/../lib/libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ -I${.CURDIR}/../lib/libapr_util \ -I${APRU}/include/private \ -I${APRU}/include LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBAPR_UTILDIR} -lapr-util \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ - -L${LIBSQLITEDIR} -lsqlite3 \ + ${LDSQLITE3} \ -lz -lcrypt -lpthread DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} + ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} + +USEPRIVATELIB= sqlite3 .include Index: head/usr.bin/svn/svndumpfilter/Makefile =================================================================== --- head/usr.bin/svn/svndumpfilter/Makefile (revision 274884) +++ head/usr.bin/svn/svndumpfilter/Makefile (revision 274885) @@ -1,37 +1,38 @@ # $FreeBSD$ MAN= .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svndumpfilter PROG= svn${SVNLITE}dumpfilter SRCS= svndumpfilter.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ -I${.CURDIR}/../lib/libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ -I${.CURDIR}/../lib/libapr_util \ -I${APRU}/include/private \ -I${APRU}/include LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBAPR_UTILDIR} -lapr-util \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ - -L${LIBSQLITEDIR} -lsqlite3 \ + ${LDSQLITE3} \ -lz -lcrypt -lpthread DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} + ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} +USEPRIVATELIB= sqlite3 .include Index: head/usr.bin/svn/svnlook/Makefile =================================================================== --- head/usr.bin/svn/svnlook/Makefile (revision 274884) +++ head/usr.bin/svn/svnlook/Makefile (revision 274885) @@ -1,38 +1,39 @@ # $FreeBSD$ MAN= .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svnlook PROG= svn${SVNLITE}look SRCS= svnlook.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ -I${.CURDIR}/../lib/libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ -I${.CURDIR}/../lib/libapr_util \ -I${APRU}/include/private \ -I${APRU}/include LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBAPR_UTILDIR} -lapr-util \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ - -L${LIBSQLITEDIR} -lsqlite3 \ + ${LDSQLITE3} \ -lz -lcrypt -lpthread DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} + ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} +USEPRIVATELIB= sqlite3 .include Index: head/usr.bin/svn/svnmucc/Makefile =================================================================== --- head/usr.bin/svn/svnmucc/Makefile (revision 274884) +++ head/usr.bin/svn/svnmucc/Makefile (revision 274885) @@ -1,45 +1,46 @@ # $FreeBSD$ MAN= .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svnmucc PROG= svn${SVNLITE}mucc SRCS= svnmucc.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ -I${.CURDIR}/../lib/libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ -I${.CURDIR}/../lib/libapr_util \ -I${APRU}/include/private \ -I${APRU}/include LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ -L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ - -L${LIBSQLITEDIR} -lsqlite3 \ + ${LDSQLITE3} \ -lz -lcrypt -lmagic -lcrypto -lssl -lpthread DPADD= ${LIBSVN_CLIENT} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} \ ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} \ ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} \ - ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} \ + ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} \ ${LIBCRYPT} ${LIBMAGIC} ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} +USEPRIVATELIB= sqlite3 .include Index: head/usr.bin/svn/svnrdump/Makefile =================================================================== --- head/usr.bin/svn/svnrdump/Makefile (revision 274884) +++ head/usr.bin/svn/svnrdump/Makefile (revision 274885) @@ -1,48 +1,49 @@ # $FreeBSD$ MAN= .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svnrdump PROG= svn${SVNLITE}rdump SRCS= dump_editor.c load_editor.c svnrdump.c util.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ -I${.CURDIR}/../lib/libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ -I${.CURDIR}/../lib/libapr_util \ -I${APRU}/include/private \ -I${APRU}/include LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client \ -L${LIBSVN_WCDIR} -lsvn_wc \ -L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ - -L${LIBSQLITEDIR} -lsqlite3 \ + ${LDSQLITE3} \ -lz -lcrypt -lmagic -lcrypto -lssl -lpthread DPADD= ${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \ ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} ${LIBSVN_REPOS} \ ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} ${LIBSVN_DELTA} \ ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ + ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} +USEPRIVATELIB= sqlite3 .include Index: head/usr.bin/svn/svnserve/Makefile =================================================================== --- head/usr.bin/svn/svnserve/Makefile (revision 274884) +++ head/usr.bin/svn/svnserve/Makefile (revision 274885) @@ -1,44 +1,45 @@ # $FreeBSD$ MAN= .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svnserve PROG= svn${SVNLITE}serve SRCS= cyrus_auth.c log-escape.c serve.c svnserve.c winservice.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ -I${.CURDIR}/../lib/libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ -I${.CURDIR}/../lib/libapr_util \ -I${APRU}/include/private \ -I${APRU}/include LDADD= -L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ - -L${LIBSQLITEDIR} -lsqlite3 \ + ${LDSQLITE3} \ -lz -lcrypt -lmagic -lcrypto -lssl -lpthread DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \ ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ + ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} +USEPRIVATELIB= sqlite3 .include Index: head/usr.bin/svn/svnsync/Makefile =================================================================== --- head/usr.bin/svn/svnsync/Makefile (revision 274884) +++ head/usr.bin/svn/svnsync/Makefile (revision 274885) @@ -1,44 +1,45 @@ # $FreeBSD$ MAN= .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svnsync PROG= svn${SVNLITE}sync SRCS= svnsync.c sync.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ -I${.CURDIR}/../lib/libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ -I${.CURDIR}/../lib/libapr_util \ -I${APRU}/include/private \ -I${APRU}/include LDADD= -L${LIBSVN_RADIR} -lsvn_ra \ -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local \ -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn \ -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf \ -L${LIBSVN_REPOSDIR} -lsvn_repos \ -L${LIBSVN_FSDIR} -lsvn_fs \ -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs \ -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util \ -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBSERFDIR} -lserf \ -L${LIBAPR_UTILDIR} -lapr-util \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ - -L${LIBSQLITEDIR} -lsqlite3 \ + ${LDSQLITE3} \ -lz -lcrypt -lmagic -lcrypto -lssl -lpthread DPADD= ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} ${LIBSVN_RA_SVN} ${LIBSVN_RA_SERF} \ ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBSERF} ${LIBAPR_UTIL} \ - ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ + ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \ ${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD} +USEPRIVATELIB= sqlite3 .include Index: head/usr.bin/svn/svnversion/Makefile =================================================================== --- head/usr.bin/svn/svnversion/Makefile (revision 274884) +++ head/usr.bin/svn/svnversion/Makefile (revision 274885) @@ -1,35 +1,36 @@ # $FreeBSD$ MAN= .include "${.CURDIR}/../Makefile.inc" .PATH: ${SVNDIR}/svnversion PROG= svn${SVNLITE}version SRCS= svnversion.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ -I${.CURDIR}/../lib/libapr \ -I${APR}/include/arch/unix \ -I${APR}/include \ -I${.CURDIR}/../lib/libapr_util \ -I${APRU}/include/private \ -I${APRU}/include LDADD= -L${LIBSVN_WCDIR} -lsvn_wc \ -L${LIBSVN_DELTADIR} -lsvn_delta \ -L${LIBSVN_DIFFDIR} -lsvn_diff \ -L${LIBSVN_SUBRDIR} -lsvn_subr \ -L${LIBAPR_UTILDIR} -lapr-util \ -lbsdxml \ -L${LIBAPRDIR} -lapr \ - -L${LIBSQLITEDIR} -lsqlite3 \ + ${LDSQLITE3} \ -lz -lcrypt -lpthread DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \ - ${LIBSERF} ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} \ + ${LIBSERF} ${LIBAPR_UTIL} ${LIBBSDXML} ${LIBAPR} ${LIBSQLITE3} \ ${LIBZ} ${LIBCRYPT} ${LIBPTHREAD} +USEPRIVATELIB= sqlite3 .include