summaryrefslogtreecommitdiff
path: root/comms/plptools/patches
diff options
context:
space:
mode:
Diffstat (limited to 'comms/plptools/patches')
-rw-r--r--comms/plptools/patches/patch-aa13
-rw-r--r--comms/plptools/patches/patch-ab92
-rw-r--r--comms/plptools/patches/patch-ac15
-rw-r--r--comms/plptools/patches/patch-ad13
-rw-r--r--comms/plptools/patches/patch-ae13
-rw-r--r--comms/plptools/patches/patch-af13
-rw-r--r--comms/plptools/patches/patch-ag40
-rw-r--r--comms/plptools/patches/patch-ah12
-rw-r--r--comms/plptools/patches/patch-ai13
-rw-r--r--comms/plptools/patches/patch-aj13
-rw-r--r--comms/plptools/patches/patch-ak13
-rw-r--r--comms/plptools/patches/patch-al13
-rw-r--r--comms/plptools/patches/patch-am13
-rw-r--r--comms/plptools/patches/patch-an13
-rw-r--r--comms/plptools/patches/patch-ao16
-rw-r--r--comms/plptools/patches/patch-ap13
16 files changed, 0 insertions, 318 deletions
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 22bb3e6349f..00000000000
--- a/comms/plptools/patches/patch-ab
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2004/09/08 12:14:59 wiz Exp $
-
---- plpnfsd/mp_mount.c.orig 2002-07-12 16:45:41.000000000 +0200
-+++ 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>
-@@ -63,6 +63,17 @@ static char nfshost[128];
- #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__)
- 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__)
- int mount_flags;
- #endif
-
-@@ -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,7 +526,7 @@ 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 (mount("nfs", dir, mount_flags, &nfs_args))
- #else
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 8b587219d89..00000000000
--- a/comms/plptools/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/09/08 12:14:59 wiz 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>
diff --git a/comms/plptools/patches/patch-ai b/comms/plptools/patches/patch-ai
deleted file mode 100644
index 8424f2c3d97..00000000000
--- a/comms/plptools/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2004/09/08 12:14:59 wiz Exp $
-
---- lib/psitime.cc.orig 2002-08-05 13:27:54.000000000 +0200
-+++ 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)
diff --git a/comms/plptools/patches/patch-aj b/comms/plptools/patches/patch-aj
deleted file mode 100644
index 14282976012..00000000000
--- a/comms/plptools/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2004/09/08 12:14:59 wiz 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) -lpthread $(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-ap b/comms/plptools/patches/patch-ap
deleted file mode 100644
index 0de4863fc51..00000000000
--- a/comms/plptools/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/09/08 12:14:59 wiz Exp $
-
---- plpftp/Makefile.in.orig 2003-02-04 11:27:22.000000000 +0100
-+++ plpftp/Makefile.in
-@@ -209,7 +209,7 @@ x_libraries = @x_libraries@
- INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/intl
-
- bin_PROGRAMS = plpftp
--plpftp_LDADD = $(LIB_PLP) $(LIBREADLINE) $(LIBHISTORY) $(INTLLIBS)
-+plpftp_LDADD = $(LIB_PLP) $(LIBREADLINE) $(LIBHISTORY) $(INTLLIBS) -ltermcap
- plpftp_SOURCES = ftp.cc main.cc rlcrap.c
- EXTRA_DIST = ftp.h rlcrap.h
- mkinstalldirs = $(SHELL) $(top_srcdir)/conf/mkinstalldirs