4 files changed, 29 insertions, 27 deletions

diff --git a/devel/uclmmbase/Makefile b/devel/uclmmbase/Makefile
index 3060c90dd97a..785e2e71565c 100644
--- a/devel/uclmmbase/Makefile
+++ b/devel/uclmmbase/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	uclmmbase
-PORTVERSION=	1.2.16
+PORTVERSION=	1.2.18
 CATEGORIES=	devel ipv6
-MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/common/
+MASTER_SITES=	http://aldan.algebra.com/~mi/port-stuff/
 DISTNAME=	common-${PORTVERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
@@ -17,7 +17,11 @@ COMMENT=	Common subroutines for UCL mbone applications
 WRKSRC=		${WRKDIR}/common
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
+.ifndef (NO_INET6)
 CONFIGURE_ARGS=	--enable-ipv6
+.endif
+USE_XZ=		yes
+MAKE_JOBS_SAFE=	yes
 
 post-configure:
 	@for f in ${FILESDIR}/*.bsd ; do \
@@ -28,7 +32,7 @@ post-configure:
 # the networking-error, which may be due IPv6 (or IPv4) being unavailable
 # or some network (mis)configuration:
 post-build test:
-	${WRKSRC}/tests/test-libcommon 2>&1 | ${AWK} '	\
+	cd ${WRKSRC} && tests/test-libcommon 2>&1 | ${AWK} '	\
 		/fail$$/ && $$2 != "networking" { code=1 }	\
 		{ print } END { exit code }'
 
diff --git a/devel/uclmmbase/distinfo b/devel/uclmmbase/distinfo
index 6eac99b4c133..7f0e13691089 100644
--- a/devel/uclmmbase/distinfo
+++ b/devel/uclmmbase/distinfo
@@ -1,3 +1,2 @@
-MD5 (common-1.2.16.tar.gz) = a2c493c7c4f8e31058da19c98ae0e6ea
-SHA256 (common-1.2.16.tar.gz) = d338a20603ec8559c9083dcb20aca6d7ad802a7dc9d94981947b0f2336e7f832
-SIZE (common-1.2.16.tar.gz) = 247163
+SHA256 (common-1.2.18.tar.xz) = 19cd7c6f1d46d54fa7a805f3819e1f516fdd722ef34b6e1f40bad9571374e4f4
+SIZE (common-1.2.18.tar.xz) = 498632
diff --git a/devel/uclmmbase/files/patch-af b/devel/uclmmbase/files/patch-af
index 7b92000efeda..9cf7375278c1 100644
--- a/devel/uclmmbase/files/patch-af
+++ b/devel/uclmmbase/files/patch-af
@@ -1,25 +1,23 @@
---- src/mbus_parser.c	Thu Jan 23 17:39:55 2003
-+++ src/mbus_parser.c	Thu Jan 23 17:41:26 2003
-@@ -158,6 +158,7 @@
- int mbus_parse_int(struct mbus_parser *m, int *i)
+--- src/mbus_parser.c	2006-09-13 13:36:11.000000000 -0400
++++ src/mbus_parser.c	2011-03-13 20:17:35.000000000 -0400
+@@ -159,4 +159,5 @@
  {
  	char	*p;
-+	long	l;
++	long	 l;
  
  	assert(m->magic == MBUS_PARSER_MAGIC);
- 
-@@ -166,11 +167,12 @@
- 		CHECK_OVERRUN;
+@@ -167,10 +168,11 @@
          }
  
--	*i = strtol(m->buffer, &p, 10);
--	if (((*i == LONG_MAX) || (*i == LONG_MIN)) && (errno == ERANGE)) {
+-	*i = (int) strtol(m->buffer, &p, 10);
+-	if (errno == ERANGE) {
+-		debug_msg("integer out of range: %d\n", *i);
 +	l = strtol(m->buffer, &p, 10);
-+	if (((l >= INT_MAX) || (l <= INT_MIN)) && (errno == ERANGE)) {
- 		debug_msg("integer out of range\n");
++	if (l > INT_MAX || l < INT_MIN || errno == ERANGE) {
++		debug_msg("integer out of range: %s\n", m->buffer);
+ 		abort();
  		return FALSE;
  	}
 +	*i = l;
  
  	if (p == m->buffer) {
- 		return FALSE;
diff --git a/devel/uclmmbase/files/patch-net_udp b/devel/uclmmbase/files/patch-net_udp
index cd52dd178e40..8f3e2211b25c 100644
--- a/devel/uclmmbase/files/patch-net_udp
+++ b/devel/uclmmbase/files/patch-net_udp
@@ -1,5 +1,5 @@
---- src/net_udp.c	Tue Jun 29 12:21:37 2004
-+++ src/net_udp.c	Tue Apr 12 13:04:16 2005
+--- src/net_udp.c	2006-09-13 13:36:10.000000000 -0400
++++ src/net_udp.c	2011-03-13 20:21:40.000000000 -0400
 @@ -44,7 +44,4 @@
  #include "debug.h"
  #include "memory.h"
@@ -8,10 +8,11 @@
 -#include "vsnprintf.h"
  #include "net_udp.h"
  
-@@ -126,4 +123,10 @@
+@@ -126,4 +123,11 @@
  /*****************************************************************************/
  
-+#ifdef BSD
++#if defined(BSD) || defined(LINUX)
++#	include <err.h>
 +#	define socket_error	warn
 +#else /* { */
 +#	ifdef __FreeBSD__	/* A simple check */
@@ -19,27 +20,27 @@
 +#	endif
  static void
  socket_error(const char *msg, ...)
-@@ -166,4 +169,5 @@
+@@ -166,4 +170,5 @@
  #endif
  }
 +#endif /* } not a BSD system */
  
  #ifdef WIN32
-@@ -251,5 +255,5 @@
+@@ -251,5 +256,5 @@
  		return TRUE;
  	}
 -	socket_error("Can't resolve IP address for %s", dst);
 +	herror(dst);
  
          return FALSE;
-@@ -273,5 +277,5 @@
+@@ -273,5 +278,5 @@
  		struct hostent *h = gethostbyname(addr);
  		if (h == NULL) {
 -			socket_error("Can't resolve IP address for %s", addr);
 +			herror(addr);
                          free(s);
  			return NULL;
-@@ -422,5 +426,5 @@
+@@ -422,5 +427,5 @@
  	hent = gethostbyname(hname);
  	if (hent == NULL) {
 -		socket_error("Can't resolve IP address for %s", hname);