From 026d21c923f1518779ae69d060d24a322a4a8133 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 23 Mar 2006 13:41:41 +0000 Subject: Add DragonFly support. --- net/rdist6/Makefile | 6 +- net/rdist6/distinfo | 5 +- net/rdist6/files/os-dragonfly.h | 157 ++++++++++++++++++++++++++++++++++++++++ net/rdist6/patches/patch-ag | 12 +++ net/rdist6/patches/patch-al | 4 +- 5 files changed, 179 insertions(+), 5 deletions(-) create mode 100644 net/rdist6/files/os-dragonfly.h create mode 100644 net/rdist6/patches/patch-ag (limited to 'net') diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile index 147bee8ca8b..1f253cc64ac 100644 --- a/net/rdist6/Makefile +++ b/net/rdist6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:49 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2006/03/23 13:41:41 joerg Exp $ # DISTNAME= freerdist-0.92 @@ -17,6 +17,10 @@ MAKE_ENV+= RDIST6_NAME=${RDIST6_NAME:Q} CONFLICTS= rdist6-[0-9]* +post-extract: + ${CP} ${FILESDIR}/os-dragonfly.h ${WRKSRC}/config + ${ECHO} LIB_SYS=-lcompat > ${WRKSRC}/config/mf.dragonfly + post-install: @strip ${PREFIX}/bin/${RDIST6_NAME} @strip ${PREFIX}/bin/rdistd diff --git a/net/rdist6/distinfo b/net/rdist6/distinfo index eedcab2ca9f..2ff02d0390b 100644 --- a/net/rdist6/distinfo +++ b/net/rdist6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2005/09/03 21:21:57 abs Exp $ +$NetBSD: distinfo,v 1.8 2006/03/23 13:41:41 joerg Exp $ SHA1 (freerdist-0.92.tar.gz) = 84db4efd8d223a7e10d62e386349aa9236f71ae3 RMD160 (freerdist-0.92.tar.gz) = 2106cbf21fbe6fda2738d2e9e2d750625eb8c2da @@ -9,7 +9,8 @@ SHA1 (patch-ac) = 78df932333c8742139368abb5d12b910d34e222c SHA1 (patch-ad) = 89500d25dc2fb34c0295836f7ab18433218c85ea SHA1 (patch-ae) = 2bcbce70c6228b34c13082e6a2b82f67f02389f8 SHA1 (patch-af) = c91cfab8609a6b8fe0df051ac8a2d29154ff5aad +SHA1 (patch-ag) = 89112bbb65a879949a2d3cb33ec412a8a4a75685 SHA1 (patch-ai) = 3f96e7440fe4ac5d6180a4137806fe70e2033565 SHA1 (patch-aj) = db6307ff40a8db7428fc23f7cfd40a3152c465dc SHA1 (patch-ak) = a65735786a4cbe19874e83cdc8ac2d6aadb8c14e -SHA1 (patch-al) = e8a20d24e0682634263fb80a01b85c688eaea998 +SHA1 (patch-al) = f40942171206e5191051bf3e699d4c1977a4deb1 diff --git a/net/rdist6/files/os-dragonfly.h b/net/rdist6/files/os-dragonfly.h new file mode 100644 index 00000000000..357a241787e --- /dev/null +++ b/net/rdist6/files/os-dragonfly.h @@ -0,0 +1,157 @@ +/* + * Copyright (c) 1993 Michael A. Cooper + * Copyright (c) 1993 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * $Id: os-dragonfly.h,v 1.1 2006/03/23 13:41:41 joerg Exp $ + * @(#)os-netbsd.h + */ + +/* + * DragonFly os-*.h file + */ + +#define NEED_RE_COMP_H + +/* + * Set process args to messages that show up when running ps(1) + * + * NetBSD has setproctitle() in libc so we don't want to use rdist's. + */ +#define HAVE_SETPROCTITLE + +/* + * 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_ELF + +/* + * Select the type of statfs() system call (if any). + */ +#define STATFS_TYPE STATFS_44BSD + +/* + * Use f_fstypename in struct statfs. + */ +#define HAVE_FSTYPENAME 1 + +/* + * Type of arg functions we have. + */ +#define ARG_TYPE ARG_STDARG + +/* + * Do we have select()? + */ +#define HAVE_SELECT + +/* + * Name of include file + */ +#define PATHS_H + +/* + * 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 + +/* + * We have fchown() + */ +#define HAVE_FCHOWN + +/* + * We have fchmod() + */ +#define HAVE_FCHMOD + +/* + * We have vis() + */ +#define HAVE_VIS + +/* + * We have vsnprintf() + */ +#define HAVE_VSNPRINTF + +/* + * Path to remote shell command + */ +#define _PATH_REMSH "/usr/bin/rsh" diff --git a/net/rdist6/patches/patch-ag b/net/rdist6/patches/patch-ag new file mode 100644 index 00000000000..bb7d7b13ae2 --- /dev/null +++ b/net/rdist6/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.3 2006/03/23 13:41:41 joerg Exp $ + +--- config/os-type.orig 2006-03-23 13:11:00.000000000 +0000 ++++ config/os-type +@@ -102,6 +102,7 @@ if [ -z "${OS}" -a ! -z "${uname}" ]; th + "linux"*) OS=linux;; + "netbsd"*) OS="${osname}";; + "freebsd"*) OS="${osname}${osmajver}";; ++ "dragonfly"*) OS="${osname}";; + "openbsd"*) OS="${osname}";; + "dgux"*) OS=dgux;; + "unicos"*) OS=unicos;; diff --git a/net/rdist6/patches/patch-al b/net/rdist6/patches/patch-al index 4865354e065..8c0df01f7a8 100644 --- a/net/rdist6/patches/patch-al +++ b/net/rdist6/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.1 2004/05/31 02:18:44 kim Exp $ +$NetBSD: patch-al,v 1.2 2006/03/23 13:41:41 joerg Exp $ --- src/filesys-os.c.orig 1999-08-04 11:57:33.000000000 -0400 +++ src/filesys-os.c 2004-05-30 22:10:03.000000000 -0400 @@ -38,7 +38,7 @@ $NetBSD: patch-al,v 1.1 2004/05/31 02:18:44 kim Exp $ } - mnt = (struct statfs*)(sizeof(struct statfs)+(ulong)mnt); -+ mnt = (statfs_t *)(sizeof(statfs_t)+(ulong)mnt); ++ mnt = (statfs_t *)(sizeof(statfs_t)+(unsigned long)mnt); entries_left--; return(&mntstruct); -- cgit v1.2.3