diff options
| author | bapt <bapt@FreeBSD.org> | 2012-07-10 16:48:54 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2012-07-10 16:48:54 +0800 |
| commit | 437a029a47368b8ca6f8de4e226e9678312eba82 (patch) | |
| tree | ec6ed8be6c16a5a697359fc73c4d9fc7fd380216 /Mk | |
| parent | 71d69dc8225a69c702c746774cdf9fb62b77f0ae (diff) | |
| download | freebsd-ports-gnome-437a029a47368b8ca6f8de4e226e9678312eba82.tar.gz freebsd-ports-gnome-437a029a47368b8ca6f8de4e226e9678312eba82.tar.zst freebsd-ports-gnome-437a029a47368b8ca6f8de4e226e9678312eba82.zip | |
Fix PKG_IGNORE with pkgng
Submitted by: des@
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} |