From 681fdb31e8b09a0bf88e8e7df765b7f035139836 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 28 Sep 2003 09:13:55 +0000 Subject: Back out last change related to moving ncurses/buildlink2.mk to curses.buildlink2.mk. This was wrong because we _really_ do want to express that we want _n_curses when we include the buildlink2.mk file. We should have a better way to say that the NetBSD curses doesn't quite work well enough. In fact, it's far better to depend on ncurses by default, and exceptionally note when it's okay to use NetBSD curses for specific packages. We will look into this again in the future. --- x11/kdebase/Makefile | 4 ++-- x11/kdebase/buildlink2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'x11') diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 0c6d29fe3f3..b32bf816e74 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.93 2003/09/28 09:13:59 jlam Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp DISTNAME= kdebase-1.1.2 @@ -95,7 +95,7 @@ post-install: # Make template links writeable, to prevent "Permission denied" ${CHMOD} u+w ${PREFIX}/share/kde/apps/kfm/Desktop/Templates/*.kdelnk -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" # kdebase doesn't manipulate GIFs, but KDE packages depending on kdebase # often do, so put the dependency here. .include "../../graphics/libungif/buildlink2.mk" diff --git a/x11/kdebase/buildlink2.mk b/x11/kdebase/buildlink2.mk index 1b1fd616e71..400d410ee04 100644 --- a/x11/kdebase/buildlink2.mk +++ b/x11/kdebase/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/09/28 09:13:59 jlam Exp $ # .if !defined(KDEBASE_BUILDLINK2_MK) @@ -146,7 +146,7 @@ BUILDLINK_FILES.kdebase+= lib/libkimgio.* BUILDLINK_FILES.kdebase+= lib/libkspell.* BUILDLINK_FILES.kdebase+= lib/libmediatool.* -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../graphics/libungif/buildlink2.mk" .include "../../graphics/MesaLib/buildlink2.mk" .include "../../graphics/glu/buildlink2.mk" -- cgit v1.2.3