diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-07-10 08:48:54 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-07-10 08:48:54 +0000 |
| commit | 0c7d746d6a4f5cfe0a2db29b2e258f081f516616 (patch) | |
| tree | 0f0a8c6b3304d5c8ef0825243b5fbe497bf6a58b /Mk | |
| parent | - update to 2.2.3 [1] (diff) | |
Fix PKG_IGNORE with pkgng
Submitted by: des@
Notes
Notes:
svn path=/head/; revision=300713
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.pkgng.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mk/bsd.pkgng.mk b/Mk/bsd.pkgng.mk index 863927dfc92c..461104d9614f 100644 --- a/Mk/bsd.pkgng.mk +++ b/Mk/bsd.pkgng.mk @@ -22,8 +22,8 @@ PLIST_REINPLACE:= ${PLIST_REINPLACE:Nstopdaemon} 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 @@ -48,7 +48,7 @@ fake-pkg: .endif @${ECHO_CMD} "deps: " >> ${MANIFESTF} - @${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 | ${SED} 's/^/ /' >> ${MANIFESTF} @${ECHO_CMD} -n "categories: [" >> ${MANIFESTF} .for cat in ${CATEGORIES:u} @${ECHO_CMD} -n "${cat}," >> ${MANIFESTF} |