[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Use pkginstall fonts framework. Bump PKGR...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9221d63ae70c
branches:  trunk
changeset: 508753:9221d63ae70c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Feb 24 21:54:23 2006 +0000

description:
Use pkginstall fonts framework. Bump PKGREVISION.
Minor pkgdelinting while here.

diffstat:

 x11/kdebase3/Makefile |  16 ++++++++++++----
 x11/kdebase3/PLIST    |  12 +++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diffs (93 lines):

diff -r d3c556dab0bf -r 9221d63ae70c x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Fri Feb 24 21:21:02 2006 +0000
+++ b/x11/kdebase3/Makefile     Fri Feb 24 21:54:23 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2006/02/05 23:11:38 joerg Exp $
+# $NetBSD: Makefile,v 1.107 2006/02/24 21:54:23 wiz Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    x11
 COMMENT=       Base modules for the KDE 3 integrated X11 desktop
 
@@ -19,6 +19,14 @@
 USE_DIRS+=             xdg-1.2
 USE_TOOLS+=            pkg-config mkfontdir
 
+FONTS_DIRS.x11+=       ${PREFIX}/share/kde/apps/konsole/fonts
+REQD_DIRS+=            ${PREFIX}/share/kde/apps/konsole
+REQD_DIRS+=            ${PREFIX}/share/kde/apps/konsole/fonts
+
+FONTS_DIRS.x11+=       ${PREFIX}/share/kde/fonts/override
+REQD_DIRS+=            ${PREFIX}/share/kde/fonts
+REQD_DIRS+=            ${PREFIX}/share/kde/fonts/override
+
 CONFIGURE_ARGS+=       --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 CONFIGURE_ARGS+=       --with-ldap="${BUILDLINK_PREFIX.openldap}"
 CONFIGURE_ARGS+=       --without-pam
@@ -126,7 +134,7 @@
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
 SUBST_CLASSES+=                varlock
 SUBST_STAGE.varlock=   post-patch
-SUBST_MESSAGE.varlock= "Fix lock directory path."
+SUBST_MESSAGE.varlock= Fix lock directory path.
 SUBST_FILES.varlock=   kcheckpass/kcheckpass.c
 .if ${OPSYS} == "SunOS"
 SUBST_SED.varlock=     s:/var/lock:/var/spool/locks:
@@ -137,7 +145,7 @@
 
 SUBST_CLASSES+=                htdig paths
 SUBST_STAGE.htdig=     post-patch
-SUBST_MESSAGE.htdig=   "Fix htdig paths."
+SUBST_MESSAGE.htdig=   Fix htdig paths.
 SUBST_FILES.htdig=     khelpcenter/searchhandlers/khc_htsearch.pl
 SUBST_SED.htdig=       s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
 
diff -r d3c556dab0bf -r 9221d63ae70c x11/kdebase3/PLIST
--- a/x11/kdebase3/PLIST        Fri Feb 24 21:21:02 2006 +0000
+++ b/x11/kdebase3/PLIST        Fri Feb 24 21:54:23 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2006/01/31 22:25:32 markd Exp $
+@comment $NetBSD: PLIST,v 1.40 2006/02/24 21:54:24 wiz Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -2039,7 +2039,6 @@
 share/kde/apps/konsole/eventsrc
 share/kde/apps/konsole/fonts/9x15.pcf.gz
 share/kde/apps/konsole/fonts/console8x16.pcf.gz
-share/kde/apps/konsole/fonts/fonts.dir
 share/kde/apps/konsole/icons/crystalsvg/16x16/actions/activity.png
 share/kde/apps/konsole/icons/crystalsvg/16x16/actions/konsoleblue.png
 share/kde/apps/konsole/icons/crystalsvg/16x16/actions/konsolered.png
@@ -2217,7 +2216,6 @@
 share/kde/config/kshorturifilterrc
 share/kde/config/kxkb_groups
 share/kde/doc/kdm/README
-share/kde/fonts/override/fonts.dir
 share/kde/icons/Daemon.png
 share/kde/icons/NetBSD-flag.png
 share/kde/icons/crystalsvg/128x128/apps/access.png
@@ -4235,8 +4233,8 @@
 @comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/devices
 @comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps
 @comment in kde: @dirrm share/kde/icons
-@dirrm share/kde/fonts/override
-@dirrm share/kde/fonts
+@comment in REQD_DIRS: @dirrm share/kde/fonts/override
+@comment in REQD_DIRS: @dirrm share/kde/fonts
 @dirrm share/kde/doc/kdm
 @dirrm share/kde/doc
 @dirrm share/kde/config/kdm
@@ -4291,8 +4289,8 @@
 @dirrm share/kde/apps/konsole/icons/crystalsvg/16x16
 @dirrm share/kde/apps/konsole/icons/crystalsvg
 @dirrm share/kde/apps/konsole/icons
-@dirrm share/kde/apps/konsole/fonts
-@dirrm share/kde/apps/konsole
+@comment in REQD_DIRS: @dirrm share/kde/apps/konsole/fonts
+@comment in REQD_DIRS: @dirrm share/kde/apps/konsole
 @dirrm share/kde/apps/konqueror/tiles
 @comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
 @dirrm share/kde/apps/konqueror/profiles