Update common-mml to 1.2.16. This version was packaged by David Price,

and modified by me.

Major changes since 1.2.0:
  - Add support for SAP and SDP.

7 files changed, 51 insertions, 50 deletions

diff --git a/mbone/common-mml/patches/patch-aa b/mbone/common-mml/patches/patch-aa
index 96b13cbc176..a7352b55360 100644
--- a/mbone/common-mml/patches/patch-aa
+++ b/mbone/common-mml/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 09:46:00 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2006/04/11 18:39:41 minskim Exp $
 
---- config_unix.h.orig	Sat Dec 16 07:55:38 2000
-+++ config_unix.h
+--- src/config_unix.h.orig	2002-04-01 14:14:32.000000000 -0800
++++ src/config_unix.h
 @@ -41,8 +41,6 @@
  #ifndef _CONFIG_UNIX_H
  #define _CONFIG_UNIX_H
@@ -10,13 +10,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/17 09:46:00 hubertf Exp $
 -
  #include <limits.h>
  #include <sys/types.h>
- #include <sys/time.h>
-@@ -71,6 +69,8 @@
- #include <sys/ioctl.h>
+ #if TIME_WITH_SYS_TIME
+@@ -81,6 +79,8 @@
  #include <netdb.h>
  #include <arpa/inet.h>
-+
-+#include "uclconf.h"
  
- #ifdef HAVE_SYS_WAIT_H
- #include <sys/wait.h>
++#include "uclconf.h"
++
+ #ifdef __APPLE__
+ #define NEED_DRAND48
+ #define srand48 srand
diff --git a/mbone/common-mml/patches/patch-ab b/mbone/common-mml/patches/patch-ab
index 395cf37c5ed..1c77236aabf 100644
--- a/mbone/common-mml/patches/patch-ab
+++ b/mbone/common-mml/patches/patch-ab
@@ -1,13 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/17 09:46:00 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2006/04/11 18:39:41 minskim Exp $
 
---- Makefile.in.orig	Tue May 16 19:02:48 2000
-+++ Makefile.in
-@@ -6,11 +6,11 @@
- DEFS   = @DEFS@
- CFLAGS = @CFLAGS@ $(DEFS)
- LIBS   = @LIBS@
--CC     = @CC@
-+CC     = ${LIBTOOL} @CC@
+--- src/Makefile.in.orig	2003-05-28 04:38:56.000000000 -0700
++++ src/Makefile.in
+@@ -10,7 +10,7 @@ CC     = @CC@
  AR     = ar
  RANLIB = @RANLIB@
  HOST   = @host@
@@ -16,20 +11,26 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/17 09:46:00 hubertf Exp $
  
  exec_prefix=@exec_prefix@
  
-@@ -30,8 +30,8 @@
- 	$(CC) $(TEST_OBJS) $(CFLAGS) $(TARGET) $(LIBS) -o test-libcommon
- 	
+@@ -24,14 +24,14 @@ SRCS = $(OBJS:%.o=%.c)
+ all: version.h $(TARGET) 
+ 
  $(TARGET): $(OBJS)
 -	$(AR) r $(TARGET) $(OBJS)
 -	$(RANLIB) $(TARGET)
-+	$(CC) $(OBJS:S/.o/.lo/) -o $(TARGET) \
-+		-rpath ${PREFIX}/lib -version-info 1:2:0
++	$(LIBTOOL) --mode=link $(CC) $(OBJS:S/.o/.lo/) -o $(TARGET) \
++		-rpath ${PREFIX}/lib -version-number 1:2:16
+ 
+ version.h: ../VERSION
+ 	sed -e 's/.*/#define CCL_VERSION "v&"/' $? > version.h
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(INC) -c $<
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INC) -c $<
+ 
+ clean:
+ 	-rm -f $(OBJS) version.h $(TARGET) tags 
+@@ -50,4 +50,3 @@ release:
  
- version.h:	VERSION
- 	sed -e 's/.*/#define CCL_VERSION "v&"/' VERSION > version.h
-@@ -57,3 +57,5 @@
  depend: $(SRCS)
  	makedepend $(DEFS) $(INC) $(SRCS)
