Date: Fri, 7 May 2010 08:01:31 GMT From: Garrett Cooper <gcooper@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 177887 for review Message-ID: <201005070801.o4781VUh059927@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@177887?ac=10 Change 177887 by gcooper@gcooper-bayonetta on 2010/05/07 08:01:17 Nuke local definitions of dependencies because (in theory, and largely in practice) libpkg's Makefile should handle them all. Affected files ... .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/Makefile#4 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/Makefile#4 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/Makefile#4 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/Makefile#4 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/Makefile#3 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/updating/Makefile#4 edit .. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/Makefile#4 edit Differences ... ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/Makefile#4 (text+ko) ==== @@ -8,14 +8,4 @@ WARNS?= 3 WFORMAT?= 1 ->>>> ORIGINAL //depot/vendor/freebsd/src/usr.sbin/pkg_install/add/Makefile#10 -DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} -LDADD= ${LIBINSTALL} -lfetch -lmd - -==== THEIRS //depot/vendor/freebsd/src/usr.sbin/pkg_install/add/Makefile#11 -==== YOURS //gcooper-bayonetta/pkg_install-enhancements/usr.sbin/pkg_install/add/Makefile -DPADD= ${LIBINSTALL} ${LIBARCHIVE} ${LIBFETCH} ${LIBMD} -LDADD= ${LIBINSTALL} -larchive -lfetch -lmd - -<<<< .include <bsd.prog.mk> ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/Makefile#4 (text+ko) ==== @@ -6,7 +6,4 @@ WARNS?= 3 WFORMAT?= 1 -DPADD= ${LIBARCHIVE} ${LIBMD} -LDADD= -larchive -lmd - .include <bsd.prog.mk> ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/Makefile#4 (text+ko) ==== @@ -5,7 +5,4 @@ WFORMAT?= 1 -DPADD= ${LIBARCHIVE} ${LIBMD} -LDADD= -larchive -lmd - .include <bsd.prog.mk> ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/Makefile#4 (text+ko) ==== @@ -5,7 +5,4 @@ WFORMAT?= 1 -DPADD= ${LIBARCHIVE} ${LIBMD} -LDADD= -larchive -lmd - .include <bsd.prog.mk> ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/Makefile#3 (text+ko) ==== ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/updating/Makefile#4 (text+ko) ==== @@ -3,7 +3,4 @@ WFORMAT?= 1 -DPADD= ${LIBARCHIVE} ${LIBMD} -LDADD= -larchive -lmd - .include <bsd.prog.mk> ==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/Makefile#4 (text+ko) ==== @@ -5,9 +5,6 @@ WFORMAT?= 1 -DPADD= ${LIBARCHIVE} ${LIBMD} -LDADD= -larchive -lmd - test: sh ${.CURDIR}/test-pkg_version.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005070801.o4781VUh059927>