- Update to 2.2.3

PR:		ports/98844
Submitted by:	Yi-Huan Chan <yhchan@csie.nctu.edu.tw>
Approved by:	maintainer timeout

3 files changed, 20 insertions, 32 deletions

diff --git a/net/libexosip2/Makefile b/net/libexosip2/Makefile
index 7177ceb64874..c0cf4d0bbb2d 100644
--- a/net/libexosip2/Makefile
+++ b/net/libexosip2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libeXosip2
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	exosip
@@ -20,6 +20,10 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-tools
 INSTALLS_SHLIB=	yes
 
+OPTIONS=	UCL "Use uclmmbase IP multicast library " off
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_UCL)
 LIB_DEPENDS+=		uclmmbase:${PORTSDIR}/devel/uclmmbase
 CONFIGURE_ARGS+=	--enable-ucl
@@ -30,4 +34,4 @@ CONFIGURE_ARGS+=	--disable-josua
 PLIST_SUB+=		JOSUA="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/libexosip2/distinfo b/net/libexosip2/distinfo
index 9338ab02894c..bb99d3244bb9 100644
--- a/net/libexosip2/distinfo
+++ b/net/libexosip2/distinfo
@@ -1,3 +1,3 @@
-MD5 (libeXosip2-2.2.2.tar.gz) = 3434df493dc780b4bae76467ce29d689
-SHA256 (libeXosip2-2.2.2.tar.gz) = 9642a33ffb50b256a1c2dc92f0dd0ecfb7af246c5b1295b41e75ab51ff89a5dd
-SIZE (libeXosip2-2.2.2.tar.gz) = 492317
+MD5 (libeXosip2-2.2.3.tar.gz) = 837a35f085890eac3328ac402b24383b
+SHA256 (libeXosip2-2.2.3.tar.gz) = a09e97847f3983431c5453bf2f3de1629e629c1b4ea9ddc5e3aa6caaf7417b05
+SIZE (libeXosip2-2.2.3.tar.gz) = 499517
diff --git a/net/libexosip2/files/patch-josua-Makefile.in b/net/libexosip2/files/patch-josua-Makefile.in
index 65c53731c54b..fa40e76f9581 100644
--- a/net/libexosip2/files/patch-josua-Makefile.in
+++ b/net/libexosip2/files/patch-josua-Makefile.in
@@ -1,27 +1,11 @@
-*** josua/Makefile.in	Thu Nov 24 17:26:35 2005
---- josua/Makefile.in	Thu Apr 13 01:21:29 2006
-***************
-*** 281,291 ****
-  @GLIB_SUPPORT_TRUE@josua_LDFLAGS = -O @EXOSIP_LIB@ @PTHREAD_LIBS@ @JOSUA_LIB@  `pkg-config --libs glib-2.0`
-  @MEDIASTREAMER_SUPPORT_TRUE@@ORTP_SUPPORT_FALSE@@UCL_SUPPORT_FALSE@MORE_MYADD = -lortp -lm -lmediastreamer -lmsspeex
-  @ORTP_SUPPORT_TRUE@@UCL_SUPPORT_FALSE@MORE_MYADD = -L$(libdir) -lortp -lm
-! @UCL_SUPPORT_TRUE@MORE_MYADD = /usr/local/lib/libuclmmbase.a
-  @MEDIASTREAMER_SUPPORT_TRUE@@ORTP_SUPPORT_FALSE@@UCL_SUPPORT_FALSE@MORE_INCLUDES = -I$(includedir)/mediastreamer -I$(includedir)/ortp
-  @ORTP_SUPPORT_TRUE@@UCL_SUPPORT_FALSE@MORE_INCLUDES = -I$(includedir)/ortp
-  @UCL_SUPPORT_TRUE@MORE_INCLUDES = -I/ucl
-! josua_LDADD = $(top_builddir)/src/libeXosip2.la libjosua.la $(libdir)/libosip2.la $(libdir)/libosipparser2.la -lrt $(MORE_MYADD)
-  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(includedir) $(MORE_INCLUDES)
-  libjosua_la_LIBADD = $(top_builddir)/src/libeXosip2.la $(libdir)/libosip2.la $(libdir)/libosipparser2.la  $(MORE_MYADD)
-  all: all-am
---- 281,291 ----
-  @GLIB_SUPPORT_TRUE@josua_LDFLAGS = -O @EXOSIP_LIB@ @PTHREAD_LIBS@ @JOSUA_LIB@  `pkg-config --libs glib-2.0`
-  @MEDIASTREAMER_SUPPORT_TRUE@@ORTP_SUPPORT_FALSE@@UCL_SUPPORT_FALSE@MORE_MYADD = -lortp -lm -lmediastreamer -lmsspeex
-  @ORTP_SUPPORT_TRUE@@UCL_SUPPORT_FALSE@MORE_MYADD = -L$(libdir) -lortp -lm
-! @UCL_SUPPORT_TRUE@MORE_MYADD = uclmmbase
-  @MEDIASTREAMER_SUPPORT_TRUE@@ORTP_SUPPORT_FALSE@@UCL_SUPPORT_FALSE@MORE_INCLUDES = -I$(includedir)/mediastreamer -I$(includedir)/ortp
-  @ORTP_SUPPORT_TRUE@@UCL_SUPPORT_FALSE@MORE_INCLUDES = -I$(includedir)/ortp
-  @UCL_SUPPORT_TRUE@MORE_INCLUDES = -I/ucl
-! josua_LDADD = $(top_builddir)/src/libeXosip2.la libjosua.la $(libdir)/libosip2.la $(libdir)/libosipparser2.la -l$(MORE_MYADD)
-  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(includedir) $(MORE_INCLUDES)
-  libjosua_la_LIBADD = $(top_builddir)/src/libeXosip2.la $(libdir)/libosip2.la $(libdir)/libosipparser2.la  $(MORE_MYADD)
-  all: all-am
+--- josua/Makefile.in	Mon Jun 12 14:51:52 2006
++++ josua/Makefile.in	Mon Jun 12 14:53:10 2006
+@@ -267,7 +267,7 @@
+ @MEDIASTREAMER_SUPPORT_TRUE@@ORTP_SUPPORT_FALSE@@UCL_SUPPORT_FALSE@MORE_INCLUDES = -I$(includedir)/mediastreamer -I$(includedir)/ortp
+ @ORTP_SUPPORT_TRUE@@UCL_SUPPORT_FALSE@MORE_INCLUDES = -I$(includedir)/ortp
+ @UCL_SUPPORT_TRUE@MORE_INCLUDES = -I/ucl
+-josua_LDADD = $(top_builddir)/src/libeXosip2.la libjosua.la $(libdir)/libosip2.la $(libdir)/libosipparser2.la -lrt $(MORE_MYADD)
++josua_LDADD = $(top_builddir)/src/libeXosip2.la libjosua.la $(libdir)/libosip2.la $(libdir)/libosipparser2.la $(MORE_MYADD)
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(includedir) $(MORE_INCLUDES)
+ libjosua_la_LIBADD = $(top_builddir)/src/libeXosip2.la $(libdir)/libosip2.la $(libdir)/libosipparser2.la  $(MORE_MYADD)
+ all: all-am