Update for NetBSD, by boquist@cs.chalmers.se.

4 files changed, 128 insertions, 42 deletions

diff --git a/misc/kdeutils/Makefile b/misc/kdeutils/Makefile
index 0ce9b7cbf87..a1f492ba064 100644
--- a/misc/kdeutils/Makefile
+++ b/misc/kdeutils/Makefile
@@ -3,7 +3,8 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/29 03:28:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1997/12/29 03:31:44 hubertf Exp $
+# FreeBSD Id: Makefile,v 1.4 1997/11/28 00:04:18 se Exp
 #
 
 DISTNAME=	kdeutils-Beta2-1
@@ -30,7 +31,9 @@ LIB_DEPENDS=	qt\\.1\\.3[0-9]:${PORTSDIR}/x11/qt \
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
-		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib"
+		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib" \
+		"--with-qt-dir=$(PREFIX)" \
+		"--with-qt-includes=$(PREFIX)/include/qt"
 
 WRKSRC=		${WRKDIR}/kdeutils
 
diff --git a/misc/kdeutils/patches/patch-a0 b/misc/kdeutils/patches/patch-a0
deleted file mode 100644
index 8e561d0eb86..00000000000
--- a/misc/kdeutils/patches/patch-a0
+++ /dev/null
@@ -1,15 +0,0 @@
-*** ltconfig~	Fri Oct 10 01:06:48 1997
---- ltconfig	Sat Nov  1 23:02:29 1997
-***************
-*** 982,986 ****
-  freebsd2* | freebsd3*)
-    version_type=sunos
-!   library_names_spec='$libname.so.$versuffix $libname.so'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    shlibpath_var=LD_LIBRARY_PATH
---- 982,986 ----
-  freebsd2* | freebsd3*)
-    version_type=sunos
-!   library_names_spec='$libname.so.$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    shlibpath_var=LD_LIBRARY_PATH
diff --git a/misc/kdeutils/patches/patch-ab b/misc/kdeutils/patches/patch-ab
new file mode 100644
index 00000000000..8c675c9e9f8
--- /dev/null
+++ b/misc/kdeutils/patches/patch-ab
@@ -0,0 +1,122 @@
+--- karm/Makefile.in.orig	Thu Dec 18 17:29:26 1997
++++ karm/Makefile.in	Thu Dec 18 17:30:49 1997
+@@ -1,5 +1,7 @@
+ # This file was autogenerated by kmake 0.2.
+ 
++SHELL=/bin/sh
++
+ # this variables are needed for rpath support
+ kde_libraries = @kde_libraries@
+ qt_libraries = @qt_libraries@
+@@ -16,7 +18,7 @@
+ install = @INSTALL@
+ INSTALL = $(install) -m 0755
+ INSTALL_DATA = $(install) -m 0644
+-INSTALL_DIR = $(install) -d -m 0755
++INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
+ INSTALL_DIR_PRIVATE = $(install) -d -m 0700
+ 
+ prefix = @prefix@
+--- kcalc/Makefile.in.orig	Thu Dec 18 17:29:26 1997
++++ kcalc/Makefile.in	Thu Dec 18 17:31:50 1997
+@@ -2,6 +2,8 @@
+ # Makefile for kcalc
+ #
+ 
++SHELL=/bin/sh
++
+ # this variables are needed for rpath support
+ kde_libraries = @kde_libraries@
+ qt_libraries = @qt_libraries@
+@@ -36,7 +38,7 @@
+ 
+ INSTALL      = @INSTALL@ -m 0755
+ INSTALL_DATA = @INSTALL@ -m 0644
+-INSTALL_DIR  = @INSTALL@ -d -m 0755
++INSTALL_DIR  = $(SHELL) @top_srcdir@/mkinstalldirs
+ 
+ prefix       = @prefix@
+ BINDIR       = $(prefix)/bin
+--- kedit/Makefile.in.orig	Thu Dec 18 17:29:26 1997
++++ kedit/Makefile.in	Thu Dec 18 17:32:11 1997
+@@ -6,6 +6,8 @@
+ #  $Id: patch-ab,v 1.1 1997/12/29 03:31:47 hubertf Exp $
+ #
+ 
++SHELL=/bin/sh
++
+ # this variables are needed for rpath support
+ kde_libraries = @kde_libraries@
+ qt_libraries = @qt_libraries@
+@@ -23,7 +25,7 @@
+ 
+ INSTALL = @INSTALL@ -m 0755
+ INSTALL_DATA = @INSTALL@ -m 0644
+-INSTALL_DIR = @INSTALL@ -d -m 0755
++INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
+ 
+ prefix = @prefix@
+ BINDIR = $(prefix)/bin
+--- kjots/Makefile.in.orig	Thu Dec 18 17:29:26 1997
++++ kjots/Makefile.in	Thu Dec 18 17:32:42 1997
+@@ -1,3 +1,4 @@
++SHELL=/bin/sh
+ 
+ # this variables are needed for rpath support
+ kde_libraries = @kde_libraries@
+@@ -17,7 +18,7 @@
+ INSTALL = $(install) -m 0755
+ INSTALL_SHELL = $(install) -m 0755
+ INSTALL_DATA = $(install) -m 0644
+-INSTALL_DIR = $(install) -d -m 0755
++INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
+ INSTALL_DIR_PRIVATE = $(install) -d -m 0700
+ 
+ prefix = @prefix@
+--- knotes/Makefile.in.orig	Thu Dec 18 17:29:26 1997
++++ knotes/Makefile.in	Thu Dec 18 17:33:11 1997
+@@ -1,5 +1,7 @@
+ # $Id: patch-ab,v 1.1 1997/12/29 03:31:47 hubertf Exp $
+ 
++SHELL=/bin/sh
++
+ # this variables are needed for rpath support
+ kde_libraries = @kde_libraries@
+ qt_libraries = @qt_libraries@
+@@ -18,7 +20,7 @@
+ install = @INSTALL@
+ INSTALL = $(install) -m 0755
+ INSTALL_DATA = $(install) -m 0644
+-INSTALL_DIR = $(install) -d -m 0755   
++INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
+ 
+ ###################################################################
+ 
+--- kedit/docs/Makefile.in.orig	Thu Dec 18 17:29:26 1997
++++ kedit/docs/Makefile.in	Thu Dec 18 17:33:40 1997
+@@ -1,9 +1,11 @@
++SHELL=/bin/sh
++
+ prefix = @prefix@
+ 
+ FILES = index.html index-1.html index-2.html index-3.html index-4.html index-5.html
+ 
+ DOCDIR = $(prefix)/share/doc/HTML/en/kedit
+-INSTALL_DIR = @INSTALL@ -d -m 0755
++INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
+ INSTALL_DATA = @INSTALL@ -m 644
+ 
+ all:
+--- kjots/icons/Makefile.in.orig	Thu Dec 18 17:29:26 1997
++++ kjots/icons/Makefile.in	Thu Dec 18 17:33:59 1997
+@@ -1,7 +1,9 @@
++SHELL=/bin/sh
++
+ prefix = @prefix@
+ 
+ INSTALL_DATA = @INSTALL@ -m 0644
+-INSTALL_DIR = @INSTALL@ -d -m 0755
++INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
+ PICS = OpenBook.xpm filedel.xpm
+ ICONDIR= $(prefix)/share/icons
+ DESTDIR = $(prefix)/share/apps/kjots/toolbar
diff --git a/misc/kdeutils/pkg/PLIST b/misc/kdeutils/pkg/PLIST
index a50f464df49..40076c0e379 100644
--- a/misc/kdeutils/pkg/PLIST
+++ b/misc/kdeutils/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1997/12/29 03:31:48 hubertf Exp $
 bin/kcalc
 bin/kedit
 bin/khexdit
@@ -110,31 +111,6 @@ share/locale/fi/LC_MESSAGES/khexdit.mo
 share/locale/fi/LC_MESSAGES/kedit.mo
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/it/khexdit