summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@pkgsrc.org>2000-01-15 18:09:27 +0000
committerchristos <christos@pkgsrc.org>2000-01-15 18:09:27 +0000
commit47b4471c9138f5f962c29555f412955e14df5532 (patch)
treee2d43e67106c7b943c88b698943df18a4df680bc
parent52b2167c3eac2ba3e9495333d75e59bcadfe6206 (diff)
downloadpkgsrc-47b4471c9138f5f962c29555f412955e14df5532.tar.gz
replace rdist-6.1.4 with freerdist-0.91. 6.1.4 is just too buggy.
-rw-r--r--net/rdist6/Makefile16
-rw-r--r--net/rdist6/files/md54
-rw-r--r--net/rdist6/files/mf.netbsd22
-rw-r--r--net/rdist6/files/os-netbsd.h124
-rw-r--r--net/rdist6/files/patch-sum13
-rw-r--r--net/rdist6/patches/patch-aa43
-rw-r--r--net/rdist6/patches/patch-ab27
-rw-r--r--net/rdist6/patches/patch-ac22
-rw-r--r--net/rdist6/patches/patch-ad39
-rw-r--r--net/rdist6/patches/patch-ae16
-rw-r--r--net/rdist6/patches/patch-af26
-rw-r--r--net/rdist6/patches/patch-ag20
-rw-r--r--net/rdist6/patches/patch-ah34
13 files changed, 64 insertions, 342 deletions
diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index f23363c8d90..3488b02698b 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -1,24 +1,16 @@
-# $NetBSD: Makefile,v 1.4 1999/08/29 12:26:19 kim Exp $
+# $NetBSD: Makefile,v 1.5 2000/01/15 18:09:27 christos Exp $
#
-DISTNAME= rdist-6.1.4
+DISTNAME= freerdist-0.91
CATEGORIES= net
-MASTER_SITES= http://www.MagniComp.com/download/rdist/
-
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.MagniComp.com/rdist/
+MASTER_SITES= ftp.astron.com:/pub/freerdist/
+MAINTAINER= christos@netbsd.org
RDIST6_NAME= rdist6
INSTALL_TARGET= install install.man
MAKE_ENV+= RDIST6_NAME=${RDIST6_NAME}
-pre-patch:
- @${CP} \
- ${FILESDIR}/mf.netbsd \
- ${FILESDIR}/os-netbsd.h \
- ${WRKSRC}/config
-
post-install:
@strip ${PREFIX}/bin/${RDIST6_NAME}
@strip ${PREFIX}/bin/rdistd
diff --git a/net/rdist6/files/md5 b/net/rdist6/files/md5
index 7368c40202b..87ac4bd5897 100644
--- a/net/rdist6/files/md5
+++ b/net/rdist6/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:25:11 agc Exp $
+$NetBSD: md5,v 1.3 2000/01/15 18:09:28 christos Exp $
-MD5 (rdist-6.1.4.tar.gz) = fec9b84ed1b4e81cca193b2379fbccd9
+MD5 (freerdist-0.91.tar.gz) = 524c58b2932ac9dcc3754c0ad950d9d0
diff --git a/net/rdist6/files/mf.netbsd b/net/rdist6/files/mf.netbsd
deleted file mode 100644
index 2a1695e5b1d..00000000000
--- a/net/rdist6/files/mf.netbsd
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: mf.netbsd,v 1.1 1999/08/29 12:26:20 kim Exp $
-#
-# NetBSD Makefile
-#
-
-#
-# Functions that are missing in this OS are contained in the
-# files specified in ${MISSINGOBJS}.
-#
-#MISSINGOBJS = $(O)strerror.o $(O)strcasecmp.o
-
-#
-# System libraries that we need to load.
-#
-LIB_SYS = -lcompat
-
-#
-# System dependent options for compiling
-#
-#CFLAGS_OS =
-
-BIN_DIR = /usr/local/bin
diff --git a/net/rdist6/files/os-netbsd.h b/net/rdist6/files/os-netbsd.h
deleted file mode 100644
index 83110c7f93b..00000000000
--- a/net/rdist6/files/os-netbsd.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $NetBSD: os-netbsd.h,v 1.1 1999/08/29 12:26:21 kim Exp $
- */
-
-/*
- * Define the following name for use in #ifdef's.
- * The value should be all upper-case with no periods (.).
- */
-#if !defined(NETBSD)
-#define NETBSD
-#endif
-
-/*
- * NOTE: NetBSD uses 64-bit file size semantics, and so you
- * must be careful when using varargs-type functions
- * like the *printf family when printing elements which
- * might be 64-bits (such as stat->st_size from stat.h).
- */
-
-/*
- * Set process args to messages that show up when running ps(1)
- *
- * Under some OS's, the SETARGS code will cause ": is not an identifier"
- * errors for "special" commands.
- */
-#define SETARGS
-
-/*
- * Define the type of directory routines your system has.
- */
-#define DIR_TYPE DIR_DIRENT
-
-/*
- * Determine what routines we have to get filesystem info.
- */
-#define FSI_TYPE FSI_GETFSSTAT
-
-/*
- * Type of non-blocking I/O.
- */
-#define NBIO_TYPE NBIO_FCNTL
-
-/*
- * Type of wait() function to use.
- */
-#define WAIT_TYPE WAIT_WAIT3
-
-/*
- * Type of argument passed to wait() (above).
- */
-#define WAIT_ARG_TYPE int
-
-/*
- * Select the type of executable file format.
- */
-#define EXE_TYPE EXE_AOUT
-
-/*
- * Select the type of statfs() system call (if any).
- */
-#define STATFS_TYPE STATFS_BSD
-
-/*
- * Type of arg functions we have.
- */
-#define ARG_TYPE ARG_STDARG
-
-/*
- * UID argument type for chown()
- */
-typedef uid_t CHOWN_UID_T;
-
-/*
- * GID argument type for chown()
- */
-typedef gid_t CHOWN_GID_T;
-
-/*
- * Our types, usually these are uid_t and gid_t.
- */
-typedef uid_t UID_T; /* Must be signed */
-typedef gid_t GID_T; /* Must be signed */
-
-/*
- * Generic pointer, used by memcpy, malloc, etc. Usually char or void.
- */
-typedef void POINTER;
-
-/*
- * Type of set file time function available
- */
-#define SETFTIME_TYPE SETFTIME_UTIMES
-
-/*
- * Type of set line buffering function available
- */
-#define SETBUF_TYPE SETLINEBUF
-
-/*
- * Things we have
- */
-#define HAVE_FCHOWN /* Have fchown() */
-#define HAVE_FCHMOD /* Have fchmod() */
-#define HAVE_SELECT /* Have select() */
-#define HAVE_SAVED_IDS /* Have POSIX style saved [ug]id's */
-#define POSIX_SIGNALS /* Have POSIX signals */
-
-/*
- * Things we need
- */
-#define NEED_UNISTD_H /* Need <unistd.h> */
-
-/*
- * Path to the remote shell command.
- * Define this only if the pathname is different than
- * that which appears in "include/paths.h".
- */
-#define _PATH_REMSH "/usr/bin/rsh"
-
-/*
- * Path to the sendmail command.
- */
-#ifndef _PATH_SENDMAIL
-#define _PATH_SENDMAIL "/usr/sbin/sendmail"
-#endif
diff --git a/net/rdist6/files/patch-sum b/net/rdist6/files/patch-sum
index 6f1a972a438..a69dd54f034 100644
--- a/net/rdist6/files/patch-sum
+++ b/net/rdist6/files/patch-sum
@@ -1,10 +1,5 @@
-$NetBSD: patch-sum,v 1.2 1999/08/29 12:26:21 kim Exp $
+$NetBSD: patch-sum,v 1.3 2000/01/15 18:09:29 christos Exp $
-MD5 (patch-aa) = c5e9a5acd315f3715323700e27d7b208
-MD5 (patch-ab) = e21fb981d9e9bb3f1eeebf59b279eb9a
-MD5 (patch-ac) = dee3dab4fa644050c6bdeb863ce60cd5
-MD5 (patch-ad) = d70b67f7871d6a276a96be80b8cc9242
-MD5 (patch-ae) = 6adfdfc96017cbd039f7c6e74959529e
-MD5 (patch-af) = 6ad7be9db90f998dad85832d60a28acf
-MD5 (patch-ag) = 69628c934eec9549ada7c6c0665cc13b
-MD5 (patch-ah) = 4995c7a3306861dee58c55dcc2713251
+MD5 (patch-aa) = b496480558b2e495fa22dc06de30912f
+MD5 (patch-ab) = 91ade9d0a83dd05bf23cc1ffdef88fa5
+MD5 (patch-ac) = 6c40f143b1c19452e96f9a83802341d5
diff --git a/net/rdist6/patches/patch-aa b/net/rdist6/patches/patch-aa
index 83f0176845a..ba0a2c88198 100644
--- a/net/rdist6/patches/patch-aa
+++ b/net/rdist6/patches/patch-aa
@@ -1,12 +1,33 @@
-$NetBSD: patch-aa,v 1.3 1999/08/29 12:26:21 kim Exp $
+$NetBSD: patch-aa,v 1.4 2000/01/15 18:09:29 christos Exp $
---- build/os-type.orig Mon Mar 23 19:01:57 1998
-+++ build/os-type Sun Aug 29 07:52:10 1999
-@@ -106,6 +106,7 @@
- ;;
- "linux"*) OS=linux;;
- "freebsd"*) OS="${osname}${osmajver}";;
-+ "netbsd"*) OS="netbsd";;
- # OpenBSD looks like freebsd2 right now
- "openbsd"*) OS="freebsd2";;
- "dgux"*) OS=dgux;;
+--- mf/Makefile.var.orig Sat Jan 15 12:56:36 2000
++++ mf/Makefile.var Sat Jan 15 12:58:20 2000
+@@ -50,7 +50,7 @@
+ # RDIST_MODE - File mode of rdist (client) program
+ # RDISTD_MODE - File mode of rdistd (server) program
+ #
+-BIN_DIR = /usr/local/bin
++BIN_DIR = $(PREFIX)/bin
+ BIN_OWNER = root
+ BIN_GROUP = bin
+ RDIST_MODE = 555
+@@ -64,8 +64,8 @@
+ # MAN_GROUP - Name of group who owns man pages
+ # MAN_MODE - File mode for man pages
+ #
+-MAN_1_DIR = /usr/local/man/man1
+-MAN_8_DIR = /usr/local/man/man8
++MAN_1_DIR = $(PREFIX)/man/man1
++MAN_8_DIR = $(PREFIX)/man/man8
+ MAN_1_SECT = 1
+ MAN_8_SECT = 8
+ MAN_OWNER = root
+@@ -77,7 +77,7 @@
+ # CLIENT - Name of client program (rdist) in ${BIN}
+ # SERVER - Name of server program (rdistd) in ${BIN}
+ #
+-CLIENT = rdist
++CLIENT = rdist6
+ SERVER = rdistd
+
+ #
diff --git a/net/rdist6/patches/patch-ab b/net/rdist6/patches/patch-ab
index c60d37f182e..928a81091fa 100644
--- a/net/rdist6/patches/patch-ab
+++ b/net/rdist6/patches/patch-ab
@@ -1,16 +1,13 @@
-$NetBSD: patch-ab,v 1.1 1999/08/29 12:26:21 kim Exp $
+$NetBSD: patch-ab,v 1.2 2000/01/15 18:09:30 christos Exp $
---- include/defs.h.orig Mon Mar 23 18:28:14 1998
-+++ include/defs.h Sun Aug 29 07:50:07 1999
-@@ -403,7 +403,11 @@
- extern void error(char *, ...);
- extern void fatalerr(char *, ...);
- extern void message(int, char *, ...);
-+#if defined(NETBSD)
-+extern void setproctitle(const char *fmt, ...);
-+#else
- extern void setproctitle(char *fmt, ...);
-+#endif /* NetBSD */
- #else
- extern void debugmsg();
- extern void error();
+--- Makefile.local.orig Sat Jan 15 13:00:41 2000
++++ Makefile.local Sat Jan 15 13:00:55 2000
+@@ -8,7 +8,7 @@
+ # BIN_DIR variable, you would uncomment the following line
+ # or add your own line.
+ #
+-BIN_DIR = /usr/local/bin
++BIN_DIR = ${PREFIX}/bin
+
+ #
+ # Add any local definetions you want pass to the compiler to DEFS_LOCAL
diff --git a/net/rdist6/patches/patch-ac b/net/rdist6/patches/patch-ac
index 35901c4bc0c..76ded94d114 100644
--- a/net/rdist6/patches/patch-ac
+++ b/net/rdist6/patches/patch-ac
@@ -1,13 +1,11 @@
-$NetBSD: patch-ac,v 1.1 1999/08/29 12:26:22 kim Exp $
+$NetBSD: patch-ac,v 1.2 2000/01/15 18:09:30 christos Exp $
---- include/filesys.h.orig Mon Dec 11 19:46:47 1995
-+++ include/filesys.h Sun Aug 29 07:50:07 1999
-@@ -111,7 +111,7 @@
- typedef struct statvfs statfs_t;
- # define statfs(mp,sb) statvfs(mp,sb)
- #else
--#if defined(BSD386) || defined(__bsdi__) || defined(FREEBSD) || STATFS_TYPE == STATFS_OSF1
-+#if defined(BSD386) || defined(__bsdi__) || defined(FREEBSD) || defined(NETBSD) || STATFS_TYPE == STATFS_OSF1
- typedef struct statfs statfs_t;
- #else
- # include <sys/vfs.h>
+--- config/mf.netbsd.orig Sat Jan 15 13:05:52 2000
++++ config/mf.netbsd Sat Jan 15 13:05:59 2000
+@@ -53,6 +53,3 @@
+ # System dependent options for compiling
+ #
+ #CFLAGS_OS =
+-
+-MAN_1_DIR = /usr/local/man/man1
+-MAN_8_DIR = /usr/local/man/man8
diff --git a/net/rdist6/patches/patch-ad b/net/rdist6/patches/patch-ad
deleted file mode 100644
index 0ffe85b4b20..00000000000
--- a/net/rdist6/patches/patch-ad
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/08/29 12:26:22 kim Exp $
-
---- src/filesys-os.c.orig Thu Feb 15 14:01:04 1996
-+++ src/filesys-os.c Sun Aug 29 07:50:07 1999
-@@ -51,7 +51,9 @@
-
- #if FSI_TYPE == FSI_GETFSSTAT
- static struct statfs *mnt = NULL;
-+#if !defined(NETBSD)
- typedef u_long ulong;
-+#endif /* !NetBSD */
- #endif /* FSI_GETFSSTAT */
-
- #if FSI_TYPE == FSI_MNTCTL
-@@ -179,6 +181,16 @@
- if (mnt->f_flags & M_RDONLY)
- mntstruct.me_flags |= MEFLAG_READONLY;
- #endif
-+#if defined(NETBSD)
-+ if (strcmp(mnt->f_fstypename, MOUNT_NFS)) {
-+ (void) sprintf(remote_dev, "%s", mnt->f_mntfromname);
-+ mntstruct.me_path = remote_dev;
-+ mntstruct.me_type = METYPE_NFS;
-+ } else {
-+ mntstruct.me_path = mnt->f_mntonname;
-+ mntstruct.me_type = METYPE_OTHER;
-+ }
-+#else
- switch ((ulong)((struct statfs*)mnt)->f_type) {
- case MOUNT_NFS:
- (void) sprintf(remote_dev, "%s", mnt->f_mntfromname);
-@@ -190,6 +202,7 @@
- mntstruct.me_type = METYPE_OTHER;
- break;
- }
-+#endif /* !NetBSD */
-
- mnt++;
- entries_left--;
diff --git a/net/rdist6/patches/patch-ae b/net/rdist6/patches/patch-ae
deleted file mode 100644
index c7cd1eb7c4f..00000000000
--- a/net/rdist6/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/08/29 12:26:22 kim Exp $
-
---- src/setargs.c.orig Wed Feb 9 20:04:58 1994
-+++ src/setargs.c Sun Aug 29 07:50:07 1999
-@@ -130,7 +130,11 @@
- /*
- * Stdarg front-end to _setproctitle()
- */
-+#if defined(NETBSD)
-+extern void setproctitle(const char *fmt, ...)
-+#else
- extern void setproctitle(char *fmt, ...)
-+#endif
- {
- static char buf[BUFSIZ];
- va_list args;
diff --git a/net/rdist6/patches/patch-af b/net/rdist6/patches/patch-af
deleted file mode 100644
index 4c2ee731fa4..00000000000
--- a/net/rdist6/patches/patch-af
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/08/29 12:26:23 kim Exp $
-
---- src/message.c.orig Fri Jul 19 13:01:56 1996
-+++ src/message.c Sun Aug 29 07:50:08 1999
-@@ -467,10 +467,21 @@
- (void) sprintf(tempfile, "%s/%s", cp, _RDIST_TMP);
-
- msgfac->mf_filename = tempfile;
-+#if defined(NETBSD)
-+ {
-+ int fd;
-+
-+ if ((fd = mkstemp(msgfac->mf_filename)) < 0 ||
-+ (msgfac->mf_fptr = fdopen(fd, "w")) == NULL)
-+ fatalerr("Cannot open notify file for writing: %s: %s.",
-+ msgfac->mf_filename, SYSERR);
-+ }
-+#else
- (void) mktemp(msgfac->mf_filename);
- if ((msgfac->mf_fptr = fopen(msgfac->mf_filename, "w"))==NULL)
- fatalerr("Cannot open notify file for writing: %s: %s.",
- msgfac->mf_filename, SYSERR);
-+#endif
- debugmsg(DM_MISC, "Created notify temp file '%s'",
- msgfac->mf_filename);
- }
diff --git a/net/rdist6/patches/patch-ag b/net/rdist6/patches/patch-ag
deleted file mode 100644
index bad68b110fb..00000000000
--- a/net/rdist6/patches/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/08/29 12:26:23 kim Exp $
-
---- mf/Makefile.var.orig Mon Mar 23 20:11:06 1998
-+++ mf/Makefile.var Sun Aug 29 08:00:16 1999
-@@ -172,6 +172,7 @@
- config/mf.mipsos4 \
- config/mf.mipsos5 \
- config/mf.ncr \
-+ config/mf.netbsd \
- config/mf.nextstep2 \
- config/mf.nextstep3 \
- config/mf.osf1 \
-@@ -214,6 +215,7 @@
- config/os-mipsos4.h \
- config/os-mipsos5.h \
- config/os-ncr.h \
-+ config/os-netbsd.h \
- config/os-nextstep2.h \
- config/os-nextstep3.h \
- config/os-osf1.h \
diff --git a/net/rdist6/patches/patch-ah b/net/rdist6/patches/patch-ah
deleted file mode 100644
index c60bdcc985e..00000000000
--- a/net/rdist6/patches/patch-ah
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/08/29 12:26:23 kim Exp $
-
---- Makefile.local.orig Mon Feb 5 13:50:27 1996
-+++ Makefile.local Sun Aug 29 07:50:08 1999
-@@ -8,7 +8,9 @@
- # BIN_DIR variable, you would uncomment the following line
- # or add your own line.
- #
--#BIN_DIR = /usr/bin
-+BIN_DIR= ${PREFIX}/bin
-+
-+CLIENT= ${RDIST6_NAME}
-
- #
- # Add any local definitions you want pass to the compiler to DEFS_LOCAL
-@@ -28,6 +30,7 @@
- #
- #OPT = -O
- #OPT =
-+OPT= -O
-
- #
- # You may want to use your own C Compiler (such as GCC) by enabling
-@@ -45,8 +48,8 @@
- #
- # Site specific Man Page configuration.
- #
--#MAN_1_DIR = /usr/local/man/man1
--#MAN_8_DIR = /usr/local/man/man8
-+MAN_1_DIR = ${PREFIX}/man/man1
-+MAN_8_DIR = ${PREFIX}/man/man8
- #MAN_OWNER = bin
- #MAN_GROUP = bin
- #MAN_MODE = 644