Date: Mon, 24 Nov 2003 21:21:38 +0100 (CET) From: Melvyn Sopacua <melvyn@webteckies.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: MAINTAINER <kde@FreeBSD.org> Subject: ports/59656: [PATCH] Fix x11/kde3 package if KDE_PREFIX != LOCALBASE Message-ID: <20031124202138.7A66CB865@sarevok.idg.nl> Resent-Message-ID: <200311242240.hAOMeHTc083777@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031124202138.7A66CB865>