PERFORCE change 178907 for review

[Garrett Cooper]

http://p4web.freebsd.org/@@178907?ac=10

Change 178907 by gcooper at gcooper-bayonetta on 2010/05/28 09:43:25

	Make dependencies more explicit; remove unnecessary header includes
	and dependencies where appropriate.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/Makefile.inc#6 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/Makefile#6 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/Makefile#8 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/Makefile#6 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/perform.c#9 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/Makefile#6 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/Makefile#6 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#13 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/Makefile.inc#6 (text+ko) ====

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-LIBPKG_INSTALL=	${.OBJDIR}/../lib/libpkg_install.a
-
 CFLAGS+=	-DPKG_INSTALL_VERSION=20100423
 CFLAGS+=	-DYES_I_KNOW_THE_API_IS_RUBBISH_AND_IS_DOOMED_TO_CHANGE
 CFLAGS+=	-DI_READ_THE_LIBPKG_INSTALL_MAKEFILE_AND_I_UNDERSTAND_ITS_PURPOSE

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/add/Makefile#6 (text+ko) ====

@@ -12,6 +12,8 @@
 WARNS?=				3
 WFORMAT?=			1
 
+LIBPKG_INSTALL=	${.OBJDIR}/../lib/libpkg_install.a
+
 DPADD+=	${LIBPKG_INSTALL}
 LPADD+=	${LIBPKG_INSTALL}			
 

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/Makefile#8 (text+ko) ====

@@ -19,6 +19,8 @@
 WARNS?=				3
 WFORMAT?=			1
 
+LIBPKG_INSTALL=	${.OBJDIR}/../lib/libpkg_install.a
+
 DPADD+=	${LIBPKG_INSTALL} ${LIBARCHIVE}
 LPADD+=	${LIBPKG_INSTALL} -larchive
 

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/Makefile#6 (text+ko) ====

@@ -7,7 +7,4 @@
 
 WFORMAT?=			1
 
-DPADD+=	${LIBPKG_INSTALL}
-LPADD+=	${LIBPKG_INSTALL}
-
 .include <bsd.prog.mk>

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/delete/perform.c#9 (text+ko) ====

@@ -25,10 +25,8 @@
 #include <errno.h>
 
 #include <pkg.h>
-#include "cleanup.h"
 #include "delete.h"
 
-void		cleanup(void);
 static int	pkg_do(char *);
 static void	sanity_check(char *);
 static void	undepend(char *, char *);
@@ -44,14 +42,10 @@
     struct reqr_by_entry *rb_entry;
     struct reqr_by_head *rb_list;
 
-    if (register_cleanup_handler(cleanup, NULL, NULL, 0) == -1)
-	err(EXIT_FAILURE, "failed to initialize exit handler");
-
     if (MatchType != MATCH_EXACT) {
 	matched = matchinstalled(MatchType, pkgs, &errcode);
 	if (errcode != 0)
 	    return 1;
-	    /* Not reached */
 
 	/*
 	 * Copy matched[] into pkgs[], because we'll need to use
@@ -380,11 +374,6 @@
 	    __func__, pkg, CONTENTS_FNAME);
 }
 
-void
-cleanup(void)
-{
-}
-
 static void
 undepend(char *p, char *pkgname)
 {

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/Makefile#6 (text+ko) ====

@@ -8,6 +8,8 @@
 
 WFORMAT?=			1
 
+LIBPKG_INSTALL=	${.OBJDIR}/../lib/libpkg_install.a
+
 DPADD+=	${LIBPKG_INSTALL}
 LPADD+=	${LIBPKG_INSTALL}
 

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/Makefile#6 (text+ko) ====

@@ -7,9 +7,6 @@
 
 WFORMAT?=	1
 
-DPADD+=	${LIBPKG_INSTALL}
-LPADD+=	${LIBPKG_INSTALL}
-
 test:
 	sh ${.CURDIR}/test-pkg_version.sh
 

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/version/perform.c#13 (text+ko) ====

@@ -27,7 +27,6 @@
 #include <fetch.h>
 
 #include <pkg.h>
-#include "cleanup.h"
 #include "version.h"
 
 FILE *IndexFile;