diff options
| author | pav <pav@FreeBSD.org> | 2012-01-16 06:13:42 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2012-01-16 06:13:42 +0800 |
| commit | 425ffd4983e24c9fa3c7451fcc545e4e68e0767c (patch) | |
| tree | 88aa15e3f9dad68445dce74f9f462277f565335b /Mk | |
| parent | 90d0a495e3ad9806725ce7e1282abb32b22ad0ea (diff) | |
| download | freebsd-ports-gnome-425ffd4983e24c9fa3c7451fcc545e4e68e0767c.tar.gz freebsd-ports-gnome-425ffd4983e24c9fa3c7451fcc545e4e68e0767c.tar.zst freebsd-ports-gnome-425ffd4983e24c9fa3c7451fcc545e4e68e0767c.zip | |
- Fix check-already-installed target: comm expects the input to be sorted
PR: ports/161287
Submitted by: mandree, nox (used nox's version)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 8a4393389ee2..241cf589fa19 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2398,6 +2398,7 @@ PKGREQ?= ${PKGDIR}/pkg-req PKGMESSAGE?= ${PKGDIR}/pkg-message TMPPLIST?= ${WRKDIR}/.PLIST.mktmp +TMPPLIST_SORT?= ${WRKDIR}/.PLIST.mktmp.sorted TMPGUCMD?= ${WRKDIR}/.PLIST.gucmd .for _CATEGORY in ${CATEGORIES} @@ -3952,7 +3953,7 @@ delete-package-list: delete-package-links-list # Utility targets follow .if !target(check-already-installed) -check-already-installed: +check-already-installed: ${TMPPLIST_SORT} .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) @${ECHO_MSG} "===> Checking if ${PKGORIGIN} already installed"; \ ${MKDIR} ${PKG_DBDIR}; \ @@ -3961,7 +3962,7 @@ check-already-installed: for p in $${already_installed}; do \ prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \ if [ "x${PREFIX}" = "x$${prfx}" ]; then \ - df=`${PKG_INFO} -q -f $${p} 2> /dev/null | ${GREP} -v "^@" | ${COMM} -12 - ${TMPPLIST}`; \ + df=`${PKG_INFO} -q -f $${p} 2> /dev/null | ${GREP} -v "^@" | ${SORT} -u | ${COMM} -12 - ${TMPPLIST_SORT}`; \ if [ -n "$${df}" ]; then \ found_package=$${p}; \ break; \ @@ -5683,6 +5684,9 @@ generate-plist: ${TMPPLIST}: @cd ${.CURDIR} && ${MAKE} generate-plist +${TMPPLIST_SORT}: ${TMPPLIST} + @${SORT} -u ${TMPPLIST} >${TMPPLIST_SORT} + .if !target(add-plist-docs) add-plist-docs: .if defined(PORTDOCS) && !defined(NOPORTDOCS) |