diff options
| author | miwi <miwi@FreeBSD.org> | 2009-08-03 23:36:58 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2009-08-03 23:36:58 +0800 |
| commit | bec3904bf802e2dedacf99398c7528433498f067 (patch) | |
| tree | ea0a876143bb58d441e86ffbfc94a774a5117fd9 /Mk | |
| parent | 284d56661bfeb235697667395f6f8b2a2fd0d046 (diff) | |
| download | freebsd-ports-gnome-bec3904bf802e2dedacf99398c7528433498f067.tar.gz freebsd-ports-gnome-bec3904bf802e2dedacf99398c7528433498f067.tar.zst freebsd-ports-gnome-bec3904bf802e2dedacf99398c7528433498f067.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
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.commands.mk | 15 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 14 |
2 files changed, 15 insertions, 14 deletions
diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk index 2114f0b769d0..2320597ee130 100644 --- a/Mk/bsd.commands.mk +++ b/Mk/bsd.commands.mk @@ -41,6 +41,7 @@ EXPR?= /bin/expr FALSE?= false # Shell builtin FILE?= /usr/bin/file FIND?= /usr/bin/find +FLEX?= /usr/bin/flex FMT?= /usr/bin/fmt GMAKE?= gmake GREP?= /usr/bin/grep @@ -113,4 +114,18 @@ ECHO_CMD?= echo # Shell builtin # Used to print all the '===>' style prompts - override this to turn them off. ECHO_MSG?= ${ECHO_CMD} +.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 + .endif 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) |