Radish alpha
H
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
version with portepoch doesn't break anymore
Baptiste Daroussin committed 14 years ago
commit f909e6a4a03414f52c2050cae4bf9a9a273816eb
parent dd1f3c024ca24163e88b02a055102224c7f1b366
1 file changed +3 -4
modified ports/bsd.pkgng.mk
@@ -21,8 +21,8 @@ PKGUPGRADE?= ${PKGDIR}/pkg-upgrade

ACTUAL-PACKAGE-DEPENDS?= \
	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
-
		${PKG_QUERY} "  %n: {origin: %o, version: %v}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} ; \
-
		${PKG_QUERY} "  %dn: { origin: %do, version: %dv}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} ; \
+
		${PKG_QUERY} "  %n: {origin: %o, version: \"%v\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} ; \
+
		${PKG_QUERY} "  %dn: { origin: %do, version: \"%dv\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} ; \
	fi


@@ -43,8 +43,7 @@ fake-pkg:
.endif
	@${ECHO_CMD} "deps: " >> ${MANIFESTF}

-
	@${ECHO_CMD} "==>${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,}<<="
-
	@${MAKE} -C ${.CURDIR} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u >> ${MANIFESTF}
+
	@${MAKE} -C ${.CURDIR} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | sort -u >> ${MANIFESTF}
	@${ECHO_CMD} -n "categories: [" >> ${MANIFESTF}
.for cat in ${CATEGORIES:u}
	@${ECHO_CMD} -n "${cat}," >> ${MANIFESTF}