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.

12 files changed, 96 insertions, 93 deletions

diff --git a/mbone/common-mml/DESCR b/mbone/common-mml/DESCR
index 5c76d0d1f60..431ad4bdad2 100644
--- a/mbone/common-mml/DESCR
+++ b/mbone/common-mml/DESCR
@@ -1,7 +1,5 @@
 The UCL common multimedia library implements a number of algorithms and
-protocols needed by a number of our applications. It compiles standalone
-on a range of Unix systems (Solaris, Linux, Irix, FreeBSD) and on Windows
-95/98/NT.
+protocols needed by a number of our applications.
 
 The following protocols/algorithms are included in the library:
 
@@ -13,3 +11,5 @@ The following protocols/algorithms are included in the library:
  * DES
  * RTP
  * Mbus
+ * SAP
+ * SDP
diff --git a/mbone/common-mml/Makefile b/mbone/common-mml/Makefile
index 4df1e73ed4f..336e89e00be 100644
--- a/mbone/common-mml/Makefile
+++ b/mbone/common-mml/Makefile
@@ -1,32 +1,27 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:09 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/04/11 18:39:41 minskim Exp $
 #
 
-DISTNAME=	common-1.2.0
-PKGNAME=	common-mml-1.2.0
-PKGREVISION=	1
+DISTNAME=	common-1.2.16
+PKGNAME=	common-mml-1.2.16
 CATEGORIES=	mbone
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/common/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/common/index.html
+MAINTAINER=	psham@cs.nmsu.edu
+HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/common/
 COMMENT=	Common multimedia library required by mbone tools
 
 WRKSRC=		${WRKDIR}/common
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
-#.include "../../mk/bsd.prefs.mk"
+INCDIR=		${PREFIX}/include/common-mml
+DOCDIR=		${PREFIX}/share/doc/common-mml
 
-# this does IPv6 ONLY ;(
-# .if ${USE_INET6} == "YES"
-# CONFIGURE_ARGS+=	--enable-ipv6
-# .endif
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/include/common-mml
-	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/common-mml
-
-do-test:
-	${WRKSRC}/test-libcommon
+do-install:
+	${LIBTOOL} --mode=install \
+		${INSTALL_LIB} ${WRKSRC}/src/*.la ${PREFIX}/lib
+	${INSTALL_DATA_DIR} ${INCDIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/*.h ${INCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/common-mml/PLIST b/mbone/common-mml/PLIST
index 1c33745ec8d..1965b46b485 100644
--- a/mbone/common-mml/PLIST
+++ b/mbone/common-mml/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:43 jlam Exp $
-lib/libuclmmbase.la
+@comment $NetBSD: PLIST,v 1.3 2006/04/11 18:39:41 minskim Exp $
 include/common-mml/acconfig.h
 include/common-mml/addrinfo.h
 include/common-mml/addrsize.h
@@ -26,16 +25,22 @@ include/common-mml/memory.h
 include/common-mml/net_udp.h
 include/common-mml/ntp.h
 include/common-mml/qfDES.h
+include/common-mml/rijndael-alg-fst.h
+include/common-mml/rijndael-api-fst.h
 include/common-mml/rtp.h
+include/common-mml/sap.h
+include/common-mml/sdp.h
 include/common-mml/sockstorage.h
-include/common-mml/test_base64.h
-include/common-mml/test_des.h
-include/common-mml/test_mbus_addr.h
-include/common-mml/test_mbus_parser.h
-include/common-mml/test_md5.h
-include/common-mml/test_memory.h
-include/common-mml/test_net_udp.h
 include/common-mml/uclconf.h
 include/common-mml/util.h
 include/common-mml/version.h
+include/common-mml/vsnprintf.h
+lib/libuclmmbase.la
+share/doc/common-mml/book1.html
+share/doc/common-mml/uclmmbase-hmac.html
+share/doc/common-mml/uclmmbase-md5.html
+share/doc/common-mml/uclmmbase-net-udp.html
+share/doc/common-mml/uclmmbase-rtp.html
+share/doc/common-mml/uclmmbase.html
+@dirrm share/doc/common-mml
 @dirrm include/common-mml
diff --git a/mbone/common-mml/buildlink3.mk b/mbone/common-mml/buildlink3.mk
index c9b5aa202e1..abee1327c9b 100644
--- a/mbone/common-mml/buildlink3.mk
+++ b/mbone/common-mml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/04/06 06:22:22 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/11 18:39:41 minskim Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 COMMON_MML_BUILDLINK3_MK:=	${COMMON_MML_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncommon-mml}
 BUILDLINK_PACKAGES+=	common-mml
 
 .if !empty(COMMON_MML_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.common-mml+=	common-mml>=1.2.0nb1
+BUILDLINK_API_DEPENDS.common-mml+=	common-mml>=1.2.14
 BUILDLINK_PKGSRCDIR.common-mml?=	../../mbone/common-mml
 .endif	# COMMON_MML_BUILDLINK3_MK
 
diff --git a/mbone/common-mml/distinfo b/mbone/common-mml/distinfo
index 72fab01fbf0..5e2f369494e 100644
--- a/mbone/common-mml/distinfo
+++ b/mbone/common-mml/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.6 2006/01/03 18:25:13 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/04/11 18:39:41 minskim Exp $
 
-SHA1 (common-1.2.0.tar.gz) = 411804ba0c2842a0157f01cec0e448dcbb206c29
-RMD160 (common-1.2.0.tar.gz) = 70abbd308a46c33a9e2f5a698054e6ccb70b730f
-Size (common-1.2.0.tar.gz) = 139854 bytes
-SHA1 (patch-aa) = e07907ec236263033ab7f1b9900c2d7dde5441f0
-SHA1 (patch-ab) = adedc5c1bf8bbf9f5fdbbaf6db04eee505e72aa0
-SHA1 (patch-ac) = 58bbd43c7478083d657a4ba4b9b135d2970b5c02
-SHA1 (patch-ad) = 66cbf9cbdb8d5e1434ff310137e91e93785eea06
-SHA1 (patch-ae) = 718a7eacf35e54eef95c2c19d71af6d233f70220
-SHA1 (patch-af) = 7ca308acd4f9c9b297176b91ff21f314cd677cf8
-SHA1 (patch-ag) = 31f3417395d0cfcd6c2cc06ef433365319bfe681
+SHA1 (common-1.2.16.tar.gz) = 361bdabd36d114df97943bed648fc6abff741c56
+RMD160 (common-1.2.16.tar.gz) = e86aad6c4d5f4f3d8c19a89698e2faca7e0e21a2
+Size (common-1.2.16.tar.gz) = 247163 bytes
+SHA1 (patch-aa) = 48324b5afcc6ba08ee48f962a1161896268b2e05
+SHA1 (patch-ab) = b4e0b87fc0a587a40f2880c0df4654082d9a9526
+SHA1 (patch-ac) = 0c650869971af56d96736ec94600fa753952870c
+SHA1 (patch-ad) = 15c09e79a28b6819ca46e0a6ee467a743cce42b7
+SHA1 (patch-ae) = 1ed2970ac8ec97b53406c26ea41b530170ea5630
+SHA1 (patch-af) = 8549a91dddc020a3204ddaa3fd6ada79f8ae5d39
+SHA1 (patch-ag) = c73f458ae18bb2fff18ec8179dfa2803d3a998bc
+SHA1 (patch-ah) = 6cd10f1b04b75e53a123ff3fc1385adaa20a29e5
+SHA1 (patch-ai) = adcd153a3c3ddb164c5219dee8bb6dd79d32ad24
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 */
+