- 
-+install:
-+	${LIBTOOL} install -c ${TARGET} ${PREFIX}/lib
+-
diff --git a/mbone/common-mml/patches/patch-ac b/mbone/common-mml/patches/patch-ac
index ed9a250352b..dca6e0e39fe 100644
--- a/mbone/common-mml/patches/patch-ac
+++ b/mbone/common-mml/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2000/12/27 23:44:02 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2006/04/11 18:39:41 minskim Exp $
 
---- mbus_parser.c.orig	Tue May 16 19:02:56 2000
-+++ mbus_parser.c
-@@ -167,7 +167,7 @@
+--- src/mbus_parser.c.orig	2006-04-11 11:12:37.000000000 -0700
++++ src/mbus_parser.c
+@@ -167,7 +167,7 @@ int mbus_parse_int(struct mbus_parser *m
          }
  
  	*i = strtol(m->buffer, &p, 10);
diff --git a/mbone/common-mml/patches/patch-ad b/mbone/common-mml/patches/patch-ad
index ee9d1dea35a..349306e47e5 100644
--- a/mbone/common-mml/patches/patch-ad
+++ b/mbone/common-mml/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2002/09/27 01:50:05 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.2 2006/04/11 18:39:41 minskim Exp $
 
---- inet_ntop.c.orig	Thu Dec  2 11:07:31 1999
-+++ inet_ntop.c
+--- src/inet_ntop.c.orig	1999-12-02 08:07:31.000000000 -0800
++++ src/inet_ntop.c
 @@ -16,7 +16,7 @@
   * SOFTWARE.
   */
diff --git a/mbone/common-mml/patches/patch-ae b/mbone/common-mml/patches/patch-ae
index 732ea2723eb..92e3a4562b5 100644
--- a/mbone/common-mml/patches/patch-ae
+++ b/mbone/common-mml/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.1 2002/09/27 01:50:05 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.2 2006/04/11 18:39:41 minskim Exp $
 
---- inet_ntop.h.orig	Tue May 16 13:02:54 2000
-+++ inet_ntop.h
+--- src/inet_ntop.h.orig	2000-01-20 08:11:19.000000000 -0800
++++ src/inet_ntop.h
 @@ -1,4 +1,4 @@
 -#ifndef HAVE_INET_NTOP
-+#ifdef  NEED_INET_NTOP
++#ifdef NEED_INET_NTOP
  #if defined(__cplusplus)
  extern "C" {
  #endif
diff --git a/mbone/common-mml/patches/patch-af b/mbone/common-mml/patches/patch-af
index 46721043f56..f0280d82806 100644
--- a/mbone/common-mml/patches/patch-af
+++ b/mbone/common-mml/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2002/09/27 01:50:06 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2006/04/11 18:39:41 minskim Exp $
 
---- inet_pton.c.orig	Thu Dec  2 11:07:31 1999
-+++ inet_pton.c
+--- src/inet_pton.c.orig	2004-01-08 22:31:35.000000000 -0800
++++ src/inet_pton.c
 @@ -16,7 +16,7 @@
   * SOFTWARE.
   */
diff --git a/mbone/common-mml/patches/patch-ag b/mbone/common-mml/patches/patch-ag
index fc09e4e2cf3..71b803a5192 100644
--- a/mbone/common-mml/patches/patch-ag
+++ b/mbone/common-mml/patches/patch-ag
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.3 2006/01/03 18:25:13 joerg Exp $
+$NetBSD: patch-ag,v 1.4 2006/04/11 18:39:41 minskim Exp $
 
---- inet_pton.h.orig	2000-05-16 17:02:55.000000000 +0000
-+++ inet_pton.h
+--- src/inet_pton.h.orig	2000-10-20 10:21:50.000000000 -0700
++++ src/inet_pton.h
 @@ -1,4 +1,4 @@
 -#ifndef HAVE_INET_PTON
-+#ifdef  NEED_INET_PTON
++#ifdef NEED_INET_PTON
  #if defined(__cplusplus)
  extern "C" {
  #endif
-@@ -8,4 +8,4 @@ int inet_pton(int af, const char *src, v
+@@ -8,5 +8,5 @@ int inet_pton(int af, const char *src, v
  #if defined(__cplusplus)
  }
  #endif
 -#endif /* HAVE_INET_PTON */
-\ No newline at end of file
 +#endif /* NEED_INET_PTON */
+