From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 24 21:30:19 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3713D16A4CE for ; Sat, 24 Jul 2004 21:30:19 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CE5343D2D for ; Sat, 24 Jul 2004 21:30:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6OLUGIb099281 for ; Sat, 24 Jul 2004 21:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6OLUGeg099280; Sat, 24 Jul 2004 21:30:16 GMT (envelope-from gnats) Resent-Date: Sat, 24 Jul 2004 21:30:16 GMT Resent-Message-Id: <200407242130.i6OLUGeg099280@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, Dejan Lesjak Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3036C16A4CE for ; Sat, 24 Jul 2004 21:27:24 +0000 (GMT) Received: from avs3.arnes.si (avs3.arnes.si [193.2.1.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E9E543D2F for ; Sat, 24 Jul 2004 21:27:23 +0000 (GMT) (envelope-from lesi@idefix.ijs.si) Received: from localhost (avs3.arnes.si [193.2.1.68]) by avs3.arnes.si (Postfix) with ESMTP id 49D131D798B for ; Sat, 24 Jul 2004 23:27:22 +0200 (CEST) Received: from avs3.arnes.si ([193.2.1.68]) by localhost (avs3.arnes.si [193.2.1.68]) (amavisd-new, port 10024) with ESMTP id 97076-09 for ; Sat, 24 Jul 2004 23:27:22 +0200 (CEST) Received: from idefix.ijs.si (clj8-144.dial-up.arnes.si [194.249.52.144]) by avs3.arnes.si (Postfix) with ESMTP id 0ADE41D7987 for ; Sat, 24 Jul 2004 23:27:21 +0200 (CEST) Received: by idefix.ijs.si (Postfix, from userid 1001) id 6F2AF33C2D; Sat, 24 Jul 2004 23:27:21 +0200 (CEST) Message-Id: <20040724212721.6F2AF33C2D@idefix.ijs.si> Date: Sat, 24 Jul 2004 23:27:21 +0200 (CEST) From: Dejan Lesjak To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/69545: [PATCH] Fix XFree86-4-libraries/Makefile.inc after X.Org switch X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Dejan Lesjak List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jul 2004 21:30:19 -0000 >Number: 69545 >Category: ports >Synopsis: [PATCH] Fix XFree86-4-libraries/Makefile.inc after X.Org switch >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Jul 24 21:30:16 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Dejan Lesjak >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD idefix.ijs.si 5.2-CURRENT FreeBSD 5.2-CURRENT #5: Thu Jul 22 03:16:32 CEST 2004 lesi@idefix.ijs.si:/usr/obj/usr/src/sys/IDEFIX i386 >Description: The bsd.port.mk no longer defines XFREE86_VERSION?=4 for XFree86-4 ports. However ports/x11/XFree86-4-libraries/Makefile.inc still expects this define, which breaks xfree ports. Since ports now check for X_WINDOW_SYSTEM variable in their makefiles, this check can now be removed. Attached is the patch for Makefile.inc. >How-To-Repeat: >Fix: --- Makefile.inc.diff begins here --- Index: Makefile.inc =================================================================== RCS file: /usr/local/freebsd-cvs/ports/x11/XFree86-4-libraries/Makefile.inc,v retrieving revision 1.6 diff -u -r1.6 Makefile.inc --- Makefile.inc 6 Feb 2004 04:41:48 -0000 1.6 +++ Makefile.inc 24 Jul 2004 21:13:57 -0000 @@ -26,13 +26,6 @@ XINSTALL_DIRS?= ${XBUILD_DIRS} _XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS} -pre-everything:: - @if [ "x${XFREE86_VERSION}" != "x4" ]; then \ - ${ECHO_MSG} "If you use the XFree86-4 ports you must have XFREE86_VERSION=4"; \ - ${ECHO_MSG} "set in your /etc/make.conf."; \ - ${FALSE}; \ - fi; - .if !target(pre-configure) pre-configure: @${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \ --- Makefile.inc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: