From c74e8d9b62c94e4e9a40456405230c3494ac16a0 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 3 Oct 2005 11:23:42 +0000 Subject: Define BSD and link with -lcompat on DragonFly, too. Use NAME_MAX, when available and fallback to filesystem constants otherwise. --- archivers/xbin/Makefile | 4 ++-- archivers/xbin/distinfo | 3 ++- archivers/xbin/patches/patch-aa | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 archivers/xbin/patches/patch-aa (limited to 'archivers') diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile index 13758051733..2ccb0db3846 100644 --- a/archivers/xbin/Makefile +++ b/archivers/xbin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/06/06 14:03:53 yyamano Exp $ +# $NetBSD: Makefile,v 1.21 2005/10/03 11:23:42 joerg Exp $ # DISTNAME= ${PRGNAME}unix @@ -23,7 +23,7 @@ EXTRACT_ONLY= # empty .include "../../mk/bsd.prefs.mk" -.if !empty(OPSYS:M*BSD) +.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" CFLAGS+= -DBSD LDFLAGS+= -lcompat .endif diff --git a/archivers/xbin/distinfo b/archivers/xbin/distinfo index cb0cb97a633..131f248c45d 100644 --- a/archivers/xbin/distinfo +++ b/archivers/xbin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 14:45:27 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/10/03 11:23:42 joerg Exp $ SHA1 (xbinunix.c) = 20db911814c29c5f236d5dc2a27fe25c7a5f61fb RMD160 (xbinunix.c) = 92a2daccb405c95e7a1b00f4162009f3c4245631 @@ -6,3 +6,4 @@ Size (xbinunix.c) = 18563 bytes SHA1 (xbin.man) = 2e223e6a02a2436f29c586fa711ee5ad3bbf591d RMD160 (xbin.man) = d01696da1c79f1693161417c6a8ced87b5b11c12 Size (xbin.man) = 3277 bytes +SHA1 (patch-aa) = 688b15f04eb783aa007383383d7614460ffb5083 diff --git a/archivers/xbin/patches/patch-aa b/archivers/xbin/patches/patch-aa new file mode 100644 index 00000000000..66a7addd70e --- /dev/null +++ b/archivers/xbin/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD: patch-aa,v 1.1 2005/10/03 11:23:43 joerg Exp $ + +--- xbinunix.c.orig 2005-08-17 18:43:47.000000000 +0000 ++++ xbinunix.c +@@ -2,12 +2,15 @@ + static char version[] = "xbin.c Version 2.3 09/30/85"; + #endif lint + ++#include + #include + #include + #include + #include + +-#ifdef MAXNAMLEN /* 4.2 BSD */ ++#if defined(NAME_MAX) ++#define FNAMELEN NAME_MAX ++#elif defined(MAXNAMLEN) /* 4.2 BSD */ + #define FNAMELEN MAXNAMLEN + #else + #define FNAMELEN DIRSIZ -- cgit v1.2.3