From 2e128962689f1315d6ba8eb7ce29efbab22a8165 Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Thu, 21 Jul 2011 05:04:39 +0000 Subject: Fix INDEXFILE for upcoming 10.0 branch. PR: ports/158750 Submitted by: crees Tested on: pointyhat-west --- Mk/bsd.port.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Mk/bsd.port.mk') diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 660310e4749d..471cdb5f4734 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1217,8 +1217,8 @@ OSREL!= ${UNAME} -r | ${SED} -e 's/[-(].*//' .if !defined(OSVERSION) .if exists(/usr/include/sys/param.h) OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/include/sys/param.h -.elif exists(/usr/src/sys/sys/param.h) -OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < /usr/src/sys/sys/param.h +.elif exists(${SRC_BASE}/sys/sys/param.h) +OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC_BASE}/sys/sys/param.h .else OSVERSION!= ${SYSCTL} -n kern.osreldate .endif @@ -1381,7 +1381,7 @@ PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} -INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} +INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME} EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME} @@ -4088,7 +4088,7 @@ install-mtree: @if [ ${UID} = 0 ]; then \ if [ ! -f ${MTREE_FILE} ]; then \ ${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \ - ${ECHO_MSG} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \ + ${ECHO_MSG} "Copy it from a suitable location (e.g., ${SRC_BASE}/etc/mtree) and try again."; \ exit 1; \ else \ ${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \ -- cgit v1.2.3