From owner-p4-projects@FreeBSD.ORG Thu Dec 27 20:06:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37A7F16A41A; Thu, 27 Dec 2007 20:06:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD93116A418 for ; Thu, 27 Dec 2007 20:06:16 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C5A5313C458 for ; Thu, 27 Dec 2007 20:06:16 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBRK6GDk063479 for ; Thu, 27 Dec 2007 20:06:16 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBRK6GBt063475 for perforce@freebsd.org; Thu, 27 Dec 2007 20:06:16 GMT (envelope-from peter@freebsd.org) Date: Thu, 27 Dec 2007 20:06:16 GMT Message-Id: <200712272006.lBRK6GBt063475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 131801 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Dec 2007 20:06:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=131801 Change 131801 by peter@peter_melody on 2007/12/27 20:06:02 buildworld compatability - find the includes in the tmproot. Affected files ... .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_client/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_delta/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_diff/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs_fs/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_dav/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_local/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_svn/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_repos/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_subr/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/lib/libsvn_wc/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/svn/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/svnadmin/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/svndumpfilter/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/svnlook/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/svnserve/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/svnsync/Makefile#3 edit .. //depot/projects/hammer/usr.bin/svn/svnversion/Makefile#3 edit Differences ... ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_client/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = add.c blame.c cat.c checkout.c cleanup.c commit.c commit_util.c \ compat_providers.c copy.c ctx.c delete.c diff.c export.c externals.c \ ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_delta/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = cancel.c compose_delta.c debug_editor.c default_editor.c \ path_driver.c svndiff.c text_delta.c vdelta.c version.c xdelta.c ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_diff/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = diff.c diff3.c diff4.c diff_file.c lcs.c token.c util.c ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = access.c fs-loader.c ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs_fs/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = dag.c err.c fs.c fs_fs.c id.c key-gen.c lock.c tree.c ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = ra_loader.c ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_dav/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = commit.c fetch.c file_revs.c log.c merge.c options.c props.c replay.c \ session.c util.c ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_local/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = ra_plugin.c split_url.c ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_svn/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = client.c cram.c editor.c editorp.c marshal.c version.c ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_repos/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = authz.c commit.c delta.c dump.c fs-wrap.c hooks.c load.c log.c \ node_tree.c replay.c reporter.c repos.c rev_hunt.c ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_subr/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = auth.c cmdline.c compat.c config.c config_auth.c config_file.c \ config_win.c constructors.c ctype.c date.c dso.c error.c hash.c io.c \ ==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_wc/Makefile#3 (text+ko) ==== @@ -8,7 +8,7 @@ SHLIB_MAJOR= 1 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr SRCS = adm_crawler.c adm_files.c adm_ops.c copy.c diff.c entries.c lock.c \ log.c merge.c props.c questions.c relocate.c revision_status.c \ ==== //depot/projects/hammer/usr.bin/svn/svn/Makefile#3 (text+ko) ==== @@ -16,7 +16,7 @@ unlock-cmd.c update-cmd.c util.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr DPADD= ${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \ ${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \ ==== //depot/projects/hammer/usr.bin/svn/svnadmin/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ SRCS= main.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr DPADD= ${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \ ${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \ ==== //depot/projects/hammer/usr.bin/svn/svndumpfilter/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ SRCS= main.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr DPADD= ${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \ ${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \ ==== //depot/projects/hammer/usr.bin/svn/svnlook/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ SRCS= main.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr DPADD= ${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \ ${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \ ==== //depot/projects/hammer/usr.bin/svn/svnserve/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ SRCS= main.c serve.c winservice.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr DPADD= ${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \ ${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \ ==== //depot/projects/hammer/usr.bin/svn/svnsync/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ SRCS= main.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr DPADD= ${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \ ${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \ ==== //depot/projects/hammer/usr.bin/svn/svnversion/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ SRCS= main.c CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \ - -I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr + -I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr DPADD= ${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \ ${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \