ports/77815: [PATCH] devel/libmba: update to 0.8.10 (fix unfetchable)

Sam Lawrance boris at brooknet.com.au
Mon Feb 21 00:50:18 UTC 2005 

>Number:         77815
>Category:       ports
>Synopsis:       [PATCH] devel/libmba: update to 0.8.10 (fix unfetchable)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 21 00:50:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Sam Lawrance
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD dirk.no.domain 5.3-STABLE FreeBSD 5.3-STABLE #3: Wed Feb  9 00:12:24 EST
>Description:
- Update to 0.8.10
- 5 patchfiles to add 
- Included tests (not built by port) run OK

This update breaks textproc/domc. Fix following.

>How-To-Repeat:
>Fix:

--- libmba-0.8.10.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/devel/libmba/Makefile,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile
--- Makefile	14 Mar 2004 07:58:20 -0000	1.11
+++ Makefile	21 Feb 2005 00:40:47 -0000
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libmba
-PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTVERSION=	0.8.10
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ioplex.com/~miallen/libmba/dl/
 
@@ -26,11 +25,18 @@
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 INSTALLS_SHLIB=	yes
 
-MAN3=		cfg.3m csv.3m domnode.3m mbs.3m msgno.3m hashmap.3m hexdump.3m \
-		linkedlist.3m pool.3m shellout.3m stack.3m varray.3m
+MAN3=		allocator.3m bitset.3m cfg.3m csv.3m diff.3m eval.3m hashmap.3m \
+		hexdump.3m linkedlist.3m msgno.3m path.3m pool.3m shellout.3m \
+		stack.3m suba.3m svcond.3m svsem.3m text.3m time.3m varray.3m
 MANCOMPRESSED=	yes
 
-SHLIB_MAJOR=	0
+SHLIB_MAJOR=	1
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500039
+IGNORE=		requires wchar functions for compilation
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|\$${PREFIX}|g ; \
@@ -42,5 +48,6 @@
 		 s| -lc| \$${LDFLAGS}|g ; \
 		 s|install -m ...|\$${BSD_INSTALL_DATA}|g ; \
 		 s|-/sbin/ldconfig.*$$||g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|stdint\.h|inttypes.h|' ${WRKSRC}/src/mba/time.h
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/devel/libmba/distinfo,v
retrieving revision 1.7
diff -u -u -r1.7 distinfo
--- distinfo	29 Jan 2004 07:23:08 -0000	1.7
+++ distinfo	20 Feb 2005 11:38:40 -0000
@@ -1,2 +1,2 @@
-MD5 (libmba-0.6.1.tar.gz) = 88e51830bf6ba11d2c78f53228d259ea
-SIZE (libmba-0.6.1.tar.gz) = 122048
+MD5 (libmba-0.8.10.tar.gz) = 868dc9cc9f1115868ad0e0cec7bcf65b
+SIZE (libmba-0.8.10.tar.gz) = 259427
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/devel/libmba/pkg-plist,v
retrieving revision 1.4
diff -u -u -r1.4 pkg-plist
--- pkg-plist	9 May 2003 07:04:33 -0000	1.4
+++ pkg-plist	20 Feb 2005 15:10:14 -0000
@@ -1,16 +1,25 @@
+include/mba/allocator.h
+include/mba/bitset.h
 include/mba/cfg.h
 include/mba/csv.h
-include/mba/domnode.h
+include/mba/daemon.h
+include/mba/diff.h
+include/mba/eval.h
 include/mba/hashmap.h
 include/mba/hexdump.h
 include/mba/iterator.h
 include/mba/linkedlist.h
-include/mba/mbs.h
+include/mba/misc.h
 include/mba/msgno.h
+include/mba/path.h
 include/mba/pool.h
-include/mba/profile.h
 include/mba/shellout.h
 include/mba/stack.h
+include/mba/suba.h
+include/mba/svcond.h
+include/mba/svsem.h
+include/mba/text.h
+include/mba/time.h
 include/mba/varray.h
 lib/libmba.a
 lib/libmba.so
Index: files/patch-src::shellout.c
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/devel/libmba/files/patch-src::shellout.c,v
retrieving revision 1.1
diff -u -u -r1.1 patch-src::shellout.c
--- files/patch-src::shellout.c	23 Apr 2003 22:44:31 -0000	1.1
+++ files/patch-src::shellout.c	20 Feb 2005 14:51:09 -0000
@@ -1,6 +1,6 @@
---- src/shellout.c.orig	Mon Mar 10 09:10:10 2003
-+++ src/shellout.c	Tue Apr 15 12:46:00 2003
-@@ -27,7 +27,7 @@
+--- src/shellout.c.orig	Sat May 29 07:52:03 2004
++++ src/shellout.c	Mon Feb 21 01:09:39 2005
+@@ -27,16 +27,21 @@
  #include <string.h>
  #include <termios.h>
  #include <unistd.h>
@@ -8,4 +8,18 @@
 +/* #include <pty.h> */
  #include <errno.h>
  #include <sys/types.h>
++#include <sys/ioctl.h>
  #include <sys/wait.h>
+ #include <sys/time.h>
++#include <sys/select.h>
+ #include <signal.h>
++#include <termios.h>
++#include <libutil.h>
+ #include "mba/msgno.h"
+ #include "mba/text.h"
+ #include "mba/shellout.h"
+ #include "defines.h"
++
+ 
+ #define TERM_PREPARE "\x1b[?1048h\x1b[?1047h\x1b[2J\x1b[H"
+ #define TERM_RESTORE "\x1b[?1047l\x1b[?1048l"
--- libmba-0.8.10.patch ends here ---


--- /dev/null	Mon Feb 21 11:39:17 2005
+++ files/patch-Makefile	Sun Feb 20 23:30:48 2005
@@ -0,0 +1,11 @@
+--- Makefile.orig	Sun Feb 20 23:25:40 2005
++++ Makefile	Sun Feb 20 23:30:30 2005
+@@ -14,7 +14,7 @@
+ 
+ # For wide character support compile with -DUSE_WCHAR -D_XOPEN_SOURCE=500
+ 
+-CFLAGS     = -Wall -W -ansi -DMSGNO -D_XOPEN_SOURCE=500 -Isrc -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS)
++CFLAGS     = -Wall -W -ansi -DMSGNO -D_XOPEN_SOURCE=500 -D__BSD_VISIBLE -Isrc -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS)
+ #CFLAGS     = -Wall -W -g -ansi -pedantic -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes -Wno-parentheses -DMSGNO -D_XOPEN_SOURCE=500 -Isrc -I$(includedir) -L$(libdir) $(RPM_OPT_FLAGS)
+ OBJS       = src/stack.o src/linkedlist.o src/hashmap.o src/hexdump.o src/msgno.o src/cfg.o src/pool.o src/varray.o src/shellout.o src/csv.o src/path.o src/misc.o src/text.o src/eval.o src/svsem.o src/allocator.o src/suba.o src/time.o src/bitset.o src/svcond.o src/daemon.o src/diff.o
+ HDRS       = src/mba/msgno.h src/mba/stack.h src/mba/linkedlist.h src/mba/hashmap.h src/mba/hexdump.h src/mba/cfg.h src/mba/pool.h src/mba/varray.h src/mba/shellout.h src/mba/csv.h src/mba/iterator.h src/mba/text.h src/mba/path.h src/mba/eval.h src/mba/svsem.h src/mba/allocator.h src/mba/suba.h src/mba/time.h src/mba/bitset.h src/mba/svcond.h src/mba/daemon.h src/mba/diff.h src/mba/misc.h
--- /dev/null	Mon Feb 21 11:39:36 2005
+++ files/patch-src::hashmap.c	Mon Feb 21 00:42:32 2005
@@ -0,0 +1,10 @@
+--- src/hashmap.c.orig	Tue May 25 18:10:09 2004
++++ src/hashmap.c	Mon Feb 21 00:31:21 2005
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <wchar.h>
+ #include "mba/msgno.h"
+ #include "mba/iterator.h"
+ #include "mba/allocator.h"
--- /dev/null	Mon Feb 21 11:39:44 2005
+++ files/patch-src::mba::shellout.h	Mon Feb 21 01:54:55 2005
@@ -0,0 +1,10 @@
+--- src/mba/shellout.h.orig	Tue May 18 18:07:17 2004
++++ src/mba/shellout.h	Mon Feb 21 01:54:34 2005
+@@ -9,6 +9,7 @@
+ #endif
+ 
+ #include <termios.h>
++#include <unistd.h>
+ 
+ #define SHO_FLAGS_INTERACT 0x0001
+ #define SHO_FLAGS_ISATTY   0x0100
--- /dev/null	Mon Feb 21 11:39:44 2005
+++ files/patch-src::mba::svsem.h	Mon Feb 21 00:42:58 2005
@@ -0,0 +1,11 @@
+--- src/mba/svsem.h.orig	Wed May 26 16:32:35 2004
++++ src/mba/svsem.h	Mon Feb 21 00:31:21 2005
+@@ -9,6 +9,8 @@
+ #endif
+ 
+ #include <fcntl.h>
++#include <sys/types.h>
++#include <sys/ipc.h>
+ #include <sys/sem.h>
+ #include <mba/pool.h>
+ #include <mba/varray.h>
--- /dev/null	Mon Feb 21 11:40:03 2005
+++ files/patch-src::svsem.c	Mon Feb 21 00:42:33 2005
@@ -0,0 +1,29 @@
+--- src/svsem.c.orig	Wed May 26 16:32:24 2004
++++ src/svsem.c	Mon Feb 21 00:31:21 2005
+@@ -42,7 +42,7 @@
+ #include "mba/msgno.h"
+ #include "defines.h"
+ 
+-#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
++#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) || defined(__FreeBSD__)
+ /* union semun is defined by including <sys/sem.h> */
+ #include <sys/sem.h>
+ #else
+@@ -108,7 +108,7 @@
+ 					sleep(1);
+ 				}
+ 	
+-				errno = ETIME;
++				errno = ETIMEDOUT;
+ 				PMNF(errno, ": %s", name);
+ 				return -1;
+ 			} else if (errno != ENOENT) {
+@@ -296,7 +296,7 @@
+ 		int fd, cre;
+ 
+ 		va_start(ap, oflag);
+-		mode = va_arg(ap, mode_t);
++		mode = va_arg(ap, int);
+ 		val = va_arg(ap, unsigned int);
+ 		va_end(ap);
+ 

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list