ports/122341: Mk/bsd.port.mk: deprecate X11BASE use

[Florent Thoumie]

>Number:         122341
>Category:       ports
>Synopsis:       Mk/bsd.port.mk: deprecate X11BASE use
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 01 16:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Florent Thoumie
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
laptop.xbsd.org
>Environment:
System: FreeBSD laptop.xbsd.org 7.0-STABLE FreeBSD 7.0-STABLE #0: Thu Mar 27 20:58:24 GMT 2008 flz at laptop.xbsd.org:/usr/obj/usr/src/sys/LAPTOP i386


	
>Description:

X11BASE must die.

>How-To-Repeat:
	
>Fix:

	

--- x11base-deprecated.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.591
diff -u -r1.591 bsd.port.mk
--- bsd.port.mk	11 Mar 2008 23:45:04 -0000	1.591
+++ bsd.port.mk	1 Apr 2008 12:21:28 -0000
@@ -1326,11 +1326,15 @@
 IGNORE=		cannot be installed: bad X_WINDOW_SYSTEM setting; valid value is 'xorg'
 .endif
 
+.if ${X11BASE} != ${LOCALBASE}
 .if ${OSVERSION} < 602000
-.if ${X11BASE} != ${LOCALBASE} && !defined(USE_NONDEFAULT_X11BASE)
 .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."
+	@${FALSE}
+.else
+.BEGIN:
+	@${ECHO_MSG} "X11BASE is now deprecated."
+	@${ECHO_MSG} "Follow the instructions in UPDATING (X.org 7.2, entry 20070519) on how to use mergebase.sh, unset X11BASE in make.conf and try again."
 	@${FALSE}
 .endif
 .endif
--- x11base-deprecated.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: