diff options
| -rw-r--r-- | devel/sfio/Makefile | 13 | ||||
| -rw-r--r-- | devel/sfio/files/md5 | 4 | ||||
| -rw-r--r-- | devel/sfio/files/patch-sum | 6 | ||||
| -rw-r--r-- | devel/sfio/patches/patch-ad | 18 | ||||
| -rw-r--r-- | devel/sfio/patches/patch-ae | 22 |
5 files changed, 31 insertions, 32 deletions
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile index 2e5bad4d777..68a9a9d84db 100644 --- a/devel/sfio/Makefile +++ b/devel/sfio/Makefile @@ -1,8 +1,15 @@ -# $NetBSD: Makefile,v 1.3 1999/12/28 05:10:24 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2000/08/13 17:42:22 itojun Exp $ # -DISTNAME= sfio_1998.src.unix -PKGNAME= sfio-1998 +# pkgsrc/mail/sendmail (as of 8.11.0) specifically wants 1999, not 2000. +# if you upgrade it, please check if sendmail works right. +# +# the original distribution requires us to put name onto web form, however, +# the license term permits redistribution. a copy of the distribution kit +# is put into ${MASTER_SITE_LOCAL}. +# +DISTNAME= sfio_1999.src.unix +PKGNAME= sfio-1999 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_LOCAL} EXTRACT_SUFX= .cpio diff --git a/devel/sfio/files/md5 b/devel/sfio/files/md5 index 63460c5caca..c1f19ee3303 100644 --- a/devel/sfio/files/md5 +++ b/devel/sfio/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1998/11/02 14:43:17 agc Exp $ +$NetBSD: md5,v 1.2 2000/08/13 17:42:24 itojun Exp $ -MD5 (sfio_1998.src.unix.cpio) = 937a5bdafda8603d12b11341eebf6f49 +MD5 (sfio_1999.src.unix.cpio) = 5eca6ccf26d9d4bc2d05b818fcbf8056 diff --git a/devel/sfio/files/patch-sum b/devel/sfio/files/patch-sum index c58763f5219..69cc7b5afba 100644 --- a/devel/sfio/files/patch-sum +++ b/devel/sfio/files/patch-sum @@ -1,10 +1,10 @@ -$NetBSD: patch-sum,v 1.2 2000/08/11 14:03:22 itojun Exp $ +$NetBSD: patch-sum,v 1.3 2000/08/13 17:42:24 itojun Exp $ MD5 (patch-aa) = 4449fb1b5ab8ca99accd5a66238c95a6 MD5 (patch-ab) = 76ec6036d1f179f860e2ae1283ad1f84 MD5 (patch-ac) = ae401655a9302eca8385473fede84b1d -MD5 (patch-ad) = 4f85d0beb9a58690075f62c33f9b8ffa -MD5 (patch-ae) = 387c1010151549c26ce972caca88f2cf +MD5 (patch-ad) = 5c8a8f8bd5b327e30fdd782d07a0ee47 +MD5 (patch-ae) = 1cab2e7b0c236b00e24bca04fe2d32c5 MD5 (patch-af) = 358565f4fa28f875e3ceb4a8609b0216 MD5 (patch-ag) = 4e95f2c7c9757840b9ce72b1df91378b MD5 (patch-ah) = 60e98dd89cab66210befd612d40e5759 diff --git a/devel/sfio/patches/patch-ad b/devel/sfio/patches/patch-ad index 2a08235d40f..6c411b8482f 100644 --- a/devel/sfio/patches/patch-ad +++ b/devel/sfio/patches/patch-ad @@ -1,15 +1,15 @@ -$NetBSD: patch-ad,v 1.1 1998/11/02 21:18:14 agc Exp $ +$NetBSD: patch-ad,v 1.2 2000/08/13 17:42:24 itojun Exp $ Avoid a compiler warning. ---- src/lib/sfio/sfvscanf.c 1998/11/02 17:38:38 1.1 -+++ src/lib/sfio/sfvscanf.c 1998/11/02 17:55:11 -@@ -641,7 +641,7 @@ - { n_assign += 1; - +--- src/lib/sfio/sfvscanf.c.orig Sat May 29 04:19:30 1999 ++++ src/lib/sfio/sfvscanf.c Mon Aug 14 01:56:07 2000 +@@ -642,7 +642,3 @@ if(fmt == 'p') -- *((Void_t**)value) = (Void_t*)argv.lu; +-#if _more_void_int +- *((Void_t**)value) = (Void_t*)((ulong)argv.lu); +-#else +- *((Void_t**)value) = (Void_t*)((uint)argv.lu); +-#endif + (void) memcpy(value, &argv.lu, sizeof(value)); #if !_ast_intmax_long - else if(FMTCMP(size,Sflong_t)) - *((Sflong_t*)value) = argv.ll; diff --git a/devel/sfio/patches/patch-ae b/devel/sfio/patches/patch-ae index 5a1ade60057..67dafc428ec 100644 --- a/devel/sfio/patches/patch-ae +++ b/devel/sfio/patches/patch-ae @@ -1,33 +1,25 @@ -$NetBSD: patch-ae,v 1.2 1998/11/03 09:41:33 agc Exp $ +$NetBSD: patch-ae,v 1.3 2000/08/13 17:42:24 itojun Exp $ Avoid compiler warning. ---- src/lib/sfio/sfwr.c 1998/11/02 17:49:14 1.1 -+++ src/lib/sfio/sfwr.c 1998/11/02 17:52:14 -@@ -14,8 +14,9 @@ - reg char* buf; - reg size_t n; +--- src/lib/sfio/sfwr.c.orig Fri Jul 30 23:58:33 1999 ++++ src/lib/sfio/sfwr.c Mon Aug 14 01:58:54 2000 +@@ -16,4 +16,5 @@ #endif -{ reg char *sp, *wbuf, *endbuf; +{ reg char *wbuf, *endbuf; reg ssize_t s, w, wr; + char *sp; - s = w = 0; - wbuf = buf; -@@ -30,10 +31,14 @@ - sp = buf+1; - if(buf[0] == 0 && buf[_Sfpage-1] == 0) +@@ -32,3 +33,6 @@ { /* check byte at a time until int-aligned */ -- while(((Sfulong_t)sp)%sizeof(int)) +- while(((ulong)sp)%sizeof(int)) + Sfulong_t dumbo; + + (void) memcpy(&dumbo, &sp, sizeof(dumbo)); + while(dumbo % sizeof(int) != 0) { if(*sp != 0) - goto chk_hole; +@@ -36,2 +40,3 @@ sp += 1; + (void) memcpy(&dumbo, &sp, sizeof(dumbo)); } - - /* check using int to speed up */ |