5 files changed, 27 insertions, 36 deletions
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
index ba3909d17da7..485cb2263210 100644
--- a/usr.sbin/pkg_install/info/Makefile
+++ b/usr.sbin/pkg_install/info/Makefile
@@ -3,9 +3,11 @@
 PROG=	pkg_info
 SRCS=	main.c perform.c show.c
 
+CFLAGS+= -I${.CURDIR}/../lib
+
 WFORMAT?=	1
 
-DPADD=	${LIBMD}
-LDADD=	-lmd
+DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
+LDADD=	${LIBINSTALL} -lfetch -lmd
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/info/info.h b/usr.sbin/pkg_install/info/info.h
index 68ec7107a3c3..46e29b1202dd 100644
--- a/usr.sbin/pkg_install/info/info.h
+++ b/usr.sbin/pkg_install/info/info.h
@@ -33,26 +33,25 @@
 #define MAXNAMESIZE  20
 #endif
 
-#define SHOW_COMMENT	0x000001
-#define SHOW_DESC	0x000002
-#define SHOW_PLIST	0x000004
-#define SHOW_INSTALL	0x000008
-#define SHOW_DEINSTALL	0x000010
-#define SHOW_REQUIRE	0x000020
-#define SHOW_PREFIX	0x000040
-#define SHOW_INDEX	0x000080
-#define SHOW_FILES	0x000100
-#define SHOW_DISPLAY	0x000200
-#define SHOW_REQBY	0x000400
-#define SHOW_MTREE	0x000800
-#define SHOW_SIZE	0x001000
-#define SHOW_ORIGIN	0x002000
-#define SHOW_CKSUM	0x004000
-#define SHOW_FMTREV	0x008000
-#define SHOW_PTREV	0x010000
-#define SHOW_DEPEND	0x020000
-#define SHOW_PKGNAME	0x040000
-#define SHOW_LPREV	0x100000
+#define SHOW_COMMENT	0x00001
+#define SHOW_DESC	0x00002
+#define SHOW_PLIST	0x00004
+#define SHOW_INSTALL	0x00008
+#define SHOW_DEINSTALL	0x00010
+#define SHOW_REQUIRE	0x00020
+#define SHOW_PREFIX	0x00040
+#define SHOW_INDEX	0x00080
+#define SHOW_FILES	0x00100
+#define SHOW_DISPLAY	0x00200
+#define SHOW_REQBY	0x00400
+#define SHOW_MTREE	0x00800
+#define SHOW_SIZE	0x01000
+#define SHOW_ORIGIN	0x02000
+#define SHOW_CKSUM	0x04000
+#define SHOW_FMTREV	0x08000
+#define SHOW_PTREV	0x10000
+#define SHOW_DEPEND	0x20000
+#define SHOW_PKGNAME	0x40000
 
 struct which_entry {
     TAILQ_ENTRY(which_entry) next;
diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c
index ca4e477f9995..2de638e4cad3 100644
--- a/usr.sbin/pkg_install/info/main.c
+++ b/usr.sbin/pkg_install/info/main.c
@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
 #include <getopt.h>
 #include <err.h>
 
-#include <pkg.h>
+#include "lib.h"
 #include "info.h"
 
 int	Flags		= 0;
@@ -68,8 +68,6 @@ main(int argc, char **argv)
     char **pkgs, **start;
     char *pkgs_split;
 
-    pkg_wrap(PKG_INSTALL_VERSION, argv);
-
     whead = malloc(sizeof(struct which_head));
     if (whead == NULL)
 	err(2, NULL);
@@ -227,10 +225,7 @@ main(int argc, char **argv)
 	    }
 
 	case 'P':
-	    if (Flags & SHOW_PTREV)
-		Flags |= SHOW_LPREV;
-	    else
-		Flags = SHOW_PTREV;
+	    Flags = SHOW_PTREV;
 	    break;
 
 	case 'h':
@@ -247,11 +242,6 @@ main(int argc, char **argv)
 	if (!Quiet)
 	    printf("Package tools revision: ");
 	printf("%d\n", PKG_INSTALL_VERSION);
-	if (Flags & SHOW_LPREV) {
-	    if (!Quiet)
-		printf("Libpkg revision: ");
-	    printf("%d\n", libpkg_version());
-	}
 	exit(0);
     }
 
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
index d2956120822a..09cad78ad3f2 100644
--- a/usr.sbin/pkg_install/info/perform.c
+++ b/usr.sbin/pkg_install/info/perform.c
@@ -21,7 +21,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <pkg.h>
+#include "lib.h"
 #include "info.h"
 #include <err.h>
 #include <signal.h>
diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c
index 0d3b4ad73d2e..c65c312a5062 100644
--- a/usr.sbin/pkg_install/info/show.c
+++ b/usr.sbin/pkg_install/info/show.c
@@ -21,7 +21,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <pkg.h>
+#include "lib.h"
 #include "info.h"
 #include <err.h>
 #include <stdlib.h>