657d795 Rename libpkg to libpkgng to avoid conflicts on 9-CURRENT. — HardenedBSD-pkg

HardenedBSD Package Manager

Rename libpkg to libpkgng to avoid conflicts on 9-CURRENT.

jlaffaye committed 15 years ago

commit 657d79515837ff4b56eabc395e9859c9cad999ad
parent af547e48365228e347e9f9b04e815b75747c44fe

4 files changed +5 -4

modified libpkg/Makefile

@@ -1,6 +1,6 @@

 .include <bsd.own.mk>
 LIB=		pkg
 LIB=		pkgng
 INCS=		pkg.h
 WARNS=		6
 SHLIBDIR?=	/usr/lib

modified libpkg/pkg_add.c

@@ -17,7 +17,7 @@ static int

 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) {

modified pkg/Makefile

@@ -8,10 +8,11 @@ SRCS= add.c \

 		repo.c \
 		version.c \
 		which.c
 BINDIR=		/usr/sbin
 CFLAGS+=	-I${.CURDIR}/../libpkg
 LDADD+=		-L../libpkg \
 		-lpkg \
 		-lpkgng \
 		-lutil
 WARNS?=		6
 NO_MAN=		true

modified tests/Makefile

@@ -9,7 +9,7 @@ CFLAGS+=-I. \

 LDADD+=	-L/usr/local/lib	\
 	-lcheck			\
 	-L../libpkg		\
 	-lpkg
 	-lpkgng
 NO_MAN=	true
 run: ${PROG}