pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/comms/plptools Update to 0.12 to fix build with gcc3.
details: https://anonhg.NetBSD.org/pkgsrc/rev/5bc9160d11ff
branches: trunk
changeset: 480396:5bc9160d11ff
user: wiz <wiz%pkgsrc.org@localhost>
date: Wed Sep 08 12:14:59 2004 +0000
description:
Update to 0.12 to fix build with gcc3.
Changes since 0.8 are not documented except in the
ChangeLog.
Changes from Version 0.7 to 0.8
- Fixed lot of bugs, especially in nfs code
- Series 3 _should_ work again.
- Added support for KDE (KDE >= 2.1)
- Added KDE Application "kpsion"
Changes from Version 0.6 to 0.7
- Changed timezone-stuff again. With S5, now the machine-info is
evaluated. This info holds the Psion's time-offset so that we
are able to calculate the offset correctly, regardless of the
Psion's setting. All that is done in a new class PsiTime.
For S3, a Fallback is provided using an Env-Variable "PSI_TZ" which
can be set to the Psion's time-offset in seconds.
- Added lots of rpc related stuff:
- Implemented a procfs-like subdir in plpnfsd. Processes can
be examined and misc. parameters can be examined/changed using
the entries in <psionMountDir>/proc/
Several parameters can now be changed on the fly:
attribute-cache timeout in seconds: proc/acache (rw)
debuglevel: proc/debuglevel (rw)
directory-cache timeout in seconds: proc/dcache (rw)
Psion's owner-info: proc/owner (ro)
Unix-owner of mounted directory: proc/unixowner (rw)
Stopping of plpnfsd has now changed:
Old:
reference /mnt/psion/exit
New:
echo stop > /mnt/psion/proc/exit
This should be safer than accidentally referencing a file.
For every process running on the psion, a subdir in proc/ is
created with two files "cmd" and "args" (both ro). cmd is the
process-name, args is it's commandline.
- Added machinfo command in plpftp for displaying lot of interesting
information about S5. (E.g. battery status etc.)
- Added killsave and runrestore to plpftpd. Both take a unix file
as argument. killsave kills all processes on the Psion and saves
restart-information to the specified file. runrestore reads a file
created by killsave and starts all processes saved in this file.
-> Functionality similar to the behavior of PsiWin before/after backup.
diffstat:
comms/plptools/Makefile | 11 ++-
comms/plptools/PLIST | 49 ++++++++++++++++++-
comms/plptools/distinfo | 34 +++++++------
comms/plptools/patches/patch-aa | 24 ++++----
comms/plptools/patches/patch-ab | 18 +++---
comms/plptools/patches/patch-ac | 100 ++++------------------------------------
comms/plptools/patches/patch-ad | 8 +-
comms/plptools/patches/patch-ae | 4 +-
comms/plptools/patches/patch-af | 8 +-
comms/plptools/patches/patch-ag | 8 +-
comms/plptools/patches/patch-ah | 21 ++++----
comms/plptools/patches/patch-ai | 24 ++++----
comms/plptools/patches/patch-aj | 24 ++++----
comms/plptools/patches/patch-ak | 33 ++++--------
comms/plptools/patches/patch-al | 33 ++++--------
comms/plptools/patches/patch-am | 13 +++++
comms/plptools/patches/patch-an | 13 +++++
comms/plptools/patches/patch-ao | 16 ++++++
comms/plptools/patches/patch-ap | 13 +++++
19 files changed, 230 insertions(+), 224 deletions(-)
diffs (truncated from 650 to 300 lines):
diff -r 6c9b162d5c1e -r 5bc9160d11ff comms/plptools/Makefile
--- a/comms/plptools/Makefile Wed Sep 08 12:08:06 2004 +0000
+++ b/comms/plptools/Makefile Wed Sep 08 12:14:59 2004 +0000
@@ -1,22 +1,25 @@
-# $NetBSD: Makefile,v 1.24 2004/04/25 00:36:04 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2004/09/08 12:14:59 wiz Exp $
#
-DISTNAME= plptools-0.6
-PKGREVISION= 1
+DISTNAME= plptools-0.12
CATEGORIES= comms
-MASTER_SITES= ftp://ftp.to.com/pub/psion/tarballs/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=plptools/}
MAINTAINER= sakamoto%NetBSD.org@localhost
+HOMEPAGE= http://plptools.sourceforge.net/
COMMENT= FTP-like and NFS-like access tools to talk to the PSION
USE_BUILDLINK3= YES
USE_GNU_READLINE= # uses rl_filename_quoting_desired flag
+USE_GNU_TOOLS+= make
USE_LANUGAGES= c c++
USE_LIBTOOL= YES
+USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-serial=${DEFAULT_SERIAL_DEVICE}
LIBS+= -ltermcap
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6c9b162d5c1e -r 5bc9160d11ff comms/plptools/PLIST
--- a/comms/plptools/PLIST Wed Sep 08 12:08:06 2004 +0000
+++ b/comms/plptools/PLIST Wed Sep 08 12:14:59 2004 +0000
@@ -1,9 +1,52 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:38 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/08 12:14:59 wiz 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.a
lib/libplp.la
lib/libplp.so
-lib/libplp.so.1
-lib/libplp.so.1.0
+lib/libplp.so.0
+lib/libplp.so.0.12
+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
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/plptools.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/plptools.mo
+share/plptools/fontmap
+share/plptools/prolog.ps
+@dirrm share/plptools
+@dirrm include/plptools
diff -r 6c9b162d5c1e -r 5bc9160d11ff comms/plptools/distinfo
--- a/comms/plptools/distinfo Wed Sep 08 12:08:06 2004 +0000
+++ b/comms/plptools/distinfo Wed Sep 08 12:14:59 2004 +0000
@@ -1,16 +1,20 @@
-$NetBSD: distinfo,v 1.7 2004/05/24 16:09:35 kristerw Exp $
+$NetBSD: distinfo,v 1.8 2004/09/08 12:14:59 wiz Exp $
-SHA1 (plptools-0.6.tar.gz) = 99280368116018a10469ea7e1b86985cf551eae5
-Size (plptools-0.6.tar.gz) = 197770 bytes
-SHA1 (patch-aa) = cfb95f4970b6e7c8d17bc79250f4500ee0da3963
-SHA1 (patch-ab) = 00fee9bb2eebf357b171ac640163a943485f482f
-SHA1 (patch-ac) = f547dc3ec8fad2fbd1ef7fb40c59c14e22bcb832
-SHA1 (patch-ad) = de550f23304b6205f0d4a6b40cc32307c41a509f
-SHA1 (patch-ae) = 46b1d9714397c7b9d6b3fb5d053cda44fc5f10fd
-SHA1 (patch-af) = 41f937ef89ba41d79b531ffc57fd77dee0608a93
-SHA1 (patch-ag) = 536521b46cfea9d17c78ee212f693fd32b50ba5f
-SHA1 (patch-ah) = 9a4a9c6b33d2e5244a9da61307cf6367eaf87d55
-SHA1 (patch-ai) = 56a423124e444b481e34070cb33797b34d4d5aa0
-SHA1 (patch-aj) = 06802ebe102b02ffec36829cdb84d0d1bd87c04f
-SHA1 (patch-ak) = ca5bd31e37104f0a05f4ece8a27933692b5ce446
-SHA1 (patch-al) = 85c7cf6b413a866fbb292c0fe4007bb656907eb1
+SHA1 (plptools-0.12.tar.gz) = fab3174bb4c3618cbd5769dc5cbf1fe17940628c
+Size (plptools-0.12.tar.gz) = 989591 bytes
+SHA1 (patch-aa) = 4621a095cf6cc930da8a76ac4d3b3528ca3de6cf
+SHA1 (patch-ab) = 78bbf96deddeb67e9dda77849e96b4f5e65d0dc6
+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-ak) = a887c4b938db0bbd8a0895e1aa5b1e58b09c8bde
+SHA1 (patch-al) = f6babbc5de66636071a6f8da64d5c96011d58c27
+SHA1 (patch-am) = 2c6e6b8a67447d5735e43b403a40a144b5a1e706
+SHA1 (patch-an) = c9f0cf50a5d7ad93a2f937f98a2ca8910acea37b
+SHA1 (patch-ao) = a33238564a2f5d8106ba8130a5aca8e978e7a65a
+SHA1 (patch-ap) = 3dd8bef177e3ebc26b7d87fd167b486c20e71559
diff -r 6c9b162d5c1e -r 5bc9160d11ff comms/plptools/patches/patch-aa
--- a/comms/plptools/patches/patch-aa Wed Sep 08 12:08:06 2004 +0000
+++ b/comms/plptools/patches/patch-aa Wed Sep 08 12:14:59 2004 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2001/04/04 07:59:29 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2004/09/08 12:14:59 wiz Exp $
---- ncpd/mp_serial.c.orig Mon Jul 5 22:48:56 1999
-+++ ncpd/mp_serial.c
-@@ -182,7 +182,7 @@
- ser_exit(int fd)
- {
- struct termios ti;
-- if (ioctl(fd, TCGETS, (caddr_t) & ti) < 0)
-+ if (tcgetattr(fd, &ti) < 0)
- perror("TCGETSW");
- ti.c_cflag &= ~CRTSCTS;
- if (tcsetattr(fd, TCSANOW, &ti) < 0)
+--- 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 -r 6c9b162d5c1e -r 5bc9160d11ff comms/plptools/patches/patch-ab
--- a/comms/plptools/patches/patch-ab Wed Sep 08 12:08:06 2004 +0000
+++ b/comms/plptools/patches/patch-ab Wed Sep 08 12:14:59 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2001/04/04 08:53:44 skrll Exp $
+$NetBSD: patch-ab,v 1.5 2004/09/08 12:14:59 wiz Exp $
---- plpnfsd/mp_mount.c.orig Mon Jan 17 11:49:41 2000
+--- plpnfsd/mp_mount.c.orig 2002-07-12 16:45:41.000000000 +0200
+++ plpnfsd/mp_mount.c
-@@ -16,7 +16,7 @@
+@@ -21,7 +21,7 @@ extern int inet_addr(char *);
#define PORTMAP /* I need svcudp_create in rpc/svc_soc.h, sol 2.4 */
#endif
@@ -11,7 +11,7 @@
#include <stdio.h>
#include <signal.h>
#include <sys/stat.h>
-@@ -59,6 +59,17 @@
+@@ -63,6 +63,17 @@ static char nfshost[128];
#endif
#endif /* __FreeBSD__ */
@@ -29,7 +29,7 @@
#include <rpc/rpc.h>
#include "nfs_prot.h"
-@@ -147,7 +158,7 @@
+@@ -156,7 +167,7 @@ static void doexit() {
struct mntent *ent;
#endif
#endif
@@ -38,7 +38,7 @@
struct stat statb;
#endif
-@@ -229,7 +240,7 @@
+@@ -277,7 +288,7 @@ mount_and_run(char *dir, void (*proc)(),
#else
struct nfs_args nfs_args;
#endif
@@ -47,7 +47,7 @@
int mount_flags;
#endif
-@@ -405,20 +416,23 @@
+@@ -453,20 +464,23 @@ mount_and_run(char *dir, void (*proc)(),
#endif
#ifdef __NetBSD__
@@ -72,7 +72,7 @@
#endif
#if defined(_IBMR2)
-@@ -448,7 +462,7 @@
+@@ -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
@@ -81,7 +81,7 @@
if (mount(MOUNT_NFS, dir, 0, (caddr_t) & nfs_args))
#endif
#ifdef hpux
-@@ -464,7 +478,7 @@
+@@ -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
diff -r 6c9b162d5c1e -r 5bc9160d11ff comms/plptools/patches/patch-ac
--- a/comms/plptools/patches/patch-ac Wed Sep 08 12:08:06 2004 +0000
+++ b/comms/plptools/patches/patch-ac Wed Sep 08 12:14:59 2004 +0000
@@ -1,95 +1,15 @@
-$NetBSD: patch-ac,v 1.7 2002/06/28 19:05:23 agc Exp $
+$NetBSD: patch-ac,v 1.8 2004/09/08 12:14:59 wiz Exp $
---- plpftp/ftp.cc.orig Mon Jan 17 06:49:41 2000
-+++ plpftp/ftp.cc
-@@ -34,6 +34,10 @@
- #include <sys/stat.h>
- #include <signal.h>
+--- 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
-+#ifdef __NetBSD__
-+#include <stdio.h>
++#ifndef MSG_NOSIGNAL
++#define MSG_NOSIGNAL 0
+#endif
+
- #include "defs.h"
- #include "ftp.h"
- #include "rfsv.h"
-@@ -335,7 +339,7 @@
- // never used to do this
- char dateBuff[100];
- struct tm *t;
-- t = localtime(&time);
-+ t = localtime((time_t *)&time);
- strftime(dateBuff, 100, "%c", t);
- cout << a.opAttr(attr);
- cout << " " << dec << setw(10) << setfill(' ') << size;
-@@ -365,7 +369,7 @@
- else {
- char dateBuff[100];
- struct tm *t;
-- t = localtime(&mtime);
-+ t = localtime((time_t *)&mtime);
- strftime(dateBuff, 100, "%c %Z", t);
- cout << dateBuff << endl;
- }
-@@ -457,7 +461,7 @@
- long attr = s.getDWord(8);
- char dateBuff[100];
- struct tm *t;
-- t = localtime(&date);
-+ t = localtime((time_t *)&date);
- strftime(dateBuff, 100, "%c", t);
- cout << a.opAttr(attr);
- cout << " " << dec << setw(10) << setfill(' ') << size;
-@@ -849,7 +853,7 @@
- static long maskAttr;
-
- static char*
--filename_generator(char *text, int state)
-+filename_generator(const char *text, int state)
- {
- static int len;
-
-@@ -884,7 +888,7 @@
- }
+ using namespace std;
- static char *
--command_generator(char *text, int state)
-+command_generator(const char *text, int state)
- {
Home |
Main Index |
Thread Index |
Old Index