cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Don't check if pkg_tools support conflicts, they do on all recent FreeBSD

Browse Source 
versions.  This removes one != call per port, shaving off 2 minutes of CPU
  time per INDEX build on my computer.

Tested by:	pointyhat build run
This commit is contained in:
Pav Lucistnik 2009-04-09 22:40:20 +00:00
parent 5b25f09773
commit c6aaa555d5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=231958
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mk/bsd.port.mk
View File

@ -2383,14 +2383,6 @@ PKG_INFO?= /usr/sbin/pkg_info
PKG_VERSION?= /usr/sbin/pkg_version PKG_VERSION?= /usr/sbin/pkg_version
.endif .endif
# Does the pkg_create tool support conflict checking?
# XXX Slow?
.if !defined(PKGINSTALLVER)
PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //'
.endif
.if ${PKGINSTALLVER} < 20030417
DISABLE_CONFLICTS= YES
.endif
.if !defined(PKG_ARGS) .if !defined(PKG_ARGS)
PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u -t : -k 2`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} actual-package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u -t : -k 2`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS}
.if !defined(NO_MTREE) .if !defined(NO_MTREE)