12 files changed, 55 insertions, 92 deletions
diff --git a/devel/uclmmbase/files/Makefile.bsd b/devel/uclmmbase/files/Makefile.bsd
new file mode 100644
index 000000000000..8d5ad11d7272
--- /dev/null
+++ b/devel/uclmmbase/files/Makefile.bsd
@@ -0,0 +1,30 @@
+CFLAGS+= -I${OPENSSLINC}
+LDADD  = -L${OPENSSLLIB} -lssl -lcrypto
+VERSION!=cat ${.CURDIR:H}/VERSION
+LIB    = uclmmbase
+NOPROFILE=	yes
+SHLIB_MAJOR=	${VERSION:R:S/.//g}
+SHLIB_MINOR=	${VERSION:E}
+LIBDIR=	${PREFIX}/lib
+INCLUDEDIR=	${PREFIX}/include/${LIB}
+
+SRCS =	base64.c debug.c memory.c net_udp.c qfDES.c util.c \
+	rijndael-api-fst.c rijndael-alg-fst.c \
+	ntp.c rtp.c mbus_parser.c mbus_config.c mbus_addr.c \
+	mbus.c asarray.c sdp.c sap.c qfDES.c
+
+INCS=	base64.h config_win32.h config_unix.h crypt_random.h \
+	debug.h hmac.h mbus.h mbus_parser.h md5.h memory.h \
+	net_udp.h qfDES.h rtp.h uclconf.h util.h version.h
+
+all: version.h lib${LIB}.a ${SHLIB_NAME}
+
+version.h: ${.CURDIR:H}/VERSION
+	echo '#define CCL_VERSION "v${VERSION}"' > $@
+
+${INCLUDEDIR} ${LIBDIR}:
+	mkdir -p $@
+
+beforeinstall: ${INCLUDEDIR} ${LIBDIR}
+
+.include <bsd.lib.mk>
diff --git a/devel/uclmmbase/files/btree.h.bsd b/devel/uclmmbase/files/btree.h.bsd
new file mode 100644
index 000000000000..e9e067b7743d
--- /dev/null
+++ b/devel/uclmmbase/files/btree.h.bsd
@@ -0,0 +1,2 @@
+#include <sys/types.h>
+#include <db.h>
diff --git a/devel/uclmmbase/files/crypt_random.h.bsd b/devel/uclmmbase/files/crypt_random.h.bsd
new file mode 100644
index 000000000000..07214141ea53
--- /dev/null
+++ b/devel/uclmmbase/files/crypt_random.h.bsd
@@ -0,0 +1,4 @@
+#include <stdlib.h>
+
+#define lbl_random	random
+#define	lbl_srandom	srandom
diff --git a/devel/uclmmbase/files/hmac.h.bsd b/devel/uclmmbase/files/hmac.h.bsd
new file mode 100644
index 000000000000..38a000e15dcd
--- /dev/null
+++ b/devel/uclmmbase/files/hmac.h.bsd
@@ -0,0 +1,4 @@
+#include <openssl/hmac.h>
+
+#define	hmac_md5(data, datalen, key, keylen, digest) \
+	HMAC(EVP_md5(), key, keylen, data, datalen, digest, NULL)
diff --git a/devel/uclmmbase/files/md5.h.bsd b/devel/uclmmbase/files/md5.h.bsd
new file mode 100644
index 000000000000..d08ad42c7faf
--- /dev/null
+++ b/devel/uclmmbase/files/md5.h.bsd
@@ -0,0 +1,5 @@
+#include <openssl/md5.h>
+
+#define	MD5Init	MD5_Init
+#define	MD5Update	MD5_Update
+#define	MD5Final	MD5_Final
diff --git a/devel/uclmmbase/files/patch-aa b/devel/uclmmbase/files/patch-aa
deleted file mode 100644
index 42efe635f6ef..000000000000
--- a/devel/uclmmbase/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- examples/rtp/rtpdemo.c.orig	Thu Sep  5 01:15:41 2002
-+++ examples/rtp/rtpdemo.c	Thu Sep  5 01:15:23 2002
-@@ -101,6 +101,7 @@
- 	case RX_RTCP_FINISH:
- 	case RR_TIMEOUT:
- 	case RX_APP:
-+		break;
- 	}
- 	fflush(stdout);
- }
diff --git a/devel/uclmmbase/files/patch-ab b/devel/uclmmbase/files/patch-ab
deleted file mode 100644
index 49ec0efe232c..000000000000
--- a/devel/uclmmbase/files/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.in.orig	Fri May 11 07:59:42 2001
-+++ configure.in	Thu Jan 23 17:36:33 2003
-@@ -102,8 +102,8 @@
- # declared anywhere, use egrep header to check (ugh lame, but works)
- 
- AC_CACHE_CHECK(for inet_pton in <arpa/inet.h>, ucl_cv_inet_pton_in_inet_h,
--	AC_EGREP_HEADER(uint16_t,
--			stdint.h,
-+	AC_EGREP_HEADER(inet_pton,
-+			arpa/inet.h,
- 			ucl_cv_inet_pton_in_inet_h=yes,
- 			ucl_cv_inet_pton_in_inet_h=no))
- if test $ucl_cv_inet_pton_in_inet_h = "no"
-@@ -112,8 +112,8 @@
- 	LIBOBJS="$LIBOBJS inet_pton.o"
- fi
- AC_CACHE_CHECK(for inet_ntop in <arpa/inet.h>, ucl_cv_inet_ntop_in_inet_h,
--	AC_EGREP_HEADER(uint16_t,
--			stdint.h,
-+	AC_EGREP_HEADER(inet_ntop,
-+			arpa/inet.h,
- 			ucl_cv_inet_ntop_in_inet_h=yes,
- 			ucl_cv_inet_ntop_in_inet_h=no))
- if test $ucl_cv_inet_ntop_in_inet_h = "no"
diff --git a/devel/uclmmbase/files/patch-ac b/devel/uclmmbase/files/patch-ac
deleted file mode 100644
index c202fcfe3753..000000000000
--- a/devel/uclmmbase/files/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.orig	Fri May 11 07:59:42 2001
-+++ configure	Thu Jan 23 17:29:08 2003
-@@ -1928,10 +1928,10 @@
-   cat > conftest.$ac_ext <<EOF
- #line 1930 "configure"
- #include "confdefs.h"
--#include <stdint.h>
-+#include <arpa/inet.h>
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "uint16_t" >/dev/null 2>&1; then
-+  egrep "inet_pton" >/dev/null 2>&1; then
-   rm -rf conftest*
-   ucl_cv_inet_pton_in_inet_h=yes
- else
-@@ -1959,10 +1959,10 @@
-   cat > conftest.$ac_ext <<EOF
- #line 1961 "configure"
- #include "confdefs.h"
--#include <stdint.h>
-+#include <arpa/inet.h>
- EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "uint16_t" >/dev/null 2>&1; then
-+  egrep "inet_ntop" >/dev/null 2>&1; then
-   rm -rf conftest*
-   ucl_cv_inet_ntop_in_inet_h=yes
- else
diff --git a/devel/uclmmbase/files/patch-ad b/devel/uclmmbase/files/patch-ad
deleted file mode 100644
index 795bf55bcf25..000000000000
--- a/devel/uclmmbase/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/inet_ntop.h.orig	Thu Jan 23 17:35:36 2003
-+++ src/inet_ntop.h	Thu Jan 23 17:35:45 2003
-@@ -1,4 +1,4 @@
--#ifndef HAVE_INET_NTOP
-+#ifdef NEED_INET_NTOP
- #if defined(__cplusplus)
- extern "C" {
- #endif
-@@ -8,4 +8,4 @@
- #if defined(__cplusplus)
- }
- #endif
--#endif /* HAVE_INET_NTOP */
-+#endif /* NEED_INET_NTOP */
diff --git a/devel/uclmmbase/files/patch-ae b/devel/uclmmbase/files/patch-ae
deleted file mode 100644
index cf7a3c5b88dd..000000000000
--- a/devel/uclmmbase/files/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/inet_pton.h.orig	Thu Jan 23 17:35:17 2003
-+++ src/inet_pton.h	Thu Jan 23 17:35:29 2003
-@@ -1,4 +1,4 @@
--#ifndef HAVE_INET_PTON
-+#ifdef NEED_INET_PTON
- #if defined(__cplusplus)
- extern "C" {
- #endif
-@@ -8,5 +8,5 @@
- #if defined(__cplusplus)
- }
- #endif
--#endif /* HAVE_INET_PTON */
-+#endif /* NEED_INET_PTON */
- 
diff --git a/devel/uclmmbase/files/patch-af b/devel/uclmmbase/files/patch-af
index d380c5522694..7b92000efeda 100644
--- a/devel/uclmmbase/files/patch-af
+++ b/devel/uclmmbase/files/patch-af
@@ -1,4 +1,4 @@
---- src/mbus_parser.c.orig	Thu Jan 23 17:39:55 2003
+--- 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)
diff --git a/devel/uclmmbase/files/patch-test b/devel/uclmmbase/files/patch-test
new file mode 100644
index 000000000000..b1b3e93392a2
--- /dev/null
+++ b/devel/uclmmbase/files/patch-test
@@ -0,0 +1,9 @@
+--- tests/Makefile.in	Fri Mar  9 11:39:57 2001
++++ tests/Makefile.in	Thu Sep 23 16:40:19 2004
+@@ -10,5 +10,5 @@
+ DEFS   = @DEFS@
+ CFLAGS = -I$(COMMONSRC) @CFLAGS@ $(DEFS) 
+-LIBS   = -L../src @LIBS@ 
++LIBS   = -L../src @LIBS@ -L${OPENSSLLIB}/lib -lssl -lcrypto
+ CC     = @CC@
+