Radish alpha
H
HardenedBSD-pkg
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Fix package registration (there is still gabage in file list) Add the patch for bsd.port.mk : to be able to register simple packages you need in make.conf: PKG_CMD= /usr/sbin/pkg register PKGNG=yes
Baptiste Daroussin committed 15 years ago
commit f8546f295d75e55de11935423cb42fdefd71573a
parent db81aa5ffd219f5f1e81a4c9b6880cfb5a1f628d
2 files changed +41 -2
modified pkg/register.c
@@ -28,18 +28,19 @@ exec_register(int argc, char **argv)
	char *mtree = NULL;

	char *depends = NULL;

	char *conflicts = NULL;
+ 
	char *v = NULL;



	int ret = 0;



	pkg_new(&pkg);
- 
	while ((ch = getopt(argc, argv, "vc:d:f:p:P:m:o:O:C:")) != -1) {
+ 
	while ((ch = getopt(argc, argv, "vc:d:f:p:P:m:o:O:C:n:")) != -1) {

		switch (ch) {

			case 'O':

			case 'v':

				/* IGNORE */

				break;

			case 'c':
- 
				ret += pkg_setcomment(pkg, optarg);
+ 
				ret += pkg_setcomment(pkg, optarg[0] == '-' ? optarg + 1 : optarg);

				break;

			case 'd':

				ret += pkg_setdesc_from_file(pkg, optarg);
@@ -56,6 +57,13 @@ exec_register(int argc, char **argv)
			case 'm':

				mtree = strdup(optarg);

				break;
+ 
			case 'n':
+ 
				v = strrchr(optarg, '-');
+ 
				v[0] = '\0';
+ 
				v++;
+ 
				ret += pkg_setname(pkg, optarg);
+ 
				ret += pkg_setversion(pkg, v);
+ 
				break;

			case 'o':

				ret += pkg_setorigin(pkg, optarg);

				break;
added ports/bsd.port.mk.patch
@@ -0,0 +1,31 @@
+ 
--- /usr/ports/Mk/bsd.port.mk.prepkgng	2011-01-14 00:14:59.962893785 +0100
+ 
+++ /usr/ports/Mk/bsd.port.mk	2011-01-14 00:28:29.620436183 +0100
+ 
@@ -2493,6 +2493,9 @@
+
+ 
 .if !defined(PKG_ARGS)
+ 
 PKG_ARGS=		-v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u -t : -k 2`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
+ 
+.if defined(PKGNG)
+ 
+PKG_ARGS+= -n ${PKGNAME}
+ 
+.endif
+ 
 .if !defined(NO_MTREE)
+ 
 PKG_ARGS+=		-m ${MTREE_FILE}
+ 
 .endif
+ 
@@ -5993,6 +5996,7 @@
+ 
 	fi
+ 
 	@${RM} -rf ${PKG_DBDIR}/${PKGNAME}
+ 
 .endif
+ 
+.if !defined(PKGNG)
+ 
 	@if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \
+ 
 		${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"; \
+ 
 		${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
+ 
@@ -6031,6 +6035,10 @@
+ 
 		${RM} -f /tmp/${PKGNAME}-required-by; \
+ 
 	fi
+ 
 .else
+ 
+	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
+ 
+	@${PKG_CMD} ${PKG_ARGS}
+ 
+.endif
+ 
+.else
+ 
 	@${DO_NADA}
+ 
 .endif
+ 
 .endif