From 5e6eaee85a0441d384a3de899136dd0ba0677b49 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Tue, 26 May 2009 21:41:06 +0000
Subject: Fixed some pkglint warnings.

---
 x11/kdebase3/Makefile      | 11 +++++++----
 x11/kdebase3/buildlink3.mk |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'x11/kdebase3')

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index ee83499b5fb..6635cdc9aeb 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.147 2009/05/06 11:04:18 markd Exp $
+# $NetBSD: Makefile,v 1.148 2009/05/26 21:41:06 rillig Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 PKGREVISION=	2
@@ -73,7 +73,7 @@ LIBS.NetBSD+=		${EXPORT_SYMBOLS_LDFLAGS}
 
 PLIST_SRC=		${WRKDIR}/PLIST.Xdpms
 
-_KDE3_EXTRA_INCLUDES=	${LOCALBASE}/include:${X11BASE}/include:${BUILDLINK_PREFIX.freetype2}/include/freetype2
+_KDE3_EXTRA_INCLUDES=	${PREFIX}/include:${X11BASE}/include:${BUILDLINK_PREFIX.freetype2}/include/freetype2
 
 # Don't execute kappfinder_install at install-time.  This causes random
 # applications to be found which causes random .desktop files to be created
@@ -124,17 +124,19 @@ SUBST_SED.varlock=	-e s:/var/lock:/var/spool/lock:
 .endif
 .endif
 
-SUBST_CLASSES+=		htdig paths xkb
+SUBST_CLASSES+=		htdig
 SUBST_STAGE.htdig=	post-patch
 SUBST_MESSAGE.htdig=	Fix htdig paths.
 SUBST_FILES.htdig=	khelpcenter/searchhandlers/khc_htsearch.pl
 SUBST_SED.htdig=	-e s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
 
+SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	kcontrol/kdm/main.cpp kioslave/info/kde-info2html.conf
 SUBST_SED.paths=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@LOCALBASE@,${LOCALBASE},g'
+SUBST_SED.paths+=	-e 's,@LOCALBASE@,${PREFIX},g'
 SUBST_STAGE.paths=	post-patch
 
+SUBST_CLASSES+=		xkb
 SUBST_FILES.xkb=	kxkb/x11helper.cpp
 SUBST_SED.xkb=		-e 's:XLIBDIR:"${X11BASE}/lib/X11/", "${X11BASE}/share/X11/", XLIBDIR:'
 SUBST_STAGE.xkb=	post-patch
@@ -195,6 +197,7 @@ CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE'
 .endif
 
 .include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 
 .include "../../databases/openldap-client/buildlink3.mk"
 .if ${OPSYS} != "SunOS"
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index aaff66e3b0e..1130258d87c 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2009/05/20 00:58:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2009/05/26 21:41:06 rillig Exp $
 
 BUILDLINK_TREE+=	kdebase
 
@@ -6,13 +6,13 @@ BUILDLINK_TREE+=	kdebase
 KDEBASE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdebase+=	kdebase>=3.5.0nb2
-BUILDLINK_ABI_DEPENDS.kdebase?=	kdebase>=3.5.10nb2
+BUILDLINK_ABI_DEPENDS.kdebase+=	kdebase>=3.5.10nb2
 BUILDLINK_PKGSRCDIR.kdebase?=	../../x11/kdebase3
 
 pkgbase := kdebase
 .include "../../mk/pkg-build-options.mk"
 
-BUILDLINK_API_DEPENDS.Xrandr+=      Xrandr>=1.0
+BUILDLINK_API_DEPENDS.Xrandr+=	Xrandr>=1.0
 
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-- 
cgit v1.2.3