From owner-p4-projects@FreeBSD.ORG  Fri May  7 08:01:32 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7DC2E1065769; Fri,  7 May 2010 08:01:31 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 79E85106566B
	for <perforce@FreeBSD.org>; Fri,  7 May 2010 08:01:31 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 666418FC19
	for <perforce@FreeBSD.org>; Fri,  7 May 2010 08:01:31 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4781VYr059929
	for <perforce@FreeBSD.org>; Fri, 7 May 2010 08:01:31 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4781VUh059927
	for perforce@freebsd.org; Fri, 7 May 2010 08:01:31 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Fri, 7 May 2010 08:01:31 GMT
Message-Id: <201005070801.o4781VUh059927@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 177887 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 May 2010 08:01:32 -0000

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