diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2001-02-17 00:46:26 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2001-02-17 00:46:26 +0000 |
| commit | 7c30b43aa0a6fa855caa5734c1b68d84281c346b (patch) | |
| tree | ba626337369329a0bacd89f037161b2badc94f16 /Mk | |
| parent | Sort the 3rd party entries so one can easily find them. (diff) | |
(1) Change USE_NEWGCC dependency from lang/egcs to lang/gcc295.
Submitted by: reg
PR: 24525
Approved by: obrien
(2) Change XFree86 version in PKG_IGNORE_DEPENDS
Submitted by: olgeni
(3) Change message for "old layout" error to include a pointer to the
cvsup FAQ.
Submitted by: kris
Notes
Notes:
svn path=/head/; revision=38415
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 9dafe6c72f5f..943a09d3d34a 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -624,7 +624,7 @@ TEMPLATES?= ${PORTSDIR}/Templates (!defined(PKGDIR) && exists(${MASTERDIR}/pkg)) || \ (!defined(MD5_FILE) && exists(${MASTERDIR}/files/md5)) pre-everything:: - @${ECHO} "Error: your port uses an old layout. Please update it to match this bsd.port.mk." + @${ECHO} "Error: your port uses an old layout. Please update it to match this bsd.port.mk. If you have updated your ports collection via cvsup and are still getting this error, see Q12 and Q13 in the cvsup FAQ on http://www.polstra.com for further information." @${FALSE} .endif PATCHDIR?= ${MASTERDIR}/files @@ -806,7 +806,7 @@ LIBTOOLFLAGS?= --disable-ltlibs .if defined(USE_NEWGCC) && ${OSVERSION} < 400012 CC= gcc295 CXX= g++295 -BUILD_DEPENDS+= gcc295:${PORTSDIR}/lang/egcs +BUILD_DEPENDS+= gcc295:${PORTSDIR}/lang/gcc295 MAKE_ENV+= CC=${CC} CXX=${CXX} .endif @@ -836,7 +836,7 @@ LIB_DEPENDS+= dps.0:${PORTSDIR}/x11/dgs LIB_DEPENDS+= GL.14:${PORTSDIR}/graphics/Mesa3 .endif XAWVER= 6 -PKG_IGNORE_DEPENDS?= '(XFree86-3\.3\.6_4)' +PKG_IGNORE_DEPENDS?= '(XFree86-3\.3\.6_7)' .else .if defined(USE_IMAKE) BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake-4 |