diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-12-04 17:17:48 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-12-04 17:17:48 +0000 |
| commit | f9992608f9cd9f5af9641b2aabd67573e2ccbaea (patch) | |
| tree | 06875a37a4d36ed3bfa0d4e1109c122811581487 /Mk | |
| parent | On recent 5-CURRENT, there is no Perl wrapper. It is therefore possible (diff) | |
Add the INDEXFILE variable, that defaults to INDEX-5 on 5.0 (500036) and
later, and INDEX on earlier systems. Use this in the 'make index' and
associated targets. This is necessary to deal with the substantially
different dependencies of ports between 4.x and 5.0 (e.g. ports that
depend on perl).
Notes
Notes:
svn path=/head/; revision=71366
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 9 | ||||
| -rw-r--r-- | Mk/bsd.port.subdir.mk | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 821d26e4a3d9..7e85fdeed06e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -728,6 +728,11 @@ X11BASE?= ${DESTDIR}/usr/X11R6 LINUXBASE?= ${DESTDIR}/compat/linux DISTDIR?= ${PORTSDIR}/distfiles _DISTDIR?= ${DISTDIR}/${DIST_SUBDIR} +.if ${OSVERSION} >= 500036 +INDEXFILE?= INDEX-5 +.else +INDEXFILE?= INDEX +.endif .if defined(USE_BZIP2) EXTRACT_SUFX?= .tar.bz2 .elif defined(USE_ZIP) @@ -3625,7 +3630,7 @@ pretty-print-build-depends-list: .if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \ defined(LIB_DEPENDS) || defined(DEPENDS) @${ECHO_CMD} -n 'This port requires package(s) "' - @${ECHO_CMD} -n `${GREP} '^${PKGNAME}|' ${PORTSDIR}/INDEX | awk -F\| '{print $$8;}'` + @${ECHO_CMD} -n `${GREP} '^${PKGNAME}|' ${PORTSDIR}/${INDEXFILE} | awk -F\| '{print $$8;}'` @${ECHO_CMD} '" to build.' .endif .endif @@ -3634,7 +3639,7 @@ pretty-print-build-depends-list: pretty-print-run-depends-list: .if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS) @${ECHO_CMD} -n 'This port requires package(s) "' - @${ECHO_CMD} -n `${GREP} '^${PKGNAME}|' ${PORTSDIR}/INDEX | awk -F\| '{print $$9;}'` + @${ECHO_CMD} -n `${GREP} '^${PKGNAME}|' ${PORTSDIR}/${INDEXFILE} | awk -F\| '{print $$9;}'` @${ECHO_CMD} '" to run.' .endif .endif diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index e7523af8a6b9..584d5213b5fc 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -205,6 +205,11 @@ README= ${TEMPLATES}/README.category .endif COMMENT?= ${.CURDIR}/pkg/COMMENT DESCR?= ${.CURDIR}/pkg/DESCR +.if ${OSVERSION} >= 500036 +INDEXFILE?= INDEX-5 +.else +INDEXFILE?= INDEX +.endif HTMLIFY= sed -e 's/&/\&/g' -e 's/>/\>/g' -e 's/</\</g' |