From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 24 14:40:18 2003 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 CDBD016A4CE for ; Mon, 24 Nov 2003 14:40:18 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4153143FE0 for ; Mon, 24 Nov 2003 14:40:17 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hAOMeHFY083778 for ; Mon, 24 Nov 2003 14:40:17 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hAOMeHTc083777; Mon, 24 Nov 2003 14:40:17 -0800 (PST) (envelope-from gnats) Resent-Date: Mon, 24 Nov 2003 14:40:17 -0800 (PST) Resent-Message-Id: <200311242240.hAOMeHTc083777@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, Melvyn Sopacua Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7946616A4CE; Mon, 24 Nov 2003 14:39:34 -0800 (PST) Received: from sarevok.webteckies.org (node123e0.a2000.nl [24.132.35.224]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D91C43FBF; Mon, 24 Nov 2003 14:39:33 -0800 (PST) (envelope-from mdev@sarevok.idg.nl) Received: by sarevok.idg.nl (Postfix, from userid 100) id 7A66CB865; Mon, 24 Nov 2003 21:21:38 +0100 (CET) Message-Id: <20031124202138.7A66CB865@sarevok.idg.nl> Date: Mon, 24 Nov 2003 21:21:38 +0100 (CET) From: Melvyn Sopacua To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: MAINTAINER Subject: ports/59656: [PATCH] Fix x11/kde3 package if KDE_PREFIX != LOCALBASE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Nov 2003 22:40:19 -0000 >Number: 59656 >Category: ports >Synopsis: [PATCH] Fix x11/kde3 package if KDE_PREFIX != LOCALBASE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 24 14:40:16 PST 2003 >Closed-Date: >Last-Modified: >Originator: Melvyn Sopacua >Release: FreeBSD 5.2-BETA i386 >Organization: >Environment: System: FreeBSD sarevok.idg.nl 5.2-BETA FreeBSD 5.2-BETA #2: Sun Nov 23 15:02:26 CET 2003 root@sarevok.idg.nl:/usr/obj/usr/src/sys/SAREVOK i386 >Description: If KDE_PREFIX != LOCALBASE, then package target fails, because CONFIG_FILE is set to $LOCALBASE/etc/kde-meta.conf but the pkg-plist contains etc/kde-meta.conf -> $PREFIX/etc/kde-meta.conf, which is $KDE_PREFIX/etc/meta.conf. (Hope this is still clear :) This fix is needed most, if you want to run kde-cvs and stable on the same machine, hence the low priority. >How-To-Repeat: echo KDE_PREFIX=/usr/local/kde-stable >> /etc/make.conf && \ (cd /usr/ports/x11/kde3 && make install) >Fix: I wasn't sure if KDE_PREFIX can be counted on to be available, that early in the Makefile, so I ifdefed it and fallback to LOCALBASE. --- Makefile.orig Fri Nov 21 19:03:50 2003 +++ Makefile Mon Nov 24 21:08:54 2003 @@ -19,7 +19,11 @@ ## This is the file where the selections made in the interactive dialog ## are saved in and initialized from. +.if defined(KDE_PREFIX) +CONFIG_FILE= ${KDE_PREFIX}/etc/kde-meta.conf +.else CONFIG_FILE= ${LOCALBASE}/etc/kde-meta.conf +.endif ## The list of all modules that make up KDE, excluding the base modules ## arts, kdebase and kdelibs >Release-Note: >Audit-Trail: >Unformatted: