- Update to 3.1.0

PR:             130442
Submitted by:   KATO Tsuguru <tkato432 at yahoo dot com>

11 files changed, 76 insertions, 105 deletions

diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index b8e85590d874..285bc3b81c7e 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	linphone
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	3.0.0
 PORTEPOCH=	1
 CATEGORIES?=	net
 MASTER_SITES=	SAVANNAH/${PORTNAME}/stable/sources
@@ -46,39 +45,38 @@ PLIST_SUB+=	NLS=""
 .endif
 
 .if defined(LINPHONE_GUI)
-BUILD_DEPENDS+=	linphone-base>=2.1.1:${PORTSDIR}/net/linphone-base
-RUN_DEPENDS+=	linphone-base>=2.1.1:${PORTSDIR}/net/linphone-base
+BUILD_DEPENDS+=	linphone-base>=3.0.0:${PORTSDIR}/net/linphone-base
+RUN_DEPENDS+=	linphone-base>=3.0.0:${PORTSDIR}/net/linphone-base
 DESCR=		${PKGDIR}/pkg-descr.gui
 PLIST=		${PKGDIR}/pkg-plist.gui
-USE_GNOME+=	gnomepanel gnomeprefix
+USE_GNOME+=	libglade2
 MAN1=		linphone.1
-SUBDIRS=	pixmaps gtk
+SUBDIRS=	pixmaps gtk-glade
 .else
 PKGNAMESUFFIX=	-base
 CONFIGURE_ARGS+=	--enable-gtk_ui=no
 MAN1=		linphonec.1 sipomatic.1
-SUBDIRS=	po oRTP mediastreamer2 media_api coreapi console
+SUBDIRS=	po oRTP mediastreamer2 coreapi console
 .endif
 
-post-extract:
-	@${CP} -f ${FILESDIR}/GNOME_LinphoneApplet.xml ${WRKSRC}/gtk
-
 post-patch:
+	@${REINPLACE_CMD} -e 's|sounds/linphone|linphone/sounds|g' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s| =| ?=|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/^imgdir =/s|(datadir)|(pkgdatadir)|g' \
 		${WRKSRC}/mediastreamer2/src/Makefile.in
 .for file in configure src/gsm.c
 	@${REINPLACE_CMD} -e 's|gsm/gsm\.h|gsm.h|g' \
 		${WRKSRC}/mediastreamer2/${file}
-.endfor 
+.endfor
 
 post-install:
 .if defined(LINPHONE_GUI)
+	@${LN} -sf linphone-3 ${PREFIX}/bin/linphone
 	${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 ${MANPREFIX}/man/man1
+	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
 		${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/share/linphone_applet.desktop \
-		${PREFIX}/share/applications
 .else
 	${INSTALL_MAN} ${WRKSRC}/share/C/linphonec.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/share/C/sipomatic.1 ${MANPREFIX}/man/man1
diff --git a/net/linphone-base/distinfo b/net/linphone-base/distinfo
index 368b9291b7d1..4f0f64fd7d5f 100644
--- a/net/linphone-base/distinfo
+++ b/net/linphone-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (linphone-2.1.1.tar.gz) = 130fb6048f84ee89f7c1a8a010ff1add
-SHA256 (linphone-2.1.1.tar.gz) = ae69a6fb606046bccb5bfa20726bbc054ebe25abd1865f004e6205542523184e
-SIZE (linphone-2.1.1.tar.gz) = 7662602
+MD5 (linphone-3.0.0.tar.gz) = 8c883bb267da5d2b6c7c2a5c52641a35
+SHA256 (linphone-3.0.0.tar.gz) = 68657f5efe147bd00ec1375daf3fe13ae1c81f906bf9d81ab4fad8f0ef1fabec
+SIZE (linphone-3.0.0.tar.gz) = 7577336
diff --git a/net/linphone-base/files/GNOME_LinphoneApplet.xml b/net/linphone-base/files/GNOME_LinphoneApplet.xml
deleted file mode 100644
index 9a5350fd22ad..000000000000
--- a/net/linphone-base/files/GNOME_LinphoneApplet.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Root>
-  <popups>
-    <popup name="button3">
-      <menuitem name="About"    verb="About" _label="_About..." pixtype="stock" pixname="gnome-stock-about"/>
-    </popup>
-  </popups>
-</Root>
diff --git a/net/linphone-base/files/patch-config.h.in b/net/linphone-base/files/patch-config.h.in
deleted file mode 100644
index 464bc65832ff..000000000000
--- a/net/linphone-base/files/patch-config.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- config.h.in	2003/02/27 23:47:19	1.1
-+++ config.h.in	2003/02/27 23:47:35
-@@ -122,8 +122,5 @@
-    first (like Motorola and SPARC, unlike Intel and VAX). */
- #undef WORDS_BIGENDIAN
- 
--/* Defined if we are compiling for FreeBSD */
--#undef __FreeBSD__
--
- /* Defined if we are compiling for linux */
- #undef __LINUX__
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
deleted file mode 100644
index 45ad7e2e17b5..000000000000
--- a/net/linphone-base/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Nov 30 20:36:38 2007
-+++ configure	Sun Dec  2 14:43:57 2007
-@@ -24138,7 +24138,7 @@
- echo "GTK interface compilation is disabled."
- fi
- 
--if test "gtk_ui" = "true" ; then
-+if test "$gtk_ui" = "true" ; then
- 
- pkg_failed=no
- { echo "$as_me:$LINENO: checking for GNOME_APPLETS" >&5
diff --git a/net/linphone-base/files/patch-gtk-glade__Makefile.in b/net/linphone-base/files/patch-gtk-glade__Makefile.in
new file mode 100644
index 000000000000..0f8f075ce767
--- /dev/null
+++ b/net/linphone-base/files/patch-gtk-glade__Makefile.in
@@ -0,0 +1,41 @@
+--- gtk-glade/Makefile.in.orig	2008-10-10 21:54:08.000000000 +0900
++++ gtk-glade/Makefile.in	2008-10-20 05:14:41.000000000 +0900
+@@ -67,9 +67,6 @@
+ linphone_3_OBJECTS = $(am_linphone_3_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @BUILD_GLADE_UI_TRUE@linphone_3_DEPENDENCIES =  \
+-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/oRTP/src/libortp.la \
+-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
+-@BUILD_GLADE_UI_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
+ @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1) \
+ @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1) \
+ @BUILD_GLADE_UI_TRUE@	$(am__DEPENDENCIES_1)
+@@ -310,9 +307,9 @@
+ @BUILD_GLADE_UI_TRUE@			logging.c \
+ @BUILD_GLADE_UI_TRUE@			linphone.h
+ 
+-@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = $(top_builddir)/oRTP/src/libortp.la \
+-@BUILD_GLADE_UI_TRUE@		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
+-@BUILD_GLADE_UI_TRUE@		$(top_builddir)/coreapi/liblinphone.la \
++@BUILD_GLADE_UI_TRUE@linphone_3_LDADD = `$(PKG_CONFIG) --libs ortp` \
++@BUILD_GLADE_UI_TRUE@		`$(PKG_CONFIG) --libs mediastreamer` \
++@BUILD_GLADE_UI_TRUE@		`$(PKG_CONFIG) --libs linphone` \
+ @BUILD_GLADE_UI_TRUE@			$(LIBGTK_LIBS) $(INTLLIBS) \
+ @BUILD_GLADE_UI_TRUE@			$(LIBGLADE_LIBS)
+ 
+@@ -324,10 +321,12 @@
+ 
+ #gtk-linphone.ui:	gtk-linphone.glade
+ #	gtk-builder-convert gtk-linphone.glade $@
+-AM_CFLAGS = -I$(top_srcdir)/coreapi/ \
+-		-I$(top_srcdir)/mediastreamer2/include/ \
++AM_CFLAGS = \
++		`$(PKG_CONFIG) --cflags ortp` \
++		`$(PKG_CONFIG) --cflags mediastreamer` \
++		`$(PKG_CONFIG) --cflags linphone` \
+ 		$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
+-		$(ORTP_CFLAGS) $(OSIP_CFLAGS) 
++		$(OSIP_CFLAGS) 
+ 
+ all: all-am
+ 
diff --git a/net/linphone-base/files/patch-gtk__Makefile.in b/net/linphone-base/files/patch-gtk__Makefile.in
deleted file mode 100644
index 76da8c0c7e2e..000000000000
--- a/net/linphone-base/files/patch-gtk__Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- gtk/Makefile.in.orig	Wed Nov 21 19:04:35 2007
-+++ gtk/Makefile.in	Wed Nov 21 19:06:10 2007
-@@ -73,8 +73,7 @@
- linphone_OBJECTS = $(am_linphone_OBJECTS)
- am__DEPENDENCIES_1 =
- @BUILD_GTK_TRUE@linphone_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--@BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1) \
--@BUILD_GTK_TRUE@	$(top_builddir)/coreapi/liblinphone.la
-+@BUILD_GTK_TRUE@	$(am__DEPENDENCIES_1)
- am__linphone_applet_SOURCES_DIST = linphone.c linphone.h gui_utils.c \
- 	gui_utils.h support.c support.h interface.c interface.h \
- 	callbacks.c callbacks.h presence.c presence.h propertybox.c \
-@@ -95,7 +94,6 @@
- linphone_applet_OBJECTS = $(am_linphone_applet_OBJECTS)
- @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES =  \
- @BUILD_GNOME_APPLET_TRUE@	$(am__DEPENDENCIES_1) \
--@BUILD_GNOME_APPLET_TRUE@	$(top_builddir)/coreapi/liblinphone.la \
- @BUILD_GNOME_APPLET_TRUE@	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -335,7 +333,7 @@
- @BUILD_GTK_TRUE@	$(linphone_common_sources)
- 
- @BUILD_GTK_TRUE@linphone_LDADD = $(LIBGTK_LIBS) $(INTLLIBS) \
--@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la
-+@BUILD_GTK_TRUE@				-llinphone
- 
- AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
- 		$(ORTP_CFLAGS) $(OSIP_CFLAGS)
-@@ -348,7 +346,7 @@
- @BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) $(GNOME_APPLETS_CFLAGS) -DLINPHONE_APPLET
- @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
- @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
--@BUILD_GNOME_APPLET_TRUE@				$(top_builddir)/coreapi/liblinphone.la \
-+@BUILD_GNOME_APPLET_TRUE@				-llinphone \
- @BUILD_GNOME_APPLET_TRUE@				$(OSIP_LIBS)
- 
- @BUILD_GNOME_APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
diff --git a/net/linphone-base/files/patch-mediastreamer2__src__oss.c b/net/linphone-base/files/patch-mediastreamer2__src__oss.c
deleted file mode 100644
index 93a948751b0a..000000000000
--- a/net/linphone-base/files/patch-mediastreamer2__src__oss.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- mediastreamer2/src/oss.c.orig	Thu Nov  9 19:45:26 2006
-+++ mediastreamer2/src/oss.c	Wed Dec 27 23:57:46 2006
-@@ -30,7 +30,10 @@
- #include <sys/time.h>
- #include <sys/ioctl.h>
- #include <unistd.h>
-+
-+#ifdef HAVE_ALLOCA_H
- #include <alloca.h>
-+#endif
- 
- MSFilter *ms_oss_read_new(MSSndCard *card);
- MSFilter *ms_oss_write_new(MSSndCard *card);
diff --git a/net/linphone-base/pkg-plist b/net/linphone-base/pkg-plist
index 8fd1e7c04ed7..21464a7fcd8e 100644
--- a/net/linphone-base/pkg-plist
+++ b/net/linphone-base/pkg-plist
@@ -20,8 +20,10 @@ include/mediastreamer2/msv4l.h
 include/mediastreamer2/msvideo.h
 include/mediastreamer2/msvideoout.h
 include/mediastreamer2/msvolume.h
