From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 1 16:10:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C74281065673 for ; Tue, 1 Apr 2008 16:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A0F6F8FC18 for ; Tue, 1 Apr 2008 16:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m31GA1jD045711 for ; Tue, 1 Apr 2008 16:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m31GA1D3045710; Tue, 1 Apr 2008 16:10:01 GMT (envelope-from gnats) Resent-Date: Tue, 1 Apr 2008 16:10:01 GMT Resent-Message-Id: <200804011610.m31GA1D3045710@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Florent Thoumie Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62EB91065673 for ; Tue, 1 Apr 2008 16:05:43 +0000 (UTC) (envelope-from flz@innercity.xbsd.org) Received: from mail01.mail.esat.net (mail01.mail.esat.net [193.120.142.6]) by mx1.freebsd.org (Postfix) with ESMTP id 272C88FC21 for ; Tue, 1 Apr 2008 16:05:42 +0000 (UTC) (envelope-from flz@innercity.xbsd.org) Received: from innercity.xbsd.org [193.120.13.132] by mail01.mail.esat.net with esmtp id 1JgiTT-0005qk-00; Tue, 01 Apr 2008 16:32:35 +0100 Received: from innercity.xbsd.org (localhost [127.0.0.1]) by innercity.xbsd.org (8.14.2/8.14.2) with ESMTP id m31FWHih065871 for ; Tue, 1 Apr 2008 16:32:22 +0100 (IST) (envelope-from flz@innercity.xbsd.org) Received: (from flz@localhost) by innercity.xbsd.org (8.14.2/8.14.2/Submit) id m31FWGsr065868; Tue, 1 Apr 2008 16:32:16 +0100 (IST) (envelope-from flz) Message-Id: <200804011532.m31FWGsr065868@innercity.xbsd.org> Date: Tue, 1 Apr 2008 16:32:16 +0100 (IST) From: Florent Thoumie To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/122341: Mk/bsd.port.mk: deprecate X11BASE use X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Florent Thoumie List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2008 16:10:01 -0000 >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@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: