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

6 files changed, 167 insertions, 172 deletions

diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index c7bfb241b42..e4ce81108b0 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,9 +1,10 @@
 # New ports collection makefile for:   kdebase
-# 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:54:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1997/12/29 03:58:13 hubertf Exp $
+# FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 #
 
 DISTNAME=	kdebase-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"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
 
 WRKSRC=		${WRKDIR}/kdebase
diff --git a/x11/kdebase/patches/patch-a0 b/x11/kdebase/patches/patch-a0
deleted file mode 100644
index f895c3435a6..00000000000
--- a/x11/kdebase/patches/patch-a0
+++ /dev/null
@@ -1,15 +0,0 @@
-*** ltconfig~	Thu Oct 23 01:00:08 1997
---- ltconfig	Fri Oct 31 22:03:45 1997
-***************
-*** 1034,1038 ****
-  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
---- 1034,1038 ----
-  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/x11/kdebase/patches/patch-ad b/x11/kdebase/patches/patch-ad
index ccb105c55b6..1c966473d8f 100644
--- a/x11/kdebase/patches/patch-ad
+++ b/x11/kdebase/patches/patch-ad
@@ -1,11 +1,119 @@
-*** kwm/main.C~	Sat Dec  6 11:19:12 1997
---- kwm/main.C	Sat Dec  6 11:19:14 1997
-***************
-*** 326,329 ****
---- 326,331 ----
-    static int NumLockMask = 0;
-    if (!NumLockMask){
-+ 
-+     if (!XKeysymToKeycode(qt_xdisplay(), keysym)) return;
-      XModifierKeymap* xmk = XGetModifierMapping(qt_xdisplay());
-      int i;
+--- kcontrol/Makefile.in.orig	Sun Nov 23 01:03:11 1997
++++ kcontrol/Makefile.in	Thu Dec 18 01:17:52 1997
+@@ -307,7 +307,7 @@
+ 
+ install-data-local: 
+ 	$(mkinstalldirs) $(kde_bindir)
+-	$(INSTALL_PROGRAM) kcontrol $(kde_bindir)/kcontrol
++	$(INSTALL_SCRIPT) kcontrol $(kde_bindir)/kcontrol
+ 
+ uninstall-local:
+ 	rm -f $(kde_bindir)/kcontrol
+--- kcontrol/info/memory.cpp.orig	Thu Dec 18 00:43:43 1997
++++ kcontrol/info/memory.cpp	Thu Dec 18 00:47:50 1997
+@@ -81,6 +81,8 @@
+ #include "memory_sgi.cpp"
+ #elif __FreeBSD__
+ #include "memory_fbsd.cpp"
++#elif __NetBSD__
++#include "memory_nbsd.cpp"
+ #else
+ 
+ // Default for unsupported systems
+--- kcontrol/info/processor.cpp.orig	Thu Dec 18 00:56:53 1997
++++ kcontrol/info/processor.cpp	Thu Dec 18 00:58:27 1997
+@@ -13,6 +13,8 @@
+ #include "processor_sgi.cpp"
+ #elif __FreeBSD__
+ #include "processor_fbsd.cpp"
++#elif __NetBSD__
++#include "processor_nbsd.cpp"
+ #else
+ 
+ // Default for unsupportet systems
+--- /dev/null	Thu Dec 18 00:28:16 1997
++++ kcontrol/info/memory_nbsd.cpp	Thu Dec 18 00:53:11 1997
+@@ -0,0 +1,25 @@
++#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++
++void KMemoryWidget::update()
++{
++  int mib[2],memory; size_t len;char blah[10];
++  
++  mib[0]=CTL_HW;mib[1]=HW_PHYSMEM;
++  len=sizeof(memory);
++  sysctl(mib,2,&memory,&len,NULL,0);
++  
++  snprintf(blah,10,"%d",memory);
++  // Numerical values
++  totalMem->setText(format(memory));
++  /*	To: questions@freebsd.org
++		Anyone have any ideas on how to calculate this */
++  freeMem->setText("Unknown");
++  sharedMem->setText(("Unknown"));
++  bufferMem->setText(("Unknown"));
++  /*	To count swap space, you'd need to -lkvm kcc, and make it suid root,
++		let's not do that */
++  swapMem->setText(("Unknown"));
++  freeSwapMem->setText(("Unknown"));
++}
+--- /dev/null	Thu Dec 18 00:28:16 1997
++++ kcontrol/info/processor_nbsd.cpp	Thu Dec 18 01:00:48 1997
+@@ -0,0 +1,55 @@
++#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <stdlib.h>
++
++/* stdio.h has NULL, but also a lot of extra cruft */
++#ifndef NULL
++#define NULL 0L
++#endif
++
++/* Again avoid the cruft in stdlib.h since malloc() isn't gonna change 
++   too often */
++/* void    *malloc __P((size_t)); */
++
++KProcessorWidget::KProcessorWidget(QWidget *parent, const char *name)
++  : KConfigWidget(parent, name)
++{
++  QString str;
++
++  /* Stuff for sysctl */
++  char *buf,*mhz,*cpustring;
++  int mib[2],machspeed;
++  size_t len;
++  /* */
++
++  cpustring=(char *)malloc(128);
++  lBox = new QListBox(this);
++  lBox->setGeometry(20,20,400,280);
++  lBox->setFont(QFont("Courier"));
++
++  mib[0] = CTL_HW;
++  mib[1] = HW_MODEL;
++  sysctl(mib,2,NULL,&len,NULL,0);
++  buf=(char*)malloc(len);
++  sysctl(mib,2,buf,&len,NULL,0);
++  /*	Get the CPU speed, heh, heh, undocumented sysctls rule
++		but I dunno if this works on 2.2 machines.	*/
++  mib[0] = CTL_MACHDEP; mib[1] = 107;
++  len=sizeof(machspeed);
++  sysctl(mib,2,&machspeed,&len,NULL,0);
++  /* Format the integer into correct xxx.xx MHz */
++  mhz=(char *)malloc(20);
++  snprintf(mhz,20,"%d.%02d",(machspeed+4999)/1000000,
++		   ((machspeed+4999)/10000)%100);
++  if (strcmp(mhz,"0.0")==0)
++ 	/* We dunno how fast it's running */
++ 	snprintf(cpustring,128,"%s, unknown speed",buf);
++  else
++	snprintf(cpustring,128,"%s running at %s MHz",buf,mhz);
++  /* Put everything in the listbox */
++  lBox->insertItem(buf);
++  /* Clean up after ourselves */
++  free(mhz); free(cpustring);
++}
++
diff --git a/x11/kdebase/patches/patch-ae b/x11/kdebase/patches/patch-ae
index 899d74e92b6..26af0fcc95e 100644
--- a/x11/kdebase/patches/patch-ae
+++ b/x11/kdebase/patches/patch-ae
@@ -1,38 +1,33 @@
-*** kcontrol/info/processor_fbsd.cpp~	Thu Nov 27 00:06:35 1997
---- kcontrol/info/processor_fbsd.cpp	Thu Nov 27 00:05:41 1997
-***************
-*** 1,4 ****
---- 1,5 ----
-  #include <sys/types.h>
-  #include <sys/sysctl.h>
-+ #include <stdlib.h>
+--- kvt/command.c.orig	Thu Dec 18 00:28:32 1997
++++ kvt/command.c	Thu Dec 18 00:35:56 1997
+@@ -169,10 +169,12 @@
+  */
+ static struct termios ttmode;
+ #ifndef __FreeBSD__
++#ifndef __NetBSD__
+ #ifndef CINTR
+ #ifndef _POSIX_VDISABLE
+ #define _POSIX_VDISABLE 0
+ #endif
++#endif
   
-  /* stdio.h has NULL, but also a lot of extra cruft */
-***************
-*** 9,13 ****
-  /* Again avoid the cruft in stdlib.h since malloc() isn't gonna change 
-     too often */
-! void    *malloc __P((size_t));
+ #undef CTRL
+ #define CTRL(c) ((c) - '@')
+@@ -404,7 +406,7 @@
+       }
   
