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

7 files changed, 56 insertions, 74 deletions

diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index e058ec97f42..e2182bff9a3 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,17 +1,18 @@
 # New ports collection makefile for:   kdenetwork
-# Version required:    Beta1
+# Version required:    Beta2
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/29 03:47:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1997/12/29 03:52:09 hubertf Exp $
+# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
-DISTNAME=	kdenetwork-Beta1-2
-PKGNAME=	kdenetwork-1.2b
+DISTNAME=	kdenetwork-Beta2-1
+PKGNAME=	kdenetwork-2.1b
 CATEGORIES=	net kde
-MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta1/distribution/tgz/source/ \
- 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta1/distribution/tgz/source/
+MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/stable/Beta2/distribution/tgz/source/ \
+ 		ftp://ftp.uni-erlangen.de/pub/Linux/MIRROR.KDE/stable/Beta2/distribution/tgz/source/ \
+ 		ftp://ftp.caldera.com/pub/mirrors/kde/stable/Beta2/distribution/tgz/source/
 EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	se@freebsd.org
@@ -34,7 +35,9 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--x-inc=$(X11BASE)/include -I$(PREFIX)/include -I$(PREFIX)/include/giflib" \
 		"--x-lib=$(X11BASE)/lib -L$(PREFIX)/lib" \
 		"--prefix=$(PREFIX)" \
-		"--datadir=$(PREFIX)/share/kde"
+		"--datadir=$(PREFIX)/share/kde" \
+		"--with-qt-dir=$(PREFIX)" \
+		"--with-qt-includes=$(PREFIX)/include/qt"
 
 WRKSRC=		${WRKDIR}/kdenetwork
 
diff --git a/net/kdenetwork/files/md5 b/net/kdenetwork/files/md5
index 735f58974bf..214a9c476cc 100644
--- a/net/kdenetwork/files/md5
+++ b/net/kdenetwork/files/md5
@@ -1 +1 @@
-MD5 (kdenetwork-Beta1-2.src.tgz) = e836ce6574dd357bfc0d9d3a054331b6
+MD5 (kdenetwork-Beta2-1.src.tgz) = 23127871d2cc461c420fcb0f4f65b40e
diff --git a/net/kdenetwork/patches/patch-a0 b/net/kdenetwork/patches/patch-a0
deleted file mode 100644
index 8e561d0eb86..00000000000
--- a/net/kdenetwork/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/net/kdenetwork/patches/patch-aa b/net/kdenetwork/patches/patch-aa
index e2b1f87420d..576a1c066d0 100644
--- a/net/kdenetwork/patches/patch-aa
+++ b/net/kdenetwork/patches/patch-aa
@@ -26,16 +26,3 @@
 !     if test -r $ac_dir/lib${x_direct_test_library}.*$ac_extension; then
         ac_x_libraries=$ac_dir
         break 2
