ecc245f Merge remote branch 'pkgng/master' — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge remote branch 'pkgng/master'

Will Andrews committed 14 years ago

commit ecc245f34d7962c36959ddd5923070649641ef87
parent ce52388

5 files changed +15 -10

modified libpkg/Makefile

@@ -33,9 +33,6 @@ CFLAGS+= -I${.CURDIR} \

 LDADD+=		-L${.CURDIR}/../external/sqlite \
 		-lsqlite3 \
 		-larchive \
 		-lz \
 		-lbz2 \
 		-llzma \
 		-lsbuf \
 		-lfetch \
 		-lelf \

modified pkg/autoremove.c

@@ -99,7 +99,7 @@ exec_autoremove(int argc, char **argv)

 		}
 	} else {
 		printf("Aborted");
 		printf("Aborted\n");
 	}
 	if (pkgdb_compact(db) != EPKG_OK)

modified pkg/delete.c

@@ -40,6 +40,9 @@ exec_delete(int argc, char **argv)

 			case 'f':
 				force = 1;
 				break;
 			default:
 				usage_delete();
 				return (EX_USAGE);
 		}
 	}
 	argc -= optind;

modified pkg/info.c

@@ -84,7 +84,7 @@ void

 usage_info(void)
 {
 	fprintf(stderr, "usage: pkg info\n");
 	fprintf(stderr, "       pkg info [-egxXdrlsqO] <pkg-name>\n\n");
 	fprintf(stderr, "       pkg info [-aegxXdrlsqO] <pkg-name>\n\n");
 	fprintf(stderr, "For more information see 'pkg help info'.\n");
 }

@@ -111,7 +111,7 @@ exec_info(int argc, char **argv)

 	int sign = 0;
 	/* TODO: exclusive opts ? */
 	while ((ch = getopt(argc, argv, "aegxXEdrlsqopO")) != -1) {
 	while ((ch = getopt(argc, argv, "aegxXEdrlsqopOf")) != -1) {
 		switch (ch) {
 			case 'a':
 				match = MATCH_ALL;

@@ -156,14 +156,19 @@ exec_info(int argc, char **argv)

 			case 'p':
 				opt |= INFO_PREFIX;
 				break;
 			default:
 				usage_info();
 				return(EX_USAGE);
 		}
 	}
 	argc -= optind;
 	argv += optind;
 	if (argc == 0)
 		match = MATCH_ALL;
 	if (argc == 0 && match != MATCH_ALL) {
 		usage_info();
 		return (EX_USAGE);
 	}
 	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
 		pkg_error_warn("can not open database");

modified ports/bsd.pkgng.mk

@@ -24,7 +24,7 @@ ACTUAL-PACKAGE-DEPENDS?= \

 			pkgname=$$(${PKG_INFO} -q $${dir\#\#${PORTSDIR}/}); \
 			${ECHO_CMD} @dep $${pkgname%-*} $${dir\#\#${PORTSDIR}/} $${pkgname\#\#*-}; \
 			for pkg in $$(${PKG_INFO} -qd $${dir\#\#${PORTSDIR}/}); do\
 				origin=$$(${PKG_INFO} -qo $${pkg%-*}); \
 				origin=$$(${PKG_INFO} -qo $${pkg}); \
 				${ECHO_CMD} @dep $${pkg%-*} $$origin $${pkg\#\#*-}; \
 			done; \
 		done; \

@@ -209,7 +209,7 @@ do-package: ${TMPPLIST}

 		fi; \
 	fi;
 	@__softMAKEFLAGS='${__softMAKEFLAGS:S/'/'\''/g}'; \
 	if ${PKG_CREATE} -o ${PKGREPOSITORY} ${PORTNAME}; then \
 	if ${PKG_CREATE} -o ${PKGREPOSITORY} ${PKGNAME}; then \
 		if [ -d ${PACKAGES} ]; then \
 			cd ${.CURDIR} && eval ${MAKE} $${__softMAKEFLAGS} package-links; \
 		fi; \