diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-08-03 15:36:58 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-08-03 15:36:58 +0000 |
| commit | 0a1e65e421d5da7e3809e0ae9ed087f6dd5a88b4 (patch) | |
| tree | 6af2bf15b624c90e7a925752d82ceac1f5b94209 /Mk/bsd.port.mk | |
| parent | 6a3d623d52e8bc44ca34e5c868fc3e0cc9a5e3c9 (diff) | |
| download | ports-0a1e65e421d5da7e3809e0ae9ed087f6dd5a88b4.tar.gz ports-0a1e65e421d5da7e3809e0ae9ed087f6dd5a88b4.zip | |
- Move pkg_install commands detection to bsd.commands.mk
PR: 135663
Submitted: Yuri Pankov <yuri.pankov@gmail.com>
- Add default FLEX command to bsd.commands.mk
PR: 137026
Submitted: gahr@
Tested by: pointyhat exp-build run
Notes
Notes:
svn path=/head/; revision=238833
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index d942c5352e10..6d151593415c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2377,20 +2377,6 @@ PORTDIRNAME?= ${_PORTDIRNAME} PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME} -.if exists(${LOCALBASE}/sbin/pkg_info) -PKG_CMD?= ${LOCALBASE}/sbin/pkg_create -PKG_ADD?= ${LOCALBASE}/sbin/pkg_add -PKG_DELETE?= ${LOCALBASE}/sbin/pkg_delete -PKG_INFO?= ${LOCALBASE}/sbin/pkg_info -PKG_VERSION?= ${LOCALBASE}/sbin/pkg_version -.else -PKG_CMD?= /usr/sbin/pkg_create -PKG_ADD?= /usr/sbin/pkg_add -PKG_DELETE?= /usr/sbin/pkg_delete -PKG_INFO?= /usr/sbin/pkg_info -PKG_VERSION?= /usr/sbin/pkg_version -.endif - .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} .if !defined(NO_MTREE) |