-  KProcessorWidget::KProcessorWidget(QWidget *parent, const char *name)
---- 10,14 ----
-  /* Again avoid the cruft in stdlib.h since malloc() isn't gonna change 
-     too often */
-! /* void    *malloc __P((size_t)); */
+       /* init of termios structure		*/
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+       ioctl(0,TIOCGETA,(char *)&ttmode);
+ #else
+ #   ifdef _HPUX_SOURCE
+@@ -472,7 +474,7 @@
   
-  KProcessorWidget::KProcessorWidget(QWidget *parent, const char *name)
-*** kcontrol/Makefile.in~	Thu Nov 27 00:13:06 1997
---- kcontrol/Makefile.in	Thu Nov 27 00:13:10 1997
-***************
-*** 308,312 ****
-  install-data-local: 
-  	$(mkinstalldirs) $(kde_bindir)
-! 	$(INSTALL_PROGRAM) kcontrol $(kde_bindir)/kcontrol
-  
-  uninstall-local:
---- 308,312 ----
-  install-data-local: 
-  	$(mkinstalldirs) $(kde_bindir)
-! 	$(INSTALL_SCRIPT) kcontrol $(kde_bindir)/kcontrol
-  
-  uninstall-local:
+       if(mask == 0x7f)
+ 	ttmode.c_cflag = B9600 | PARENB | CS7 | CREAD;
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+       ioctl(0,TIOCSETA,(char *)&ttmode);
+ #else
+ #   ifdef _HPUX_SOURCE
diff --git a/x11/kdebase/patches/patch-af b/x11/kdebase/patches/patch-af
index 0cb1ca964f5..e6b70985ef7 100644
--- a/x11/kdebase/patches/patch-af
+++ b/x11/kdebase/patches/patch-af
@@ -1,78 +1,11 @@
-diff -r -C3 kfm/kioserver.cpp kfm.new/kioserver.cpp
-*** kfm/kioserver.cpp	Mon Nov 10 01:04:24 1997
---- kfm.new/kioserver.cpp	Fri Dec  5 18:59:59 1997
-***************
-*** 9,14 ****
---- 9,20 ----
-  #include <dirent.h>
-  #include <sys/stat.h>
-  
-+ #ifdef __FreeBSD__
-+ #include <sys/param.h>
-+ #include <sys/ucred.h>
-+ #include <sys/mount.h>
-+ #endif
-+ 
-  #include <kconfig.h>
-  
-  #include "kioserver_ipc.h"
-***************
-*** 365,370 ****
---- 371,407 ----
-  QString KIOServer::findDeviceMountPoint( const char *_device, const char *_file )
-  {
-      debugT("Finding mount point of %s\n",_device );
-+     
-+ #ifdef __FreeBSD__
-+     if(!strcmp("/etc/mtab", _file))
-+     {
-+ 	struct statfs *buf;
-+ 	long fsno;
-+ 	int flags = MNT_WAIT;
-+ 	
-+ 	fsno = getfsstat(NULL, 0, flags);
-+ 	buf = (struct statfs *)malloc(fsno * sizeof(struct statfs));
-+ 	if(getfsstat(buf, fsno*sizeof(struct statfs), flags) == -1)
-+ 	{
-+ 		free(buf);
-+ 		debugT("Device isn't mounted\n");
-+ 		return QString(NULL);
-+ 	}
-+ 	else
-+ 	{
-+ 		int i;
-+ 		for(i = 0; i < fsno; i++)
-+ 			if(!strcmp(buf[i].f_mntfromname, _device))
-+ 			{
-+ 				QString tmpstr((const char *)buf[i].f_mntonname);
-+ 				debugT("Device is mounted at %s", buf[i].f_mntonname);
-+ 				free(buf);
-+ 				return tmpstr;
-+ 			}
-+ 	}
-+     }
-+ 	
-+ #endif /* __FreeBSD__ */
-      
-      // Get the real device name, not some link.
-      char buffer[1024];
-diff -r -C3 kfm/kioslave/main.cpp kfm.new/kioslave/main.cpp
-*** kfm/kioslave/main.cpp	Mon Nov 10 01:04:43 1997
---- kfm.new/kioslave/main.cpp	Fri Dec  5 15:06:59 1997
-***************
-*** 224,230 ****
-      else if ( _ro )
-  	sprintf( buffer, "mount -rt %s %s %s 2>/tmp/mnt%i",_fstype, _dev, _point, t );
-      else
-! 	sprintf( buffer, "mount -rt %s %s %s 2>/tmp/mnt%i",_fstype, _dev, _point, t );
-  		
-      system( buffer );
-  
---- 224,230 ----
-      else if ( _ro )
-  	sprintf( buffer, "mount -rt %s %s %s 2>/tmp/mnt%i",_fstype, _dev, _point, t );
-      else
-! 	sprintf( buffer, "mount -t %s %s %s 2>/tmp/mnt%i",_fstype, _dev, _point, t );
-  		
-      system( buffer );
-  
+--- kscreensaver/saver.cpp.orig	Thu Dec 18 00:37:25 1997
++++ kscreensaver/saver.cpp	Thu Dec 18 00:37:55 1997
+@@ -104,7 +104,7 @@
+ 	passwd *pass;
+ 	char salt[3];
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+       pass = getpwuid(getuid());
+  
+        if ( !strcmp( crypt( password, pass->pw_passwd), pass->pw_passwd )) {
diff --git a/x11/kdebase/pkg/PLIST b/x11/kdebase/pkg/PLIST
index 1c489281e03..f919faac825 100644
--- a/x11/kdebase/pkg/PLIST
+++ b/x11/kdebase/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1997/12/29 03:58:19 hubertf Exp $
 bin/kfmwarn
 bin/kfmclient
 bin/kioslave
@@ -341,7 +342,6 @@ share/mimelnk/application/x-tex-pk.kdelnk
 share/mimelnk/application/pdf.kdelnk
 share/mimelnk/application/x-tar.kdelnk
 share/mimelnk/application/x-trash.kdelnk
-share/mimelnk/application/x-zip.kdelnk
 share/mimelnk/application/x-core.kdelnk
 share/mimelnk/application/x-font.kdelnk
 share/mimelnk/application/x-java.kdelnk
@@ -661,35 +661,6 @@ cgi-bin/helpindex
 @dirrm share/mimelnk/audio
 @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/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/en/kwm