Date: Sun, 31 May 2020 22:40:40 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361681 - in head/usr.bin/svn: svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc svnrdump svnserve svnsync svnversion Message-ID: <202005312240.04VMeeEN041329@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sun May 31 22:40:39 2020 New Revision: 361681 URL: https://svnweb.freebsd.org/changeset/base/361681 Log: Change more Makefiles under usr.bin/svn to make them easier to incrementally update. No functional change intended. MFC after: 2 weeks X-MFC-With: r361677 Modified: head/usr.bin/svn/svn/Makefile head/usr.bin/svn/svnadmin/Makefile head/usr.bin/svn/svnbench/Makefile head/usr.bin/svn/svndumpfilter/Makefile head/usr.bin/svn/svnfsfs/Makefile head/usr.bin/svn/svnlook/Makefile head/usr.bin/svn/svnmucc/Makefile head/usr.bin/svn/svnrdump/Makefile head/usr.bin/svn/svnserve/Makefile head/usr.bin/svn/svnsync/Makefile head/usr.bin/svn/svnversion/Makefile Modified: head/usr.bin/svn/svn/Makefile ============================================================================== --- head/usr.bin/svn/svn/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svn/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -2,54 +2,111 @@ .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svn +.PATH: ${SVNDIR}/svn -PROG= svn${SVNLITE} +PROG= svn${SVNLITE} -SRCS= add-cmd.c auth-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 \ - shelve-cmd.c status-cmd.c similarity.c status.c \ - svn.c switch-cmd.c unlock-cmd.c update-cmd.c upgrade-cmd.c util.c +SRCS= add-cmd.c \ + auth-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 \ + shelve-cmd.c \ + status-cmd.c \ + similarity.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:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ - -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ - -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -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} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + magic \ + crypto \ + ssl \ + pthread + +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} \ + ${LIBAPR} CLEANFILES+= svnlite.1 .if(defined(ORGANIZATION) && !empty(ORGANIZATION)) Modified: head/usr.bin/svn/svnadmin/Makefile ============================================================================== --- head/usr.bin/svn/svnadmin/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnadmin/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,33 +4,44 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnadmin +.PATH: ${SVNDIR}/svnadmin -PROG= svn${SVNLITE}admin +PROG= svn${SVNLITE}admin -SRCS= svnadmin.c +SRCS= svnadmin.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> Modified: head/usr.bin/svn/svnbench/Makefile ============================================================================== --- head/usr.bin/svn/svnbench/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnbench/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,45 +4,71 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnbench +.PATH: ${SVNDIR}/svnbench -PROG= svn${SVNLITE}bench +PROG= svn${SVNLITE}bench -SRCS= help-cmd.c notify.c null-blame-cmd.c null-export-cmd.c \ - null-info-cmd.c null-list-cmd.c null-log-cmd.c svnbench.c util.c +SRCS= help-cmd.c \ + notify.c \ + null-blame-cmd.c \ + null-export-cmd.c \ + null-info-cmd.c \ + null-list-cmd.c \ + null-log-cmd.c \ + svnbench.c \ + util.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ - -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ - -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z magic crypto ssl pthread +LIBADD+= bsdxml \ + sqlite3 \ + z \ + magic \ + crypto \ + ssl \ + pthread -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} \ - ${LIBAPR} +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} \ + ${LIBAPR} .include <bsd.prog.mk> Modified: head/usr.bin/svn/svndumpfilter/Makefile ============================================================================== --- head/usr.bin/svn/svndumpfilter/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svndumpfilter/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,33 +4,45 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svndumpfilter +.PATH: ${SVNDIR}/svndumpfilter -PROG= svn${SVNLITE}dumpfilter +PROG= svn${SVNLITE}dumpfilter -SRCS= svndumpfilter.c +SRCS= svndumpfilter.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z crypt pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypt \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> Modified: head/usr.bin/svn/svnfsfs/Makefile ============================================================================== --- head/usr.bin/svn/svnfsfs/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnfsfs/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,33 +4,47 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnfsfs +.PATH: ${SVNDIR}/svnfsfs -PROG= svn${SVNLITE}fsfs +PROG= svn${SVNLITE}fsfs -SRCS= dump-index-cmd.c load-index-cmd.c stats-cmd.c svnfsfs.c +SRCS= dump-index-cmd.c \ + load-index-cmd.c \ + stats-cmd.c \ + svnfsfs.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> Modified: head/usr.bin/svn/svnlook/Makefile ============================================================================== --- head/usr.bin/svn/svnlook/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnlook/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,34 +4,46 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnlook +.PATH: ${SVNDIR}/svnlook -PROG= svn${SVNLITE}look +PROG= svn${SVNLITE}look -SRCS= svnlook.c +SRCS= svnlook.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_REPOS} ${LIBSVN_FS} ${LIBSVN_FS_FS} ${LIBSVN_FS_UTIL} \ - ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} ${LIBAPR_UTIL} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_REPOS} \ + ${LIBSVN_FS} \ + ${LIBSVN_FS_FS} \ + ${LIBSVN_FS_UTIL} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk> Modified: head/usr.bin/svn/svnmucc/Makefile ============================================================================== --- head/usr.bin/svn/svnmucc/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnmucc/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,42 +4,60 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnmucc +.PATH: ${SVNDIR}/svnmucc -PROG= svn${SVNLITE}mucc +PROG= svn${SVNLITE}mucc -SRCS= svnmucc.c +SRCS= svnmucc.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ - -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ - -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z crypto ssl pthread +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -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} ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypto \ + ssl \ + pthread + +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} \ + ${LIBAPR} .include <bsd.prog.mk> Modified: head/usr.bin/svn/svnrdump/Makefile ============================================================================== --- head/usr.bin/svn/svnrdump/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnrdump/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,43 +4,65 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnrdump +.PATH: ${SVNDIR}/svnrdump -PROG= svn${SVNLITE}rdump +PROG= svn${SVNLITE}rdump -SRCS= dump_editor.c load_editor.c svnrdump.c util.c +SRCS= dump_editor.c \ + load_editor.c \ + svnrdump.c \ + util.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ - -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ - -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z crypto ssl pthread +LDADD= -L${LIBSVN_CLIENTDIR} -lsvn_client${PIE_SUFFIX} \ + -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -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} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypto \ + ssl \ + pthread + +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} \ + ${LIBAPR} .include <bsd.prog.mk> Modified: head/usr.bin/svn/svnserve/Makefile ============================================================================== --- head/usr.bin/svn/svnserve/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnserve/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,39 +4,59 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnserve +.PATH: ${SVNDIR}/svnserve -PROG= svn${SVNLITE}serve +PROG= svn${SVNLITE}serve -SRCS= cyrus_auth.c log-escape.c logger.c serve.c svnserve.c winservice.c +SRCS= cyrus_auth.c \ + log-escape.c \ + logger.c \ + serve.c \ + svnserve.c \ + winservice.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -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} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +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} \ + ${LIBAPR} .include <bsd.prog.mk> Modified: head/usr.bin/svn/svnsync/Makefile ============================================================================== --- head/usr.bin/svn/svnsync/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnsync/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,39 +4,57 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnsync +.PATH: ${SVNDIR}/svnsync -PROG= svn${SVNLITE}sync +PROG= svn${SVNLITE}sync -SRCS= svnsync.c sync.c +SRCS= svnsync.c \ + sync.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ - -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ - -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ - -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ - -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ - -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ - -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ - -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD= bsdxml sqlite3 z crypto ssl pthread +LDADD= -L${LIBSVN_RADIR} -lsvn_ra${PIE_SUFFIX} \ + -L${LIBSVN_RA_LOCALDIR} -lsvn_ra_local${PIE_SUFFIX} \ + -L${LIBSVN_RA_SVNDIR} -lsvn_ra_svn${PIE_SUFFIX} \ + -L${LIBSVN_RA_SERFDIR} -lsvn_ra_serf${PIE_SUFFIX} \ + -L${LIBSVN_REPOSDIR} -lsvn_repos${PIE_SUFFIX} \ + -L${LIBSVN_FSDIR} -lsvn_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_FSDIR} -lsvn_fs_fs${PIE_SUFFIX} \ + -L${LIBSVN_FS_XDIR} -lsvn_fs_x${PIE_SUFFIX} \ + -L${LIBSVN_FS_UTILDIR} -lsvn_fs_util${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBSERFDIR} -lserf${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -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} \ - ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + crypto \ + ssl \ + pthread + +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} \ + ${LIBAPR} .include <bsd.prog.mk> Modified: head/usr.bin/svn/svnversion/Makefile ============================================================================== --- head/usr.bin/svn/svnversion/Makefile Sun May 31 22:37:33 2020 (r361680) +++ head/usr.bin/svn/svnversion/Makefile Sun May 31 22:40:39 2020 (r361681) @@ -4,29 +4,40 @@ MAN= .include "${.CURDIR:H}/Makefile.inc" -.PATH: ${SVNDIR}/svnversion +.PATH: ${SVNDIR}/svnversion -PROG= svn${SVNLITE}version +PROG= svn${SVNLITE}version -SRCS= svnversion.c +SRCS= svnversion.c -CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR:H} \ - -I${.CURDIR:H}/lib/libapr \ - -I${APR}/include/arch/unix \ - -I${APR}/include \ - -I${.CURDIR:H}/lib/libapr_util \ - -I${APRU}/include/private \ - -I${APRU}/include +CFLAGS+= -I${SVNDIR}/include \ + -I${SVNDIR} \ + -I${.CURDIR:H} \ + -I${.CURDIR:H}/lib/libapr \ + -I${APR}/include/arch/unix \ + -I${APR}/include \ + -I${.CURDIR:H}/lib/libapr_util \ + -I${APRU}/include/private \ + -I${APRU}/include -LDADD= -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ - -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ - -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ - -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ - -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ - -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -LIBADD+= bsdxml sqlite3 z pthread +LDADD= -L${LIBSVN_WCDIR} -lsvn_wc${PIE_SUFFIX} \ + -L${LIBSVN_DELTADIR} -lsvn_delta${PIE_SUFFIX} \ + -L${LIBSVN_DIFFDIR} -lsvn_diff${PIE_SUFFIX} \ + -L${LIBSVN_SUBRDIR} -lsvn_subr${PIE_SUFFIX} \ + -L${LIBAPR_UTILDIR} -lapr-util${PIE_SUFFIX} \ + -L${LIBAPRDIR} -lapr${PIE_SUFFIX} -DPADD= ${LIBSVN_WC} ${LIBSVN_DELTA} ${LIBSVN_DIFF} ${LIBSVN_SUBR} \ - ${LIBSERF} ${LIBAPR_UTIL} ${LIBAPR} +LIBADD+= bsdxml \ + sqlite3 \ + z \ + pthread + +DPADD= ${LIBSVN_WC} \ + ${LIBSVN_DELTA} \ + ${LIBSVN_DIFF} \ + ${LIBSVN_SUBR} \ + ${LIBSERF} \ + ${LIBAPR_UTIL} \ + ${LIBAPR} .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005312240.04VMeeEN041329>