diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2009-12-18 14:28:46 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2009-12-18 14:28:46 +0000 |
commit | 2ae03d48e767ca43307d1b4a890e3b47e8525391 (patch) | |
tree | a783c83f45f0b5fb2ae7717b9b42af558c2b3749 /Mk | |
parent | 931cab63a3e6c547fc2b3727d152f0483dc9f31e (diff) | |
download | ports-2ae03d48e767ca43307d1b4a890e3b47e8525391.tar.gz ports-2ae03d48e767ca43307d1b4a890e3b47e8525391.zip |
Notes
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.port.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c9a54d20eb48..a968852a140d 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1396,14 +1396,11 @@ ETCDIR?= ${PREFIX}/etc/${PORTNAME} IGNORE= cannot be installed: bad X_WINDOW_SYSTEM setting; valid value is 'xorg' .endif -.if ${OSVERSION} < 602000 -.if ${X11BASE} != ${LOCALBASE} && !defined(USE_NONDEFAULT_X11BASE) +.if ${X11BASE} != ${LOCALBASE} .BEGIN: - @${ECHO_MSG} "On FreeBSD before 6.2 ports system unfortunately can not set default X11BASE by itself so please help it a bit by setting X11BASE=\$${LOCALBASE} in make.conf." - @${ECHO_MSG} "On the other hand, if you do wish to use non-default X11BASE, please set variable USE_NONDEFAULT_X11BASE." + @${ECHO_MSG} "X11BASE is now deprecated. Unset X11BASE in make.conf and try again." @${FALSE} .endif -.endif .if defined(USE_XORG) || defined(XORG_CAT) .include "${PORTSDIR}/Mk/bsd.xorg.mk" |