Index: head/devel/uclmmbase/Makefile =================================================================== --- head/devel/uclmmbase/Makefile (revision 133161) +++ head/devel/uclmmbase/Makefile (revision 133162) @@ -1,43 +1,43 @@ # New ports collection makefile for: uclmmbase # Date created: Thanksgiving Day, 1999 # Whom: Garrett Wollman # # $FreeBSD$ # PORTNAME= uclmmbase PORTVERSION= 1.2.16 CATEGORIES= devel ipv6 MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/common/ DISTNAME= common-${PORTVERSION} MAINTAINER= mi@aldan.algebra.com COMMENT= Common subroutines for UCL mbone applications WRKSRC= ${WRKDIR}/common GNU_CONFIGURE= yes USE_OPENSSL= yes post-configure: @for f in ${FILESDIR}/*.bsd ; do \ ${LN} -sf $$f ${WRKSRC}/src/`${BASENAME} $$f .bsd` ; \ done # Run the test, and fail if we hit an error. Don't fail in case of # the networking-error, which may be due IPv6 (or IPv4) being unavailable # or some network (mis)configuration: post-build test: - ${WRKSRC}/tests/test-libcommon | ${AWK} ' \ - /fail/ && $$2 != "networking" { code=1 } \ + ${WRKSRC}/tests/test-libcommon 2>&1 | ${AWK} ' \ + /fail$$/ && $$2 != "networking" { code=1 } \ { print } END { exit code }' do-install: cd ${WRKSRC}/src && ${MAKE_ENV} ${MAKE} install .include .if ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .endif .include Property changes on: head/devel/uclmmbase/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/devel/uclmmbase/files/Makefile.bsd =================================================================== --- head/devel/uclmmbase/files/Makefile.bsd (revision 133161) +++ head/devel/uclmmbase/files/Makefile.bsd (revision 133162) @@ -1,30 +1,30 @@ -CFLAGS+= -I${OPENSSLINC} +CFLAGS+= -I${OPENSSLINC} -DBSD 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 Property changes on: head/devel/uclmmbase/files/Makefile.bsd ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/uclmmbase/files/patch-net_udp =================================================================== --- head/devel/uclmmbase/files/patch-net_udp (revision 133161) +++ head/devel/uclmmbase/files/patch-net_udp (revision 133162) @@ -1,10 +1,48 @@ --- src/net_udp.c Tue Jun 29 12:21:37 2004 -+++ src/net_udp.c Thu Mar 24 13:17:14 2005 ++++ src/net_udp.c Tue Apr 12 13:04:16 2005 @@ -44,7 +44,4 @@ #include "debug.h" #include "memory.h" -#include "inet_pton.h" -#include "inet_ntop.h" -#include "vsnprintf.h" #include "net_udp.h" +@@ -126,4 +123,10 @@ + /*****************************************************************************/ + ++#ifdef BSD ++# define socket_error warn ++#else /* { */ ++# ifdef __FreeBSD__ /* A simple check */ ++# error On FreeBSD BSD should be defined ++# endif + static void + socket_error(const char *msg, ...) +@@ -166,4 +169,5 @@ + #endif + } ++#endif /* } not a BSD system */ + + #ifdef WIN32 +@@ -251,5 +255,5 @@ + return TRUE; + } +- socket_error("Can't resolve IP address for %s", dst); ++ herror(dst); + + return FALSE; +@@ -273,5 +277,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 @@ + hent = gethostbyname(hname); + if (hent == NULL) { +- socket_error("Can't resolve IP address for %s", hname); ++ herror(hname); + return NULL; + } Property changes on: head/devel/uclmmbase/files/patch-net_udp ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/uclmmbase/files/patch-test =================================================================== --- head/devel/uclmmbase/files/patch-test (revision 133161) +++ head/devel/uclmmbase/files/patch-test (revision 133162) @@ -1,9 +1,20 @@ --- 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@ +--- tests/test_net_udp.c Sat Oct 28 06:36:08 2000 ++++ tests/test_net_udp.c Tue Apr 12 12:45:44 2005 +@@ -116,4 +116,8 @@ + udp_exit(s1); + ++ if (hname == NULL) { ++ printf("fail: cannot resolve our name\n"); ++ return; ++ } + /**********************************************************************/ + /* Now we send a packet to ourselves via our real network address... */ Property changes on: head/devel/uclmmbase/files/patch-test ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property