3d4d8f1 Small fixes on bsd.pkgng.mk — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Small fixes on bsd.pkgng.mk

Baptiste Daroussin committed 14 years ago

commit 3d4d8f13b758dc814ebe1401487b882217040fd9
parent fcbd264

2 files changed +9 -5

modified pkg/backup.c

@@ -16,12 +16,12 @@ exec_backup(int argc, char **argv)

 	struct pkgdb  *db;
 	char *dest = NULL;
 	if (argc < 1 || argc > 2 || argv[1][0] != '-') {
 	if (argc < 2 || argc > 3 || argv[1][0] != '-') {
 		usage_backup();
 		return (EX_USAGE);
 	}
 	if (argc == 2)
 	if (argc == 3)
 		dest = argv[2];
 	if (pkgdb_open(&db, PKGDB_DEFAULT, "local.sqlite") != EPKG_OK) {

@@ -39,7 +39,11 @@ exec_backup(int argc, char **argv)

 	if (argv[1][1] == 'r') {
 		fprintf(stderr, "not yet implemented\n");
 		return (EPKG_FATAL);
 	}
 	pkgdb_close(db);
 	return (EPKG_OK);
 }

modified ports/bsd.pkgng.mk

@@ -34,8 +34,8 @@ ACTUAL-PACKAGE-DEPENDS?= \

 .if !target(fake-pkg)
 fake-pkg:
 .if !defined(NO_PKG_REGISTER)
 	@${ECHO_MSG} "===>   Regitering installation for ${PKGNAME}"
 	@${MKDIR} ${METADIR}
 	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
 	@${MKDIR} ${METADIR}
 	@${ECHO_CMD} "name: ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}" > ${MANIFESTF}
 	@${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF}
 	@${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF}

@@ -47,7 +47,7 @@ fake-pkg:

 	@${ECHO_CMD} "www: ${WWW}" >> ${MANIFESTF}
 .endif
 	@${ECHO_CMD} "deps: " >> ${MANIFESTF}
 	@${MAKE} -C ${.CURDIR} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u | ${AWK} '{ print "  "$$1":\n    origin: "$$2"\n    version: "$$3 }' >> ${MANIFESTF}
 	@${MAKE} -C ${.CURDIR} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u | ${AWK} '{ print "  "$$1": { origin: "$$2", version: "$$3"}" }' >> ${MANIFESTF}
 	@${ECHO_CMD} "categories: " >> ${MANIFESTF}
 .for cat in ${CATEGORIES}
 	@${ECHO_CMD} "- ${cat}" >> ${MANIFESTF}