diff options
| author | pav <pav@FreeBSD.org> | 2009-12-18 22:28:46 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2009-12-18 22:28:46 +0800 |
| commit | eb1f8f4adf207cf04ad96a5aaa780cfaf4d179b0 (patch) | |
| tree | e244d2c152320760d5ce5c52fcff9a76d43f98b7 /Mk | |
| parent | 455193c5aff498cc52de069979272e9d66c8a10b (diff) | |
| download | freebsd-ports-gnome-eb1f8f4adf207cf04ad96a5aaa780cfaf4d179b0.tar.gz freebsd-ports-gnome-eb1f8f4adf207cf04ad96a5aaa780cfaf4d179b0.tar.zst freebsd-ports-gnome-eb1f8f4adf207cf04ad96a5aaa780cfaf4d179b0.zip | |
- Terminate support for X11BASE having different value from LOCALBASE
PR: ports/122341
Submitted by: flz
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" |