Retire comms/plptools.

25 files changed, 1 insertions, 601 deletions

diff --git a/comms/Makefile b/comms/Makefile
index 0ed53cffc39..29023f2a2ee 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2010/01/17 02:16:29 dholland Exp $
+# $NetBSD: Makefile,v 1.80 2010/02/10 17:08:22 joerg Exp $
 #
 
 COMMENT=	Communication utilities
@@ -55,7 +55,6 @@ SUBDIR+=	pilot-link
 SUBDIR+=	pilot-link-libs
 SUBDIR+=	pilotmgr
 SUBDIR+=	plp
-SUBDIR+=	plptools
 SUBDIR+=	py-gammu
 SUBDIR+=	qpage
 SUBDIR+=	ruby-termios
diff --git a/comms/plptools/DESCR b/comms/plptools/DESCR
deleted file mode 100644
index aa121c9019a..00000000000
--- a/comms/plptools/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
- This package is heavily based on two other packages:
-
-   - p3nfsd-5.4 by Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de)
-     an nfs daemon for Psion series 3 and 5
-   - plp_1_7 by Philip Proudman
-	(former email, current address unknown proudman@btinternet.com)
-
- The programs:
-
- ncpd is the daemon which handles the serial link to your Psion.
- It listens at port 7501 for local connections and provides
- basic PLP/NCP services for the other two programs. It auto-
- connects to the psion, even after unplugging/switching off
- therefore it can run always in background (if you have a
- spare serial-device)
-
- plpftp is a FTP-like program for manipulating files on the Psion.
-
- plpnfsd is a daemon, which provides NFS-like access to your Psion.
- It automatically makes the psion's filesystems available below
- an NFS-mounted directory (default /mnt/psion).
diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile
deleted file mode 100644
index f1e24cc560a..00000000000
--- a/comms/plptools/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.35 2009/05/20 00:58:09 wiz Exp $
-#
-
-DISTNAME=	plptools-0.12
-PKGREVISION=	3
-CATEGORIES=	comms
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=plptools/}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://plptools.sourceforge.net/
-COMMENT=	FTP-like and NFS-like access tools to talk to the PSION
-
-USE_GNU_READLINE=	yes	# uses rl_filename_quoting_desired flag
-USE_TOOLS+=		gmake
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		YES
-USE_PKGLOCALEDIR=	YES
-PTHREAD_OPTS+=		require
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-serial=${DEFAULT_SERIAL_DEVICE:Q}
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/comms/plptools/PLIST b/comms/plptools/PLIST
deleted file mode 100644
index 3849267d4bb..00000000000
--- a/comms/plptools/PLIST
+++ /dev/null
@@ -1,46 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:38:42 joerg Exp $
-bin/plpbackup
-bin/plpftp
-bin/sisinstall
-include/plptools/Enum.h
-include/plptools/bufferarray.h
-include/plptools/bufferstore.h
-include/plptools/iowatch.h
-include/plptools/log.h
-include/plptools/plpdirent.h
-include/plptools/plpintl.h
-include/plptools/ppsocket.h
-include/plptools/psibitmap.h
-include/plptools/psiprocess.h
-include/plptools/psitime.h
-include/plptools/rclip.h
-include/plptools/rfsv.h
-include/plptools/rfsv16.h
-include/plptools/rfsv32.h
-include/plptools/rfsvfactory.h
-include/plptools/rpcs.h
-include/plptools/rpcs16.h
-include/plptools/rpcs32.h
-include/plptools/rpcsfactory.h
-include/plptools/siscomponentrecord.h
-include/plptools/sisfile.h
-include/plptools/sisfileheader.h
-include/plptools/sisfilerecord.h
-include/plptools/sislangrecord.h
-include/plptools/sisreqrecord.h
-include/plptools/sistypes.h
-include/plptools/wprt.h
-lib/libplp.la
-man/man1/plpbackup.1
-man/man1/plpftp.1
-man/man1/sisinstall.1
-man/man8/ncpd.8
-man/man8/plpnfsd.8
-man/man8/plpprintd.8
-sbin/ncpd
-sbin/plpnfsd
-sbin/plpprintd
-share/locale/de/LC_MESSAGES/plptools.mo
-share/locale/sv/LC_MESSAGES/plptools.mo
-share/plptools/fontmap
-share/plptools/prolog.ps
diff --git a/comms/plptools/distinfo b/comms/plptools/distinfo
deleted file mode 100644
index a56da056ee4..00000000000
--- a/comms/plptools/distinfo
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: distinfo,v 1.13 2008/03/04 22:29:06 jlam Exp $
-
-SHA1 (plptools-0.12.tar.gz) = fab3174bb4c3618cbd5769dc5cbf1fe17940628c
-RMD160 (plptools-0.12.tar.gz) = a2e9f7cd046a78db766363790356ba7778de2605
-Size (plptools-0.12.tar.gz) = 989591 bytes
-SHA1 (patch-aa) = 4621a095cf6cc930da8a76ac4d3b3528ca3de6cf
-SHA1 (patch-ab) = 2330d64503a193adb5850bb7495d2d71551e80e8
-SHA1 (patch-ac) = a6f7b87e1cebcade8e650b7889e27d454d27ebb2
-SHA1 (patch-ad) = f57250eb76276b3764b55248aec4693a3db6b928
-SHA1 (patch-ae) = ef4388db1df7269fa565b77b9bc4bab6ce06540e
-SHA1 (patch-af) = 9d80551cf80afa07009f440f83876dfd8f815fd0
-SHA1 (patch-ag) = ac801d03a349480c84d78a474cd591eb082c8629
-SHA1 (patch-ah) = d654174779357c40c753df3ce8b680662961386a
-SHA1 (patch-ai) = d06d72566d5385508f5f0b9be9db8f75672e10ee
-SHA1 (patch-aj) = 7cc806f54fbc55394bbeec340dab8e77a77d0cc4
-SHA1 (patch-ak) = a887c4b938db0bbd8a0895e1aa5b1e58b09c8bde
-SHA1 (patch-al) = f6babbc5de66636071a6f8da64d5c96011d58c27
-SHA1 (patch-am) = 2c6e6b8a67447d5735e43b403a40a144b5a1e706
-SHA1 (patch-an) = c9f0cf50a5d7ad93a2f937f98a2ca8910acea37b
-SHA1 (patch-ao) = a33238564a2f5d8106ba8130a5aca8e978e7a65a
-SHA1 (patch-aq) = d7260ab3ceee51101201d457fb6bfb54dbd74b35
-SHA1 (patch-ar) = 426503250854d0e172a2aa05bc0d958b2e2ac791
-SHA1 (patch-at) = 4d2c83b2e143e184fd6409fa09505f382101344c
-SHA1 (patch-au) = cfb10ed181194153f08875d0b49ac08ff5129f44
-SHA1 (patch-av) = 3769724f2570a485fdfe8d377046ded0748521c5
diff --git a/comms/plptools/patches/patch-aa b/comms/plptools/patches/patch-aa
deleted file mode 100644
index 3b37a140225..00000000000
--- a/comms/plptools/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/09/08 12:14:59 wiz Exp $
-
---- intl/Makefile.in.orig	2002-04-05 08:14:16.000000000 +0200
-+++ intl/Makefile.in
-@@ -275,7 +275,7 @@ uninstall:
- 
- info dvi:
- 
--$(OBJECTS): ../config.h libgnuintl.h
-+$(OBJECTS): ../include/config.h libgnuintl.h
- bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: gettextP.h gmo.h loadinfo.h
- dcigettext.$lo: hash-string.h
- explodename.$lo l10nflist.$lo: loadinfo.h
diff --git a/comms/plptools/patches/patch-ab b/comms/plptools/patches/patch-ab
deleted file mode 100644
index ba67c8595ea..00000000000
--- a/comms/plptools/patches/patch-ab
+++ /dev/null
@@ -1,133 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2006/02/02 15:03:19 joerg Exp $
-
---- plpnfsd/mp_mount.c.orig	2002-07-12 14:45:41.000000000 +0000
-+++ plpnfsd/mp_mount.c
-@@ -21,7 +21,7 @@ extern int inet_addr(char *);
- #define PORTMAP			/* I need svcudp_create in rpc/svc_soc.h, sol 2.4 */
- #endif
- 
--#include <OSdefs.h>
-+#include "OSdefs.h"
- #include <stdio.h>
- #include <signal.h>
- #include <sys/stat.h>
-@@ -31,7 +31,7 @@ extern int inet_addr(char *);
- #include <bstring.h>
- #endif
- 
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/param.h>		/* Needs NGROUPS for mount.h */
- #define umount(dir) unmount(dir, 1)
- #endif
-@@ -47,22 +47,33 @@ extern int inet_addr(char *);
- static char nfshost[128];
- 
- #define NFSCLIENT
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #define NFS
- #endif				/* __FreeBSD__ */
- #include <sys/mount.h>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <rpc/rpc.h>
- #include <nfs/rpcv2.h>
--#if __FreeBSD_version >= 300001
-+#if defined(__DragonFly__) || __FreeBSD_version >= 300001
- #include <nfs/nfs.h>
- #endif
- #endif				/* __FreeBSD__ */
- 
-+#ifdef __NetBSD__
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <strings.h>
-+#include <nfs/nfsmount.h>
-+#endif /* __NetBSD__ */
-+
- #include <rpc/rpc.h>
- #include "nfs_prot.h"
- 
-@@ -156,7 +167,7 @@ static void doexit() {
- 	struct mntent *ent;
- #endif
- #endif
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
- 	struct stat statb;
- #endif
- 
-@@ -277,7 +288,7 @@ mount_and_run(char *dir, void (*proc)(),
- #else
- 	struct nfs_args nfs_args;
- #endif
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	int mount_flags;
- #endif
- 
-@@ -427,8 +438,8 @@ mount_and_run(char *dir, void (*proc)(),
- 	    NFSMNT_RETRANS | NFSMNT_TIMEO | NFSMNT_WSIZE | NFSMNT_RSIZE;
- #endif
- 
--#ifdef __FreeBSD__
--#if __FreeBSD_version >= 300001
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#if defined(__DragonFly__) || __FreeBSD_version >= 300001
- 	nfs_args.version = NFS_ARGSVERSION;
- #endif
- 	nfs_args.addr = (struct sockaddr *) &sain;
-@@ -453,20 +464,23 @@ mount_and_run(char *dir, void (*proc)(),
- #endif
- 
- #ifdef __NetBSD__
-+	nfs_args.version = NFS_ARGSVERSION;
- 	nfs_args.addrlen = sizeof(sain);
- 	nfs_args.sotype = SOCK_DGRAM;
- 	nfs_args.maxgrouplist = NGROUPS;
- 	nfs_args.readahead = 1;
- 	nfs_args.addr = (struct sockaddr *) &sain;
- 	nfs_args.fh = (void *) root_fh;
-+	nfs_args.fhsize = sizeof(*root_fh);
- 	nfs_args.wsize = PBUFSIZE;
- 	nfs_args.rsize = PBUFSIZE;
- 	nfs_args.retrans = 10;
- 	nfs_args.timeo = 600;
- 	nfs_args.hostname = PSIONHOSTNAME;
- 	nfs_args.flags = NFSMNT_INT | NFSMNT_RETRANS | NFSMNT_TIMEO
--	    | NFSMNT_NOCONN | NFSMNT_DUMBTIMR | NFSMNT_MYWRITE
-+	    | NFSMNT_NOCONN | NFSMNT_DUMBTIMR
- 	    | NFSMNT_WSIZE | NFSMNT_RSIZE;
-+	mount_flags = MNT_NOSUID | MNT_NODEV | MNT_NOEXEC | MNT_NOATIME;
- #endif
- 
- #if defined(_IBMR2)
-@@ -496,7 +510,7 @@ mount_and_run(char *dir, void (*proc)(),
- #if defined(__sgi) || (defined(sun) && defined(__SVR4))
- 			if (mount("", dir, MS_DATA, "nfs", &nfs_args, sizeof(nfs_args)))
- #endif
--#if defined(__NetBSD__) || defined(__NeXT__)
-+#if defined(__NeXT__)
- 			if (mount(MOUNT_NFS, dir, 0, (caddr_t) & nfs_args))
- #endif
- #ifdef hpux
-@@ -512,8 +526,8 @@ mount_and_run(char *dir, void (*proc)(),
- 			if (aix3_mount("psion:loc", dir, 0, MOUNT_TYPE_NFS, &nfs_args, "plpnfsd"))
- #endif
- 
--#ifdef __FreeBSD__
--#if __FreeBSD_version >= 300001
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+#if defined(__DragonFly__) || __FreeBSD_version >= 300001
- 			if (mount("nfs", dir, mount_flags, &nfs_args))
- #else
- 			if (mount(MOUNT_NFS, dir, mount_flags, &nfs_args))
diff --git a/comms/plptools/patches/patch-ac b/comms/plptools/patches/patch-ac
deleted file mode 100644
index 6e945606072..00000000000
--- a/comms/plptools/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2004/09/08 12:14:59 wiz Exp $
-
---- lib/ppsocket.cc.orig	2002-08-05 14:36:02.000000000 +0200
-+++ lib/ppsocket.cc
-@@ -45,6 +45,10 @@
- #define  INVALID_SOCKET	-1
- #define  SOCKET_ERROR	-1
- 
-+#ifndef MSG_NOSIGNAL
-+#define MSG_NOSIGNAL	0
-+#endif
-+
- using namespace std;
- 
- ppsocket::ppsocket(const ppsocket & another)
diff --git a/comms/plptools/patches/patch-ad b/comms/plptools/patches/patch-ad
deleted file mode 100644
index 0f543006fb7..00000000000
--- a/comms/plptools/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/09/08 12:14:59 wiz Exp $
-
---- plpnfsd/mp_main.c.orig	2003-01-31 23:52:47.000000000 +0100
-+++ plpnfsd/mp_main.c
-@@ -22,7 +22,7 @@
- #include <errno.h>
- #include "nfs_prot.h"
- #include "mp.h"
--#if defined (__SVR4) || defined(__sgi)
-+#if defined (__SVR4) || defined(__sgi) || defined(__NetBSD__)
- #include <stdlib.h>		/* getenv */
- #include <string.h>		/* strcmp */
- #endif
diff --git a/comms/plptools/patches/patch-ae b/comms/plptools/patches/patch-ae
deleted file mode 100644
index b0a450efc13..00000000000
--- a/comms/plptools/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/09/08 12:14:59 wiz Exp $
-
---- plpnfsd/mp_inode.c.orig	2002-07-12 17:18:01.000000000 +0200
-+++ plpnfsd/mp_inode.c
-@@ -11,7 +11,7 @@
- #include "mp.h"
- #include "rfsv_api.h"
- 
--#if defined(__SVR4) || defined(__GLIBC__) || defined(__FreeBSD__)
-+#if defined(__SVR4) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__NetBSD__)
- #include <string.h>
- #include <stdlib.h>
- #endif
diff --git a/comms/plptools/patches/patch-af b/comms/plptools/patches/patch-af
deleted file mode 100644
index 8d7f58772cb..00000000000
--- a/comms/plptools/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2004/09/08 12:14:59 wiz Exp $
-
---- plpnfsd/mp_pfs_ops.c.orig	2002-03-08 09:29:50.000000000 +0100
-+++ plpnfsd/mp_pfs_ops.c
-@@ -10,7 +10,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <pwd.h>
--#if defined(__SVR4) || defined(__GLIBC__)
-+#if defined(__SVR4) || defined(__GLIBC__) || defined(__NetBSD__)
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
diff --git a/comms/plptools/patches/patch-ag b/comms/plptools/patches/patch-ag
deleted file mode 100644
index 5cf4ab38768..00000000000
--- a/comms/plptools/patches/patch-ag
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2004/09/08 12:14:59 wiz Exp $
-
---- plpnfsd/nfs_prot_svc.c.orig	2002-03-08 09:29:50.000000000 +0100
-+++ plpnfsd/nfs_prot_svc.c
-@@ -8,7 +8,7 @@
- #include "OSdefs.h"
- 
- #define PORTMAP
--#ifdef __SVR4
-+#if defined(__SVR4) || defined(__NetBSD__)
- #include <unistd.h>
- #include <stdlib.h>
- #endif
-@@ -16,7 +16,7 @@
- #include <rpc/rpc.h>
- #include "nfs_prot.h"
- #include "mp.h"
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) || defined(__NetBSD__)
- #include <string.h>
- #endif
- 
-@@ -197,7 +197,7 @@ nfs_program_2(rqstp, transp)
- 	}
- 	memset((char *)&argument, 0, sizeof(argument));
- #if !defined(__SVR4) && !defined(__FreeBSD__)
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) || defined(__NetBSD__)
- 	if (!svc_getargs(transp, (xdrproc_t)xdr_argument, (caddr_t)&argument)) {
- #else
- 	if (!svc_getargs(transp, xdr_argument, &argument)) {
-@@ -217,7 +217,7 @@ nfs_program_2(rqstp, transp)
- 		svcerr_systemerr(transp);
- 	}
- #if !defined(__SVR4) && !defined(__FreeBSD__)
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) || defined(__NetBSD__)
- 	if (!svc_freeargs(transp, (xdrproc_t)xdr_argument,(caddr_t)&argument)) {
- #else
- 	if (!svc_freeargs(transp, xdr_argument, &argument)) {
diff --git a/comms/plptools/patches/patch-ah b/comms/plptools/patches/patch-ah
deleted file mode 100644
index b62395b4ef7..00000000000
--- a/comms/plptools/patches/patch-ah
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2006/02/02 15:03:19 joerg Exp $
-
---- lib/Enum.h.orig	2002-08-10 20:47:05.000000000 +0200
-+++ lib/Enum.h
-@@ -28,6 +28,7 @@
- #endif
- 
- #include <plpintl.h>
-+#include <assert.h>
- 
- #include <map>
- #include <string>
-@@ -257,7 +258,7 @@ public:
-     * XXX: throw OutOfRangeException ?
-     */
-     static E getValueFor(const std::string &s) {
--	return (E) staticData.stringRep.lookup(s.getCStr());
-+	return (E) staticData.stringRep.lookup(s.c_str());
-     }
- };
- 
-@@ -295,6 +296,20 @@ public:
-  *
-  * @author Henner Zeller
-  */
-+#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-+#define ENUM_DEFINITION(EnumName, initWith)			\
-+/**								\
-+  * The definition of the static variable holding the static	\
-+  * data for this Enumeration wrapper.				\
-+  */								\
-+template <EnumName> Enum<EnumName>::sdata Enum<EnumName>::staticData;	\
-+/**								\
-+  * actual definition of the constructor for the static data.	\
-+  * This is called implicitly by the definition above.		\
-+  */								\
-+Enum<EnumName>::sdata::sdata() :				\
-+name(#EnumName),defaultValue(initWith)
-+#else
- #define ENUM_DEFINITION(EnumName, initWith)			\
- /**								\
-   * The definition of the static variable holding the static	\
-@@ -307,6 +322,7 @@ Enum<EnumName>::sdata Enum<EnumName>::st
-   */								\
- Enum<EnumName>::sdata::sdata() :				\
- name(#EnumName),defaultValue(initWith)
-+#endif
- 
- /**
-  * Writes enumeration's string representation.
diff --git a/comms/plptools/patches/patch-ai b/comms/plptools/patches/patch-ai
deleted file mode 100644
index 6607bb45d00..00000000000
--- a/comms/plptools/patches/patch-ai
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2006/02/02 15:03:19 joerg Exp $
-
---- lib/psitime.cc.orig	2002-08-05 11:27:54.000000000 +0000
-+++ lib/psitime.cc
-@@ -63,7 +63,7 @@ PsiTime::PsiTime(const u_int32_t _ptvHi,
-     psi2unix();
- }
- 
--PsiTime::PsiTime(struct timeval *_utv, struct timezone *_utz = 0L) {
-+PsiTime::PsiTime(struct timeval *_utv, struct timezone *_utz) {
-     if (_utv != 0L)
- 	utv = *_utv;
-     if (_utz != 0L)
-@@ -219,7 +219,11 @@ evalOffset(psi_timezone ptz, time_t time
- 	    * daylight saving.
- 	    */
- 	    struct tm *tm = localtime(&time);
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__)
-+	    offset = -tm->tm_gmtoff;
-+#else
- 	    offset = timezone;
-+#endif
- 	    if (tm->tm_isdst)
- 		offset += 3600;
- 	}
-@@ -228,7 +232,11 @@ evalOffset(psi_timezone ptz, time_t time
-     // later
-     time_t now = ::time(0);
-     struct tm *now_tm = localtime(&now);
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__)
-+    offset -= -now_tm->tm_gmtoff;
-+#else
-     offset -= timezone;
-+#endif
- 
-     offset *= 1000000;
-     return offset;
diff --git a/comms/plptools/patches/patch-aj b/comms/plptools/patches/patch-aj
deleted file mode 100644
index 9b9688211ba..00000000000
--- a/comms/plptools/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/02/02 15:03:19 joerg Exp $
-
---- ncpd/Makefile.in.orig	2003-02-04 11:27:21.000000000 +0100
-+++ ncpd/Makefile.in
-@@ -212,7 +212,7 @@ CXXFLAGS = $(THREADED_CXXFLAGS)
- 
- sbin_PROGRAMS = ncpd
- 
--ncpd_LDADD = $(LIB_PLP) -lpthread
-+ncpd_LDADD = $(LIB_PLP) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $(INTLLIBS)
- ncpd_SOURCES = channel.cc link.cc linkchan.cc main.cc \
- 	ncp.cc packet.cc socketchan.cc mp_serial.c
- 
diff --git a/comms/plptools/patches/patch-ak b/comms/plptools/patches/patch-ak
deleted file mode 100644
index 21d5c327cf7..00000000000
--- a/comms/plptools/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2004/09/08 12:14:59 wiz Exp $
-
---- plpnfsd/Makefile.in.orig	2003-02-04 11:27:21.000000000 +0100
-+++ plpnfsd/Makefile.in
-@@ -209,7 +209,7 @@ x_libraries = @x_libraries@
- INCLUDES = -I$(top_srcdir)/lib
- 
- sbin_PROGRAMS = plpnfsd
--plpnfsd_LDADD = $(LIB_PLP)
-+plpnfsd_LDADD = $(LIB_PLP) $(INTLLIBS)
- plpnfsd_SOURCES = mp_main.c mp_mount.c nfs_prot_svc.c nfs_prot_xdr.c \
- 	mp_pfs_ops.c mp_inode.c main.cc
- 
diff --git a/comms/plptools/patches/patch-al b/comms/plptools/patches/patch-al
deleted file mode 100644
index 94c37240515..00000000000
--- a/comms/plptools/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2004/09/08 12:14:59 wiz Exp $
-
---- plpbackup/Makefile.in.orig	2003-02-04 11:27:22.000000000 +0100
-+++ plpbackup/Makefile.in
-@@ -209,7 +209,7 @@ x_libraries = @x_libraries@
- INCLUDES = -I$(top_srcdir)/lib
- 
- bin_PROGRAMS = plpbackup
--plpbackup_LDADD = $(LIB_PLP)
-+plpbackup_LDADD = $(LIB_PLP) $(INTLLIBS)
- plpbackup_SOURCES = plpbackup.cc
- mkinstalldirs = $(SHELL) $(top_srcdir)/conf/mkinstalldirs
- CONFIG_HEADER = ../include/config.h
diff --git a/comms/plptools/patches/patch-am b/comms/plptools/patches/patch-am
deleted file mode 100644
index 2faa4c73a11..00000000000
--- a/comms/plptools/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/09/08 12:14:59 wiz Exp $
-
---- plpprint/Makefile.in.orig	2003-02-04 11:27:22.000000000 +0100
-+++ plpprint/Makefile.in
-@@ -209,7 +209,7 @@ x_libraries = @x_libraries@
- INCLUDES = -I$(top_srcdir)/lib
- 
- sbin_PROGRAMS = plpprintd
--plpprintd_LDADD = $(LIB_PLP)
-+plpprintd_LDADD = $(LIB_PLP) $(INTLLIBS)
- plpprintd_SOURCES = plpprintd.cc
- 
- EXTRA_DIST = prolog.ps.in fontmap
diff --git a/comms/plptools/patches/patch-an b/comms/plptools/patches/patch-an
deleted file mode 100644
index c5324bf53b9..00000000000
--- a/comms/plptools/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/09/08 12:14:59 wiz Exp $
-
---- sisinstall/Makefile.in.orig	2003-02-04 11:27:23.000000000 +0100
-+++ sisinstall/Makefile.in
-@@ -209,7 +209,7 @@ x_libraries = @x_libraries@
- INCLUDES = -I$(top_srcdir)/lib
- 
- bin_PROGRAMS = sisinstall
--sisinstall_LDADD = $(top_srcdir)/lib/libplp.la $(LIBNEWT)
-+sisinstall_LDADD = $(top_srcdir)/lib/libplp.la $(LIBNEWT) $(INTLLIBS)
- sisinstall_SOURCES = psion.cpp sisinstaller.cpp sismain.cpp \
- 	fakepsion.cpp sisfilelink.cpp sisfilelink.h
- 
diff --git a/comms/plptools/patches/patch-ao b/comms/plptools/patches/patch-ao
deleted file mode 100644
index 6310a63b6a9..00000000000
--- a/comms/plptools/patches/patch-ao
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/09/08 12:14:59 wiz Exp $
-
---- plpftp/ftp.cc.orig	2002-07-14 08:35:33.000000000 +0200
-+++ plpftp/ftp.cc
-@@ -1053,6 +1053,11 @@ session(rfsv & a, rpcs & r, int xargc, c
-     return a.getStatus();
- }
- 
-+#ifdef RL_READLINE_VERSION
-+#undef READLINE_VERSION
-+#define READLINE_VERSION RL_READLINE_VERSION
-+#endif
-+
- #if HAVE_LIBREADLINE
- #if (READLINE_VERSION >= 402)
- #define FUNCAST(f) f
diff --git a/comms/plptools/patches/patch-aq b/comms/plptools/patches/patch-aq
deleted file mode 100644
index 6c001ebf371..00000000000
--- a/comms/plptools/patches/patch-aq
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/02/02 15:03:19 joerg Exp $
-
---- configure.orig	2006-01-27 18:31:59.000000000 +0000
-+++ configure
-@@ -9012,7 +9012,6 @@ else
- #include "confdefs.h"
- #include <libintl.h>
- extern int _nl_msg_cat_cntr;
--extern int *_nl_domain_bindings;
- extern
- #ifdef __cplusplus
- "C"
-@@ -9020,7 +9019,7 @@ extern
- const char *_nl_expand_alias ();
- int main() {
- bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
-+return (int) gettext ("") + _nl_msg_cat_cntr + + *_nl_expand_alias (0)
- ; return 0; }
- EOF
- if { (eval echo configure:9027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/comms/plptools/patches/patch-ar b/comms/plptools/patches/patch-ar
deleted file mode 100644
index 323e8b62144..00000000000
--- a/comms/plptools/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2006/02/02 15:03:19 joerg Exp $
-
---- lib/bufferstore.h.orig	2006-01-27 18:38:08.000000000 +0000
-+++ lib/bufferstore.h
-@@ -129,7 +129,7 @@ public:
-     *
-     * @returns The stream.
-     */
--    friend class std::ostream &operator<<(std::ostream &, const bufferStore &);
-+    friend std::ostream &operator<<(std::ostream &, const bufferStore &);
- 
-     /**
-     * Tests if the bufferStore is empty.
diff --git a/comms/plptools/patches/patch-at b/comms/plptools/patches/patch-at
deleted file mode 100644
index e5ac2771633..00000000000
--- a/comms/plptools/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/02/02 15:03:19 joerg Exp $
-
---- lib/psiprocess.h.orig	2006-01-27 18:56:50.000000000 +0000
-+++ lib/psiprocess.h
-@@ -105,7 +105,7 @@ public:
-     * The output is in human readable similar to the
-     * output of a "ls" command.
-     */
--    friend class std::ostream &operator<<(std::ostream &o, const PsiProcess &p);
-+    friend std::ostream &operator<<(std::ostream &o, const PsiProcess &p);
- 
- private:
-     friend class rpcs;
diff --git a/comms/plptools/patches/patch-au b/comms/plptools/patches/patch-au
deleted file mode 100644
index bfac9a1490d..00000000000
--- a/comms/plptools/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2007/08/01 20:28:07 joerg Exp $
-
---- ncpd/packet.cc.orig	2007-08-01 20:06:29.000000000 +0000
-+++ ncpd/packet.cc
-@@ -26,7 +26,7 @@
- #endif
- 
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <sys/time.h>
- #include <sys/types.h>
diff --git a/comms/plptools/patches/patch-av b/comms/plptools/patches/patch-av
deleted file mode 100644
index 9aa46bfe26b..00000000000
--- a/comms/plptools/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1 2007/08/01 20:28:08 joerg Exp $
-
---- ncpd/socketchan.cc.orig	2007-08-01 20:07:17.000000000 +0000
-+++ ncpd/socketchan.cc
-@@ -27,7 +27,7 @@
- #include <stream.h>
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "socketchan.h"
- #include "ncp.h"