diff options
| author | linimon <linimon@FreeBSD.org> | 2011-07-21 13:04:39 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2011-07-21 13:04:39 +0800 |
| commit | fded8db6f266115a56d1376a8988ad6ce99df554 (patch) | |
| tree | 5ff7d98e1194fc133d7e4b9827a369a282ed7093 | |
| parent | b52944915a792d1df1b4539b6ffef32bb06c623c (diff) | |
| download | freebsd-ports-gnome-fded8db6f266115a56d1376a8988ad6ce99df554.tar.gz freebsd-ports-gnome-fded8db6f266115a56d1376a8988ad6ce99df554.tar.zst freebsd-ports-gnome-fded8db6f266115a56d1376a8988ad6ce99df554.zip | |
Fix INDEXFILE for upcoming 10.0 branch.
PR: ports/158750
Submitted by: crees
Tested on: pointyhat-west
| -rw-r--r-- | Mk/bsd.port.mk | 8 | ||||
| -rw-r--r-- | Mk/bsd.port.subdir.mk | 6 |
2 files changed, 7 insertions, 7 deletions
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; \ diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index 0456e41e01da..556e9e543fa0 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -70,8 +70,8 @@ ARCH!= ${UNAME} -p .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 @@ -144,7 +144,7 @@ PKGINSTALLVER!= ${PKG_INFO} -P 2>/dev/null | ${SED} -e 's/.*: //' .endif INDEXDIR?= ${PORTSDIR} -INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} +INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # local customization of the ports tree .if exists(${.CURDIR}/Makefile.local) |