diff -ruN pkgng-0.1-alpha1.orig/libpkg/Makefile pkgng-0.1-alpha1/libpkg/Makefile
--- pkgng-0.1-alpha1.orig/libpkg/Makefile	2011-03-24 18:24:52.000000000 +0000
+++ pkgng-0.1-alpha1/libpkg/Makefile	2011-03-25 15:58:58.000000000 +0000
@@ -1,6 +1,6 @@
 .include <bsd.own.mk>
 
-LIB=		pkg
+LIB=		pkgng
 INCS=		pkg.h
 WARNS=		6
 SHLIBDIR?=	/usr/lib
diff -ruN pkgng-0.1-alpha1.orig/libpkg/pkg_add.c pkgng-0.1-alpha1/libpkg/pkg_add.c
--- pkgng-0.1-alpha1.orig/libpkg/pkg_add.c	2011-03-24 18:24:52.000000000 +0000
+++ pkgng-0.1-alpha1/libpkg/pkg_add.c	2011-03-25 15:45:54.000000000 +0000
@@ -17,7 +17,7 @@
 do_extract(struct archive *a, struct archive_entry *ae)
 {
 	int retcode = EPKG_OK;
-	int ret;
+	int ret = 0;
 
 	do {
 		if (archive_read_extract(a, ae, EXTRACT_ARCHIVE_FLAGS) != ARCHIVE_OK) {
diff -ruN pkgng-0.1-alpha1.orig/pkg/Makefile pkgng-0.1-alpha1/pkg/Makefile
--- pkgng-0.1-alpha1.orig/pkg/Makefile	2011-03-24 18:24:52.000000000 +0000
+++ pkgng-0.1-alpha1/pkg/Makefile	2011-03-25 16:02:04.000000000 +0000
@@ -8,10 +8,11 @@
 		repo.c \
 		version.c \
 		which.c
+BINDIR=	/usr/sbin
 
 CFLAGS+=	-I${.CURDIR}/../libpkg
 LDADD+=		-L../libpkg \
-		-lpkg \
+		-lpkgng \
 		-lutil
 WARNS?=		6
 NO_MAN=		true
diff -ruN pkgng-0.1-alpha1.orig/pkg/main.c pkgng-0.1-alpha1/pkg/main.c
--- pkgng-0.1-alpha1.orig/pkg/main.c	2011-03-24 18:24:52.000000000 +0000
+++ pkgng-0.1-alpha1/pkg/main.c	2011-03-25 15:46:55.000000000 +0000
@@ -38,7 +38,7 @@
 #define cmd_len (int)(sizeof(cmd)/sizeof(cmd[0]))
 
 static void
-usage()
+usage(void)
 {
 	fprintf(stderr, "usage: pkg <command> [<args>]\n\n"
 			"Where <command> can be:\n");
@@ -49,7 +49,7 @@
 }
 
 static void
-usage_help()
+usage_help(void)
 {
 	fprintf(stderr, "help <command>\n");
 }
diff -ruN pkgng-0.1-alpha1.orig/tests/Makefile pkgng-0.1-alpha1/tests/Makefile
--- pkgng-0.1-alpha1.orig/tests/Makefile	2011-03-24 18:24:52.000000000 +0000
+++ pkgng-0.1-alpha1/tests/Makefile	2011-03-25 15:59:33.000000000 +0000
@@ -9,7 +9,7 @@
 LDADD+=	-L/usr/local/lib	\
 	-lcheck			\
 	-L../libpkg		\
-	-lpkg
+	-lpkgng
 NO_MAN=	true
 
 run: ${PROG}