+include/mediastreamer2/mswebcam.h
 include/mediastreamer2/rfc3984.h
 include/mediastreamer2/waveheader.h
+include/ortp/b64.h
 include/ortp/event.h
 include/ortp/ortp.h
 include/ortp/payloadtype.h
@@ -47,7 +49,7 @@ lib/libmediastreamer.so.0
 lib/libortp.a
 lib/libortp.la
 lib/libortp.so
-lib/libortp.so.7
+lib/libortp.so.8
 libdata/pkgconfig/linphone.pc
 libdata/pkgconfig/mediastreamer.pc
 libdata/pkgconfig/ortp.pc
diff --git a/net/linphone-base/pkg-plist.gui b/net/linphone-base/pkg-plist.gui
index 6674b192ecdf..19a738771f45 100644
--- a/net/linphone-base/pkg-plist.gui
+++ b/net/linphone-base/pkg-plist.gui
@@ -1,9 +1,20 @@
 bin/linphone
-libdata/bonobo/servers/GNOME_LinphoneApplet.server
-libexec/linphone_applet
+bin/linphone-3
 share/applications/linphone.desktop
-share/applications/linphone_applet.desktop
-share/gnome-2.0/ui/GNOME_LinphoneApplet.xml
+%%DATADIR%%/about.glade
+%%DATADIR%%/call_logs.glade
+%%DATADIR%%/chatroom.glade
+%%DATADIR%%/contact.glade
+%%DATADIR%%/gtk-linphone.glade
+%%DATADIR%%/incoming_call.glade
+%%DATADIR%%/linphone.png
+%%DATADIR%%/linphone2.png
+%%DATADIR%%/log.glade
+%%DATADIR%%/main.glade
+%%DATADIR%%/parameters.glade
+%%DATADIR%%/password.glade
+%%DATADIR%%/sip_account.glade
+%%DATADIR%%/stock_people.png
 share/pixmaps/linphone/linphone.png
 share/pixmaps/linphone/linphone2.png
 share/pixmaps/linphone/linphone2.xpm
@@ -16,3 +27,5 @@ share/pixmaps/linphone/sip-otl.png
 share/pixmaps/linphone/sip-otp.png
 share/pixmaps/linphone/sip-wfa.png
 @dirrm share/pixmaps/linphone
+@dirrmtry %%DATADIR%%
+@dirrmtry share/applications
diff --git a/net/linphone/Makefile b/net/linphone/Makefile
index a82c7aee655a..51da54152602 100644
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net gnome
 
 LINPHONE_GUI=	yes