Attachment #74617 for bug #107912

View | Details | Raw Unified | Return to bug 107912
Collapse All | Expand All




#

PORTNAME=	libowfat
PORTVERSION=	0.25
CATEGORIES=	devel ipv6
MASTER_SITES=	http://dl.fefe.de/


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 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

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (libowfat-0.24.tar.bz2) = a38b74998a45fd6c47e93e0fec1f6560	1	MD5 (libowfat-0.25.tar.bz2) = 7a5ab9f5b7099b82e428cd308d170005
2	SHA256 (libowfat-0.24.tar.bz2) = 64c6b42af4c9df60f2c672ef89f056cfb8f0c6f437359dfca6618b5d1b9805af	2	SHA256 (libowfat-0.25.tar.bz2) = 70b63b629dfbbd6f25c70fc18746e3e4a3073ea1847062f5000b9055274491f5
3	SIZE (libowfat-0.24.tar.bz2) = 112302	3	SIZE (libowfat-0.25.tar.bz2) = 125032




--- 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];

Line 0 Link Here

(-)files/patch-t.c (+11 lines)
	1	--- t.c.orig Tue Nov 7 18:56:35 2006
	2	+++ t.c Sat Jan 13 14:37:06 2007
	3	@@ -41,8 +41,6 @@
	4	}
	5
	6	int main(int argc,char* argv[]) {
	7	- (void)argc;
	8	- (void)argv;
	9	#if 0
	10	io_batch* b=iob_new(1234);
	11	int64 fd=open("t.c",0);

Lines 1-6 Link Here

(-)files/patch-GNUmakefile (-9 / +12 lines)
1	--- GNUmakefile.orig Sat May 21 18:16:04 2005	1	--- ./GNUmakefile.orig Sat Jan 13 13:06:31 2007
2	+++ GNUmakefile Sat May 21 18:19:41 2005	2	+++ ./GNUmakefile Sat Jan 13 13:06:49 2007
3	@@ -4,22 +4,16 @@	3	@@ -4,10 +4,10 @@
4	# in /opt/diet, where they are in the default search path for my diet libc	4	# in /opt/diet, where they are in the default search path for my diet libc
5	# work but don't conflict with anything there. YMMV.	5	# work but don't conflict with anything there. YMMV.
6		6
Lines 13-33 Link Here
13	+MAN3DIR=${MANPREFIX}/man/man3	13	+MAN3DIR=${MANPREFIX}/man/man3
14		14
15	LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \	15	LIBS=byte.a fmt.a scan.a str.a uint.a open.a stralloc.a unix.a socket.a \
16	buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a textcode.a	16	buffer.a mmap.a taia.a tai.a dns.a case.a mult.a array.a io.a \
		17	@@ -15,14 +15,6 @@
17		18
18	all: t $(LIBS) libowfat.a libsocket	19	all: t $(LIBS) libowfat.a libsocket
19		20
20	-CC=gcc	21	-CROSS=
		22	-#CROSS=i686-mingw-
		23	-CC=$(CROSS)gcc
21	-CFLAGS=-pipe -W -Wall -O2 -fomit-frame-pointer	24	-CFLAGS=-pipe -W -Wall -O2 -fomit-frame-pointer
22	-#CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall	25	-#CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
23	-	26	-
24	-# CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2	27	-# CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2
25	-	28	-
		29	CFLAGS += -D_REENTRANT
		30
26	# startrip	31	# startrip
27	ifneq ($(DEBUG),)	32	@@ -162,10 +154,10 @@
28	CFLAGS=-pipe -Wall -g	33	errmsg.h cdb.h cdb_make.h rangecheck.h
29	@@ -154,10 +148,10 @@
30	errmsg.h
31		34
32	install: libowfat.a	35	install: libowfat.a
33	- install -d $(INCLUDEDIR) $(MAN3DIR) $(LIBDIR)	36	- install -d $(INCLUDEDIR) $(MAN3DIR) $(LIBDIR)

Lines 69-74 Link Here

(-)files/manpages (+23 lines)
69	case_lowerb.3 \	69	case_lowerb.3 \
70	case_lowers.3 \	70	case_lowers.3 \
71	case_starts.3 \	71	case_starts.3 \
		72	cdb_datalen.3 \
		73	cdb_datapos.3 \
		74	cdb_find.3 \
		75	cdb_firstkey.3 \
		76	cdb_free.3 \
		77	cdb_init.3 \
		78	cdb_keylen.3 \
		79	cdb_keypos.3 \
		80	cdb_nextkey.3 \
		81	cdb_read.3 \
		82	cdb_successor.3 \
72	dns_ip4.3 \	83	dns_ip4.3 \
73	dns_ip4_packet.3 \	84	dns_ip4_packet.3 \
74	dns_ip4_qualify.3 \	85	dns_ip4_qualify.3 \
Lines 114-119 Link Here
114	imult32.3 \	125	imult32.3 \
115	imult64.3 \	126	imult64.3 \
116	io_appendfile.3 \	127	io_appendfile.3 \
		128	io_block.3 \
117	io_canread.3 \	129	io_canread.3 \
118	io_canwrite.3 \	130	io_canwrite.3 \
119	io_check.3 \	131	io_check.3 \
Lines 152-157 Link Here
152	iob_addfile_close.3 \	164	iob_addfile_close.3 \
153	iob_adds.3 \	165	iob_adds.3 \
154	iob_adds_free.3 \	166	iob_adds_free.3 \
		167	iob_bytesleft.3 \
155	iob_free.3 \	168	iob_free.3 \
156	iob_new.3 \	169	iob_new.3 \
157	iob_prefetch.3 \	170	iob_prefetch.3 \
Lines 171-178 Link Here
171	open_trunc.3 \	184	open_trunc.3 \
172	open_write.3 \	185	open_write.3 \
173	openreadclose.3 \	186	openreadclose.3 \
		187	range_arrayinbuf.3 \
		188	range_bufinbuf.3 \
		189	range_ptrinbuf.3 \
		190	range_str2inbuf.3 \
		191	range_str4inbuf.3 \
		192	range_strinbuf.3 \
		193	range_validbuf.3 \
		194	rangecheck.3 \
174	readclose.3 \	195	readclose.3 \
175	readclose_append.3 \	196	readclose_append.3 \
		197	socket_tcp4b.3 \
		198	socket_tcp6b.3 \
176	scan_8int.3 \	199	scan_8int.3 \
177	scan_8long.3 \	200	scan_8long.3 \
178	scan_8short.3 \	201	scan_8short.3 \

Return to bug 107912

Lines 6-12 Link Here

(-)Makefile (-7 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= libowfat	8	PORTNAME= libowfat
9	PORTVERSION= 0.24	9	PORTVERSION= 0.25
10	CATEGORIES= devel ipv6	10	CATEGORIES= devel ipv6
11	MASTER_SITES= http://dl.fefe.de/	11	MASTER_SITES= http://dl.fefe.de/
12		12
Lines 17-39 Link Here
17	USE_GMAKE= yes	17	USE_GMAKE= yes
18		18
19	MAKEFILE= GNUmakefile	19	MAKEFILE= GNUmakefile
20	MAKE_ENV= INSTALL="${INSTALL}" CC="${CC}"
21		20
22	OPTIONS= LIBOWFAT_OPTIMIZED_CFLAGS "Use optimized CFLAGS" on	21	OPTIONS= LIBOWFAT_OPTIMIZED_CFLAGS "Use optimized CFLAGS" on
23		22
24	.include <bsd.port.pre.mk>	23	.include <bsd.port.pre.mk>
25		24
		25	MAKE_ENV+= INSTALL="${INSTALL}" CC="${CC}"
		26
26	.if !defined(WITHOUT_LIBOWFAT_OPTIMIZED_CFLAGS)	27	.if !defined(WITHOUT_LIBOWFAT_OPTIMIZED_CFLAGS)
27	CFLAGS+= -O2 -fomit-frame-pointer	28	CFLAGS+= -O2 -fomit-frame-pointer
28	.endif	29	.endif
29		30
30	.include "${FILESDIR}/manpages"	31	.include "${FILESDIR}/manpages"
31		32
32	include= array.h buffer.h byte.h case.h dns.h errmsg.h fmt.h \	33	include= array.h buffer.h byte.h case.h cdb.h cdb_make.h dns.h errmsg.h \
33	havealloca.h io.h iob.h iopause.h ip4.h ip6.h mmap.h \	34	fmt.h havealloca.h io.h iob.h iopause.h ip4.h ip6.h mmap.h \
34	ndelay.h open.h openreadclose.h readclose.h safemult.h \	35	ndelay.h open.h openreadclose.h rangecheck.h readclose.h \
35	scan.h socket.h str.h stralloc.h tai.h taia.h textcode.h \	36	safemult.h scan.h socket.h str.h stralloc.h tai.h taia.h \
36	uint16.h uint32.h uint64.h	37	textcode.h uint16.h uint32.h uint64.h
37	PLIST_DIRS= include/libowfat	38	PLIST_DIRS= include/libowfat
38	PLIST_FILES= ${include:S,^,include/libowfat/,} lib/libowfat.a	39	PLIST_FILES= ${include:S,^,include/libowfat/,} lib/libowfat.a
39	PORTDOCS= CHANGES README TODO	40	PORTDOCS= CHANGES README TODO

Line 0 Link Here

(-)files/patch-buffer-errmsg_puts.c (+12 lines)
	1	--- buffer/errmsg_puts.c.orig Sat Jan 13 15:03:22 2007
	2	+++ buffer/errmsg_puts.c Sat Jan 13 15:04:23 2007
	3	@@ -13,7 +13,9 @@
	4	}
	5
	6	#else
	7	+#include <sys/types.h>
	8	#include <sys/uio.h>
	9	+#include <unistd.h>
	10
	11	enum { COUNT=25 };
	12	static struct iovec x[COUNT];