6 files changed, 69 insertions, 19 deletions

diff --git a/devel/libowfat/Makefile b/devel/libowfat/Makefile
index 16845171a764..aab01537b785 100644
--- a/devel/libowfat/Makefile
+++ b/devel/libowfat/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libowfat
-PORTVERSION=	0.24
+PORTVERSION=	0.25
 CATEGORIES=	devel ipv6
 MASTER_SITES=	http://dl.fefe.de/
 
@@ -17,23 +17,24 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 
 MAKEFILE=	GNUmakefile
-MAKE_ENV=	INSTALL="${INSTALL}" CC="${CC}"
 
 OPTIONS=	LIBOWFAT_OPTIMIZED_CFLAGS "Use optimized CFLAGS" on
 
 .include <bsd.port.pre.mk>
 
+MAKE_ENV+=	INSTALL="${INSTALL}" CC="${CC}"
+
 .if !defined(WITHOUT_LIBOWFAT_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O2 -fomit-frame-pointer
 .endif
 
 .include "${FILESDIR}/manpages"
 
-include=	array.h buffer.h byte.h case.h dns.h errmsg.h fmt.h \
-		havealloca.h io.h iob.h iopause.h ip4.h ip6.h mmap.h \
-		ndelay.h open.h openreadclose.h readclose.h safemult.h \
-		scan.h socket.h str.h stralloc.h tai.h taia.h textcode.h \
-		uint16.h uint32.h uint64.h
+include=	array.h buffer.h byte.h case.h cdb.h cdb_make.h dns.h errmsg.h \
+		fmt.h havealloca.h io.h iob.h iopause.h ip4.h ip6.h mmap.h \
+		ndelay.h open.h openreadclose.h rangecheck.h readclose.h \
+		safemult.h scan.h socket.h str.h stralloc.h tai.h taia.h \
+		textcode.h uint16.h uint32.h uint64.h
 PLIST_DIRS=	include/libowfat
 PLIST_FILES=	${include:S,^,include/libowfat/,} lib/libowfat.a
 PORTDOCS=	CHANGES README TODO
diff --git a/devel/libowfat/distinfo b/devel/libowfat/distinfo
index e0699d4ddd0e..c2268383ae09 100644
--- a/devel/libowfat/distinfo
+++ b/devel/libowfat/distinfo
@@ -1,3 +1,3 @@
-MD5 (libowfat-0.24.tar.bz2) = a38b74998a45fd6c47e93e0fec1f6560
-SHA256 (libowfat-0.24.tar.bz2) = 64c6b42af4c9df60f2c672ef89f056cfb8f0c6f437359dfca6618b5d1b9805af
-SIZE (libowfat-0.24.tar.bz2) = 112302
+MD5 (libowfat-0.25.tar.bz2) = 7a5ab9f5b7099b82e428cd308d170005
+SHA256 (libowfat-0.25.tar.bz2) = 70b63b629dfbbd6f25c70fc18746e3e4a3073ea1847062f5000b9055274491f5
+SIZE (libowfat-0.25.tar.bz2) = 125032
diff --git a/devel/libowfat/files/manpages b/devel/libowfat/files/manpages
index 1a922a395fef..65e3e714aa0b 100644
--- a/devel/libowfat/files/manpages
+++ b/devel/libowfat/files/manpages
@@ -69,6 +69,17 @@ case_diffs.3 \
 case_lowerb.3 \
 case_lowers.3 \
 case_starts.3 \
+cdb_datalen.3 \
+cdb_datapos.3 \
+cdb_find.3 \
+cdb_firstkey.3 \
+cdb_free.3 \
+cdb_init.3 \
+cdb_keylen.3 \
+cdb_keypos.3 \
+cdb_nextkey.3 \
+cdb_read.3 \
+cdb_successor.3 \
 dns_ip4.3 \
 dns_ip4_packet.3 \
 dns_ip4_qualify.3 \
@@ -114,6 +125,7 @@ imult16.3 \
 imult32.3 \
 imult64.3 \
 io_appendfile.3 \
+io_block.3 \
 io_canread.3 \
 io_canwrite.3 \
 io_check.3 \
@@ -152,6 +164,7 @@ iob_addfile.3 \
 iob_addfile_close.3 \
 iob_adds.3 \
 iob_adds_free.3 \
+iob_bytesleft.3 \
 iob_free.3 \
 iob_new.3 \
 iob_prefetch.3 \
@@ -171,8 +184,18 @@ open_rw.3 \
 open_trunc.3 \
 open_write.3 \
 openreadclose.3 \
+range_arrayinbuf.3 \
+range_bufinbuf.3 \
+range_ptrinbuf.3 \
+range_str2inbuf.3 \
+range_str4inbuf.3 \
+range_strinbuf.3 \
+range_validbuf.3 \
+rangecheck.3 \
 readclose.3 \
 readclose_append.3 \
+socket_tcp4b.3 \
+socket_tcp6b.3 \
 scan_8int.3 \
 scan_8long.3 \
 scan_8short.3 \
diff --git a/devel/libowfat/files/patch-GNUmakefile b/devel/libowfat/files/patch-GNUmakefile
index c180da19fc31..1f7ced833234 100644
--- a/devel/libowfat/files/patch-GNUmakefile
+++ b/devel/libowfat/files/patch-GNUmakefile
@@ -1,6 +1,6 @@
---- GNUmakefile.orig	Sat May 21 18:16:04 2005
-+++ GNUmakefile	Sat May 21 18:19:41 2005
-@@ -4,22 +4,16 @@
+--- ./GNUmakefile.orig	Sat Jan 13 13:06:31 2007
++++ ./GNUmakefile	Sat Jan 13 13:06:49 2007
+@@ -4,10 +4,10 @@
  # in /opt/diet, where they are in the default search path for my diet libc
  # work but don't conflict with anything there.  YMMV.
  
@@ -13,21 +13,24 @@
 +MAN3DIR=${MANPREFIX}/man/man3
  
  LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \
- buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a textcode.a
+ buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a \
+@@ -15,14 +15,6 @@
  
  all: t $(LIBS) libowfat.a libsocket
  
--CC=gcc
+-CROSS=
+-#CROSS=i686-mingw-
+-CC=$(CROSS)gcc
 -CFLAGS=-pipe -W -Wall -O2 -fomit-frame-pointer
 -#CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
 -
 -# CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2
 -
+ CFLAGS += -D_REENTRANT
+ 
  # startrip
- ifneq ($(DEBUG),)
- CFLAGS=-pipe -Wall -g
-@@ -154,10 +148,10 @@
- errmsg.h
+@@ -162,10 +154,10 @@
+ errmsg.h cdb.h cdb_make.h rangecheck.h
  
  install: libowfat.a
 -	install -d $(INCLUDEDIR) $(MAN3DIR) $(LIBDIR)
diff --git a/devel/libowfat/files/patch-buffer-errmsg_puts.c b/devel/libowfat/files/patch-buffer-errmsg_puts.c
new file mode 100644
index 000000000000..4c429954a112
--- /dev/null
+++ b/devel/libowfat/files/patch-buffer-errmsg_puts.c
@@ -0,0 +1,12 @@
+--- buffer/errmsg_puts.c.orig	Sat Jan 13 15:03:22 2007
++++ buffer/errmsg_puts.c	Sat Jan 13 15:04:23 2007
+@@ -13,7 +13,9 @@
+ }
+ 
+ #else
++#include <sys/types.h>
+ #include <sys/uio.h>
++#include <unistd.h>
+ 
+ enum { COUNT=25 };
+ static struct iovec x[COUNT];
diff --git a/devel/libowfat/files/patch-t.c b/devel/libowfat/files/patch-t.c
new file mode 100644
index 000000000000..1675cb024191
--- /dev/null
+++ b/devel/libowfat/files/patch-t.c
@@ -0,0 +1,11 @@
+--- t.c.orig	Tue Nov  7 18:56:35 2006
++++ t.c	Sat Jan 13 14:37:06 2007
+@@ -41,8 +41,6 @@
+ }
+ 
+ int main(int argc,char* argv[]) {
+-  (void)argc;
+-  (void)argv;
+ #if 0
+   io_batch* b=iob_new(1234);
+   int64 fd=open("t.c",0);