Add DragonFly support.

Fix C++ RTL usage: c_str is how to get the representation, not getCStr.
Attempt to fix declaration of static template members. Be conditional
for GCC 3.4+ for now, it conflicts with the constructor in GCC 3.3.
Attempt to fix timezone usage as found in other packages.
Use PTHREAD_* variables instead of hard-coded -lpthread.
Don't look for _nl_domain_bindings in -lintl, libintl uses a different
prefix.
Remove harmfull class keywords in friend declarations.

8 files changed, 171 insertions, 18 deletions

diff --git a/comms/plptools/distinfo b/comms/plptools/distinfo
index f07e9abff9a..5456793b77a 100644
--- a/comms/plptools/distinfo
+++ b/comms/plptools/distinfo
@@ -1,21 +1,24 @@
-$NetBSD: distinfo,v 1.10 2005/02/23 16:05:30 agc Exp $
+$NetBSD: distinfo,v 1.11 2006/02/02 15:03:19 joerg 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) = 78bbf96deddeb67e9dda77849e96b4f5e65d0dc6
+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) = 37797e494ccdc436d2739d147e84f1a2f71c8ece
-SHA1 (patch-ai) = d000a205093ccd32e9ed0648b53795cde450f8f3
-SHA1 (patch-aj) = 3ba55815548b720a9ba953930e965ccf2947f816
+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-ap) = f76397c1a56f6ae9b08e275d7f777e93dfe11d83
+SHA1 (patch-aq) = d7260ab3ceee51101201d457fb6bfb54dbd74b35
+SHA1 (patch-ar) = 426503250854d0e172a2aa05bc0d958b2e2ac791
+SHA1 (patch-at) = 4d2c83b2e143e184fd6409fa09505f382101344c
diff --git a/comms/plptools/patches/patch-ab b/comms/plptools/patches/patch-ab
index 22bb3e6349f..ba67c8595ea 100644
--- a/comms/plptools/patches/patch-ab
+++ b/comms/plptools/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2004/09/08 12:14:59 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2006/02/02 15:03:19 joerg Exp $
 
---- plpnfsd/mp_mount.c.orig	2002-07-12 16:45:41.000000000 +0200
+--- 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 */
@@ -11,7 +11,35 @@ $NetBSD: patch-ab,v 1.5 2004/09/08 12:14:59 wiz Exp $
  #include <stdio.h>
  #include <signal.h>
  #include <sys/stat.h>
-@@ -63,6 +63,17 @@ static char nfshost[128];
+@@ -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__ */
  
@@ -34,7 +62,7 @@ $NetBSD: patch-ab,v 1.5 2004/09/08 12:14:59 wiz Exp $
  #endif
  #endif
 -#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  	struct stat statb;
  #endif
  
@@ -43,10 +71,21 @@ $NetBSD: patch-ab,v 1.5 2004/09/08 12:14:59 wiz Exp $
  	struct nfs_args nfs_args;
  #endif
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#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
  
@@ -81,12 +120,14 @@ $NetBSD: patch-ab,v 1.5 2004/09/08 12:14:59 wiz Exp $
  			if (mount(MOUNT_NFS, dir, 0, (caddr_t) & nfs_args))
  #endif
  #ifdef hpux
-@@ -512,7 +526,7 @@ mount_and_run(char *dir, void (*proc)(),
+@@ -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 defined(__NetBSD__) || defined(__FreeBSD__)
- #if __FreeBSD_version >= 300001
+-#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-ah b/comms/plptools/patches/patch-ah
index 8b587219d89..b62395b4ef7 100644
--- a/comms/plptools/patches/patch-ah
+++ b/comms/plptools/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2004/09/08 12:14:59 wiz Exp $
+$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
@@ -10,3 +10,41 @@ $NetBSD: patch-ah,v 1.2 2004/09/08 12:14:59 wiz Exp $
  
  #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
index 8424f2c3d97..6607bb45d00 100644
--- a/comms/plptools/patches/patch-ai
+++ b/comms/plptools/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2004/09/08 12:14:59 wiz Exp $
+$NetBSD: patch-ai,v 1.3 2006/02/02 15:03:19 joerg Exp $
 
---- lib/psitime.cc.orig	2002-08-05 13:27:54.000000000 +0200
+--- 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();
@@ -11,3 +11,27 @@ $NetBSD: patch-ai,v 1.2 2004/09/08 12:14:59 wiz Exp $
      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
index 14282976012..9b9688211ba 100644
--- a/comms/plptools/patches/patch-aj
+++ b/comms/plptools/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2004/09/08 12:14:59 wiz Exp $
+$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
@@ -7,7 +7,7 @@ $NetBSD: patch-aj,v 1.2 2004/09/08 12:14:59 wiz Exp $
  sbin_PROGRAMS = ncpd
  
 -ncpd_LDADD = $(LIB_PLP) -lpthread
-+ncpd_LDADD = $(LIB_PLP) -lpthread $(INTLLIBS)
++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-aq b/comms/plptools/patches/patch-aq
new file mode 100644
index 00000000000..6c001ebf371
--- /dev/null
+++ b/comms/plptools/patches/patch-aq
@@ -0,0 +1,21 @@
+$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
new file mode 100644
index 00000000000..323e8b62144
--- /dev/null
+++ b/comms/plptools/patches/patch-ar
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..e5ac2771633
--- /dev/null
+++ b/comms/plptools/patches/patch-at
@@ -0,0 +1,13 @@
+$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;