fead157 Now dependency registration is complete — HardenedBSD-pkg

HardenedBSD Package Manager

Now dependency registration is complete

Baptiste Daroussin committed 15 years ago

commit fead157b5c2e385fd46e916dbddfffb06e487c4b
parent 47f808ad0965d91ef23ee415928a2a40290cbf52

3 files changed +14 -14

modified pkg/info.c

@@ -172,14 +172,16 @@ exec_info(int argc, char **argv)

 		if (opt & INFO_EXISTS) {
 			retcode = 0;
 		} else if (opt & INFO_PRINT_DEP) {
 			printf("%s-%s depends on:\n", pkg_name(pkg), pkg_version(pkg));
 			if (!opt & INFO_QUIET)
 				printf("%s-%s depends on:\n", pkg_name(pkg), pkg_version(pkg));
 			deps = pkg_deps(pkg);
 			for (i = 0; deps[i] != NULL; i++) {
 				printf("%s-%s\n", pkg_name(deps[i]), pkg_version(deps[i]));
 			}
 			printf("\n");
 			if (!opt & INFO_QUIET)
 				printf("\n");
 		} else if (opt & INFO_PRINT_RDEP) {
 			printf("%s-%s is required by:\n", pkg_name(pkg), pkg_version(pkg));

modified pkg/register.c

@@ -87,12 +87,6 @@ exec_register(int argc, char **argv)

 		if (ret < 0)
 			return (ret);
 	}
 	struct pkg **deps = pkg_deps(pkg);
 	if (deps != NULL) {
 		for (int i = 0; deps[i] != NULL; i++) {
 			printf("----> %s\n", pkg_name(deps[i]));
 		}
 	}
 	if (conflicts != NULL) {
 		ret += ports_parse_conflicts(pkg, conflicts);

modified ports/bsd.port.mk.patch

@@ -1,5 +1,5 @@

 --- /usr/ports/Mk/bsd.port.mk.prepkgng	2011-01-14 00:14:59.962893785 +0100
 +++ /usr/ports/Mk/bsd.port.mk	2011-01-14 14:34:44.686169759 +0100
 +++ /usr/ports/Mk/bsd.port.mk	2011-01-14 14:52:55.642893124 +0100
@@ -2493,6 +2493,9 @@
  .if !defined(PKG_ARGS)

@@ -18,26 +18,30 @@

  ACTUAL-PACKAGE-DEPENDS?= \
  	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
  		origins=$$(for pkgname in ${PKG_DBDIR}/*; do \
@@ -5579,8 +5583,17 @@
@@ -5579,8 +5583,21 @@
  				shift 2; \
  			done; \
  		done; \
 -		[ -z "$$packagelist" ] || ${AWK} -F '( |:)' 'BEGIN { pkgname="broken_contents" } /@pkgdep / { pkgname=$$2 } /@comment DEPORIGIN:/ { printf "%s:%s\n", pkgname, $$3; pkgname="broken_contents" }' $$packagelist; \
 +		[ -z "$$packagelist" ] || ${AWK} -F '( |:)' 'BEGIN { pkgname="broken_contents" } /@pkgdep / { pkgname=$$3 } /@comment DEPORIGIN:/ { printf "%s:%s\n", pkgname, $$3; pkgname="broken_contents" }' $$packagelist; \
 +	fi
  	fi
 +.else
 +ACTUAL-PACKAGE-DEPENDS?= \
 +	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
 +		for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \
 +			pkgname=$$(${PKG_INFO} -q $${dir\#\#${PORTSDIR}/}); \
 +			${ECHO_CMD} $$pkgname:$${dir\#\#${PORTSDIR}/}; \
 +			for pkg in $$(${PKG_INFO} -d $${dir\#\#${PORTSDIR}/}); do\
 +				origin=$$(${PKG_INFO} -qo $${pkg%-*}); \
 +				${ECHO_CMD} $$pkg:$$origin; \
 +			done; \
 +		done; \
  	fi
 +	fi
 +.endif
  # Print out package names.
@@ -5993,6 +6006,7 @@
@@ -5993,6 +6010,7 @@
  	fi
  	@${RM} -rf ${PKG_DBDIR}/${PKGNAME}
  .endif

@@ -45,7 +49,7 @@

  	@if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \
  		${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"; \
  		${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
@@ -6031,6 +6045,10 @@
@@ -6031,6 +6049,10 @@
  		${RM} -f /tmp/${PKGNAME}-required-by; \
  	fi
  .else