-***************
-*** 2214,2218 ****
-  for i in $qt_libdirs;
-  do
-!   for j in libqt.so libqt.so.1.30 libqt.so.1 libqt.a libqt.sl;
-    do
-      if test -r "$i/$j"; then
---- 2214,2218 ----
-  for i in $qt_libdirs;
-  do
-!   for j in libqt.so libqt.so.1.30 libqt.so.1.31 libqt.so.1 libqt.a libqt.sl;
-    do
-      if test -r "$i/$j"; then
diff --git a/net/kdenetwork/patches/patch-ab b/net/kdenetwork/patches/patch-ab
index 61b5d55c327..351b6b44883 100644
--- a/net/kdenetwork/patches/patch-ab
+++ b/net/kdenetwork/patches/patch-ab
@@ -1,25 +1,28 @@
-*** krn/Makefile.in~	Sun Nov  2 14:38:17 1997
---- krn/Makefile.in	Sun Nov  2 14:38:20 1997
-***************
-*** 35,44 ****
-  ########### File Formats ###########
-  
-! .SUFFIXES: .cpp
-  
-  .cpp.o:
-  	$(CXX) -c $(CXXFLAGS) $<
-  
-! %.moc: %.h
-  	$(MOC) $< -o $@
-  
---- 35,44 ----
-  ########### File Formats ###########
-  
-! .SUFFIXES: .cpp .moc
-  
-  .cpp.o:
-  	$(CXX) -c $(CXXFLAGS) $<
-  
-! .h.moc:
-  	$(MOC) $< -o $@
-  
+--- krn/Makefile.in.orig	Thu Dec 18 22:07:32 1997
++++ krn/Makefile.in	Thu Dec 18 22:19:33 1997
+@@ -46,6 +46,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_DIR = $(SHELL) @top_srcdir@/mkinstalldirs
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ transform = @program_transform_name@
+ 
+@@ -126,7 +127,7 @@
+ ICONDIR = $(kde_icondir)
+ MINIDIR =  $(kde_minidir)
+ # better would be Internet
+-UTILSDIR = $(kde_appsdir)/Utilities
++UTILSDIR = $(kde_appsdir)/Internet
+ 
+ BUILTSOURCES =	groupdlg.moc \
+ 		NNTP.moc \
+@@ -434,7 +435,7 @@
+ install-data: install-data-recursive
+ 	@$(NORMAL_INSTALL)
+ 
+-install: install-recursive install-exec-am
++install: install-recursive install-exec-am install-local-data 
+ 	@:
+  
+ uninstall: uninstall-recursive uninstall-am
diff --git a/net/kdenetwork/patches/patch-ac b/net/kdenetwork/patches/patch-ac
new file mode 100644
index 00000000000..69b2fd86f3e
--- /dev/null
+++ b/net/kdenetwork/patches/patch-ac
@@ -0,0 +1,12 @@
+--- kmail/pics/Makefile.in.orig	Sun Dec 28 19:50:59 1997
++++ kmail/pics/Makefile.in	Sun Dec 28 19:51:17 1997
+@@ -124,7 +124,8 @@
+ 	kminsorgmsg.xpm kmmsgdel.xpm kmmsgnew.xpm kmmsgunseen.xpm \
+ 	kmmsgold.xpm kmmsgreplied.xpm kmtrash.xpm red-bullet.xpm \
+ 	kmfldsent.xpm closed.xpm green-bullet.xpm \
+-	stopwatch.xbm stopwatchMask.xbm kdelogo.xpm
++	stopwatch.xbm stopwatchMask.xbm kdelogo.xpm \
++	kmmsgsent.xpm kmmsgqueued.xpm
+ 
+ datadir = $(prefix)/share/apps/kmail/pics
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/net/kdenetwork/pkg/PLIST b/net/kdenetwork/pkg/PLIST
index 355ba1ed512..2c0ec886076 100644
--- a/net/kdenetwork/pkg/PLIST
+++ b/net/kdenetwork/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1997/12/29 03:52:16 hubertf Exp $
 share/apps/kmail/pics/attach.xpm
 share/apps/kmail/pics/filedel2.xpm
 share/apps/kmail/pics/filereply.xpm
@@ -63,24 +64,15 @@ share/doc/HTML/en/krn/articles.html
 share/doc/HTML/en/krn/groups.html
 share/doc/HTML/en/krn/offline.html
 share/doc/HTML/en/krn/overview.html
-share/applnk/Utilities/KMail.kdelnk
-share/applnk/Utilities/Krn.kdelnk
-share/icons/krn.xpm
+share/applnk/Internet/KMail.kdelnk
+share/applnk/Internet/Krn.kdelnk
+share/applnk/Network/knu.kdelnk
 share/locale/de/LC_MESSAGES/kmail.mo
 share/locale/pt/LC_MESSAGES/kmail.mo
 share/locale/fr/LC_MESSAGES/kmail.mo
 share/locale/fi/LC_MESSAGES/kmail.mo
 bin/kmail
 bin/krn
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale
 @dirrm share/icons
 @dirrm share/doc/HTML/en/krn
 @dirrm share/doc/HTML/en/kmail