Remove conditional include of bsd.prefs.mk as it immediately follows

an unconditional one.

buildlink1 -> buildlink2

Expand on the DESCR.  Partially addresses pkg/18374

2 files changed, 30 insertions, 10 deletions

diff --git a/misc/kdeutils3/DESCR b/misc/kdeutils3/DESCR
index 90ae45773be..d5b8baf9f96 100644
--- a/misc/kdeutils3/DESCR
+++ b/misc/kdeutils3/DESCR
@@ -1 +1,26 @@
-KDE provides an integrated X11 based environment, much like CDE.
+This package provides utility applications that are part of the standard
+KDE environment:
+
+* ark: manager for compressed files and archives
+* kab: address book
+* karm: tracks time spend per task or project
+* kcalc: scientific calculator
+* kcharselect: select special characters from any fonts and put them into
+               the clipboard
+* charselectapplet: dito, but as a Kicker applet
+* kcardtools:
+* kdepasswd: like 'passwd', a graphical password changer
+* kdessh: front end to ssh
+* kdf: like 'df', a graphical free disk space viewer
+* kedit: a simple text editor, without formatting like bold, italics etc
+* kfloppy: format a floppy disks with this app
+* khexedit: binary file editor
+* kjots: manages several "books" with a subject and notes
+* klaptopdaemon: battery and power management, including KControl plugins
+* kljettool: configure a HL LaserJet from KDE
+* klpq: front end to 'lpq', 'lprm' and 'lpc'
+* klprfax: send faxes by printing to a lpr device, needs efax and ghostscript
+* knotes: paste yellow notes all over your screen, virtually of course
+* kpm: combines 'ps', 'top' and 'kill' into a visual process watcher
+* kregexpeditor: graphical regular expression editor
+* ktimer: execute programs after some time
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index fe7ddd65383..779b71ca731 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,25 +1,20 @@
-# $NetBSD: Makefile,v 1.4 2002/09/04 14:47:38 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/02 04:46:46 markd Exp $
 
 DISTNAME=	kdeutils-3.0.3
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
 .include "../../x11/kde3/Makefile.kde3"
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h)
-.include "../../mk/bsd.prefs.mk"
-.endif
-
 post-install:
 	${CHMOD} -s ${PREFIX}/bin/efax
 
-.include "../../x11/kde3/buildlink.mk"
-.include "../../x11/kdebase3/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../x11/kde3/buildlink2.mk"
+.include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"