svn commit: r361763 - in head: . audio/msilbc net net-im/kopete-kde4 net-im/libjingle net/linphone net/linphone-base net/linphone/files net/mediastreamer net/ortp

Tijl Coosemans tijl at FreeBSD.org
Mon Jul 14 10:29:41 UTC 2014 

Author: tijl
Date: Mon Jul 14 10:29:38 2014
New Revision: 361763
URL: http://svnweb.freebsd.org/changeset/ports/361763
QAT: https://qat.redports.org/buildarchive/r361763/

Log:
  - Move net/linphone-base to replace net/linphone and update to version 3.7.0
  - Adjust ports that depended on linphone-base to depend on net/ortp or
    net/mediastreamer instead
  - Mark net-im/libjingle deprecated (part of Google Talk)
  
  Approved by:	portmgr (implicit, PORTREVISION bump of unstaged port)

Added:
  head/net/linphone/
     - copied from r361761, head/net/linphone-base/
  head/net/linphone/files/patch-configure   (contents, props changed)
  head/net/linphone/files/patch-coreapi__presence.c   (contents, props changed)
Deleted:
  head/net/linphone-base/
  head/net/linphone/files/patch-coreapi_linphonecore.c
  head/net/linphone/files/patch-gtk-glade_Makefile.in
  head/net/linphone/files/patch-mediastreamer2_src_dsptools.c
  head/net/linphone/files/patch-mediastreamer2_src_ice.c
  head/net/linphone/files/patch-oRTP-src_stun.c
  head/net/linphone/pkg-descr.gui
  head/net/linphone/pkg-plist.gui
Modified:
  head/MOVED
  head/UPDATING
  head/audio/msilbc/Makefile
  head/net-im/kopete-kde4/Makefile
  head/net-im/libjingle/Makefile
  head/net/Makefile
  head/net/linphone/Makefile
  head/net/linphone/distinfo
  head/net/linphone/pkg-descr
  head/net/linphone/pkg-plist
  head/net/mediastreamer/Makefile
  head/net/ortp/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Jul 14 10:14:27 2014	(r361762)
+++ head/MOVED	Mon Jul 14 10:29:38 2014	(r361763)
@@ -6253,4 +6253,4 @@ editors/nxml||2014-07-13|Needs recently 
 graphics/py-stl|graphics/py-stltools|2014-07-13|Upstream project has been renamed
 audio/muine||2014-07-13|Has expired: Fails to build/run since August 2013
 x11-themes/kde4-windeco-nitrogen||2014-07-14|Has expired: Merged with the Oxygen windeco included with KDE4
-net/linphone||2014-07-14|Removed temporarily
+net/linphone-base||2014-07-14|Split into separate components

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Jul 14 10:14:27 2014	(r361762)
+++ head/UPDATING	Mon Jul 14 10:29:38 2014	(r361763)
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20140714:
+  AFFECTS: users of net/linphone-base
+  AUTHOR: tijl at FreeBSD.org
+
+  Linphone has been updated to version 3.7.0 and the linphone-base port
+  has been split into separate components.  You must first delete the
+  linphone-base package before you can update ports that depend on it.
+
+  pkg del -f linphone-base
+    or
+  pkg_delete -f linphone-base\*
+
 20140713:
   AFFECTS: users of mail/postfix-current
   AUTHOR: sahil at FreeBSD.org

Modified: head/audio/msilbc/Makefile
==============================================================================
--- head/audio/msilbc/Makefile	Mon Jul 14 10:14:27 2014	(r361762)
+++ head/audio/msilbc/Makefile	Mon Jul 14 10:29:38 2014	(r361763)
@@ -2,15 +2,15 @@
 
 PORTNAME=	msilbc
 PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio net
 MASTER_SITES=	SAVANNAH/linphone/plugins/sources/
 
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Mediastreamer plugin for the iLBC audio codec
 
-LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/linphone-base \
-		libmediastreamer.so:${PORTSDIR}/net/linphone-base \
+LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/ortp \
+		libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
 		libilbc.so:${PORTSDIR}/net/ilbc
 
 USES=		libtool pkgconfig

Modified: head/net-im/kopete-kde4/Makefile
==============================================================================
--- head/net-im/kopete-kde4/Makefile	Mon Jul 14 10:14:27 2014	(r361762)
+++ head/net-im/kopete-kde4/Makefile	Mon Jul 14 10:29:38 2014	(r361763)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kopete
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -14,8 +14,8 @@ LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/l
 		libqca.so:${PORTSDIR}/devel/qca \
 		libotr.so.5:${PORTSDIR}/security/libotr \
 		libgadu.so:${PORTSDIR}/polish/libgadu \
-		libortp.so:${PORTSDIR}/net/linphone-base \
-		libmediastreamer.so:${PORTSDIR}/net/linphone-base \
+		libortp.so:${PORTSDIR}/net/ortp \
+		libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
 		libspeex.so:${PORTSDIR}/audio/speex \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libmeanwhile.so:${PORTSDIR}/net-im/meanwhile \

Modified: head/net-im/libjingle/Makefile
==============================================================================
--- head/net-im/libjingle/Makefile	Mon Jul 14 10:14:27 2014	(r361762)
+++ head/net-im/libjingle/Makefile	Mon Jul 14 10:29:38 2014	(r361763)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libjingle
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
@@ -13,14 +13,17 @@ COMMENT=	Google Talk's implementation of
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	speex:${PORTSDIR}/audio/speex \
-		ilbc:${PORTSDIR}/net/ilbc \
-		ortp:${PORTSDIR}/net/linphone-base \
-		expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex \
+		libilbc.so:${PORTSDIR}/net/ilbc \
+		libortp.so:${PORTSDIR}/net/ortp \
+		libexpat.so:${PORTSDIR}/textproc/expat2
 
 CONFLICTS=	krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \
 		clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]*
 
+DEPRECATED=	Upstream defunct and broken with clang
+EXPIRATION_DATE=2014-08-31
+
 USES=		pkgconfig dos2unix gmake
 DOS2UNIX_FILES=	README
 USE_GNOME=	glib20

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Mon Jul 14 10:14:27 2014	(r361762)
+++ head/net/Makefile	Mon Jul 14 10:29:38 2014	(r361763)
@@ -346,7 +346,7 @@
     SUBDIR += linc
     SUBDIR += linc-reference
     SUBDIR += linknx
-    SUBDIR += linphone-base
+    SUBDIR += linphone
     SUBDIR += linux-f10-nss_ldap
     SUBDIR += linux-f10-openldap
     SUBDIR += linuxigd

Modified: head/net/linphone/Makefile
==============================================================================
--- head/net/linphone-base/Makefile	Mon Jul 14 10:13:11 2014	(r361761)
+++ head/net/linphone/Makefile	Mon Jul 14 10:29:38 2014	(r361763)
@@ -1,97 +1,61 @@
-# Created by: Maxim Sobolev <sobomax at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	linphone
-PORTVERSION=	3.2.1
-PORTREVISION?=	3
+PORTVERSION=	3.7.0
 PORTEPOCH=	1
-CATEGORIES?=	net
-MASTER_SITES=	SAVANNAH/${PORTNAME}/3.2.x/sources
+CATEGORIES=	net
+MASTER_SITES=	SAVANNAH/linphone/3.7.x/sources
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Web phone that supports SIP protocol
+COMMENT=	SIP client supporting voice/video calls and text messaging
 
-LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libeXosip2.so:${PORTSDIR}/net/libexosip2-legacy
-
-CONFLICTS=	ortp-[0-9]*
-
-USE_GNOME=	glib20 intlhack
-USES=		gmake pathfix pkgconfig readline:port
-USE_AUTOTOOLS=	libtool
-LIBTOOLFILES=	configure oRTP/configure mediastreamer2/configure
-CONFIGURE_ARGS=	--disable-ipv6 --disable-manual --disable-ewarning \
-		--disable-strict --disable-video --disable-external-ortp \
-		--with-osip=${LOCALBASE} --with-gsm=${LOCALBASE} \
+LIB_DEPENDS=	libbellesip.so:${PORTSDIR}/net/belle-sip \
+		libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
+		libortp.so:${PORTSDIR}/net/ortp \
+		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
+		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+
+CONFLICTS_INSTALL=	linphone-base-[0-9]*
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-deplibs-link --disable-strict --disable-tutorials \
+		--enable-external-mediastreamer --enable-external-ortp \
 		--with-readline=${LOCALBASE}
-CONFIGURE_ENV+=	ac_cv_lib_readline_readline=yes
-MAKE_ENV=	SUBDIRS="${SUBDIRS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
+USES=		gmake libtool pathfix pkgconfig readline:port
+USE_GNOME=	gnomehier gtk20 intltool libxml2
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	IPV6 NLS NOTIFY UPNP VIDEO
+OPTIONS_DEFAULT=NOTIFY UPNP VIDEO
 OPTIONS_SUB=	yes
 
+IPV6_CONFIGURE_ENABLE=	ipv6
 NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
-.include <bsd.port.options.mk>
+NOTIFY_CONFIGURE_ENABLE=notify
+NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-.endif
+UPNP_CONFIGURE_ENABLE=	upnp
+UPNP_LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
 
-.if defined(LINPHONE_GUI)
-BUILD_DEPENDS+=	linphone-base>=${PORTVERSION}:${PORTSDIR}/net/linphone-base
-RUN_DEPENDS+=	linphone-base>=${PORTVERSION}:${PORTSDIR}/net/linphone-base
-DESCR=		${PKGDIR}/pkg-descr.gui
-PLIST=		${PKGDIR}/pkg-plist.gui
-USE_GNOME+=	libglade2
-SUBDIRS=	pixmaps gtk-glade
-.else
-PKGNAMESUFFIX=	-base
-CONFIGURE_ARGS+=	--enable-gtk_ui=no
-SUBDIRS=	po oRTP mediastreamer2 coreapi console
-.endif
+VIDEO_CONFIGURE_ENABLE=	video
 
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc
+.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+CONFIGURE_ARGS+=--enable-debug
 .endif
 
 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
-	@${REINPLACE_CMD} -e 's|gsm/gsm\.h|gsm.h|g ; \
-		 s| -O2 -g ||g' ${WRKSRC}/mediastreamer2/configure
-	@${REINPLACE_CMD} -e 's|gsm/gsm\.h|gsm.h|g' \
-		${WRKSRC}/mediastreamer2/src/gsm.c
-
-post-install:
-.if defined(LINPHONE_GUI)
-	cd ${STAGEDIR}${PREFIX}/bin && \
-		${LN} -sf linphone-3 linphone
-	${INSTALL_MAN} ${WRKSRC}/share/C/linphone.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/share/linphone.desktop \
-		${STAGEDIR}${PREFIX}/share/applications
-.else
-	@${MKDIR} ${STAGEDIR}${DATADIR}/sounds/rings
-	${INSTALL_MAN} \
-		${WRKSRC}/share/C/linphonec.1 \
-		${WRKSRC}/share/C/linphonecsh.1 \
-		${WRKSRC}/share/C/sipomatic.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/share/linphone.pc \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig
-	${INSTALL_DATA} ${WRKSRC}/share/*.wav \
-		${STAGEDIR}${DATADIR}/sounds
-	${INSTALL_DATA} ${WRKSRC}/share/rings/*.wav \
-		${STAGEDIR}${DATADIR}/sounds/rings
-.endif
+	@${REINPLACE_CMD} '/linphonec_LDADD =/s/=/= $$(MEDIASTREAMER_LIBS)/' \
+		${WRKSRC}/console/Makefile.in
+	@${REINPLACE_CMD} '/linphone_LDADD =/s/=/= $$(MEDIASTREAMER_LIBS)/' \
+		${WRKSRC}/gtk/Makefile.in
+.for l in C fr it ja
+	@${REINPLACE_CMD} '/^install-data-local:/,/^$$/d' \
+		${WRKSRC}/share/$l/Makefile.in
+.endfor
 
 .include <bsd.port.mk>

Modified: head/net/linphone/distinfo
==============================================================================
--- head/net/linphone-base/distinfo	Mon Jul 14 10:13:11 2014	(r361761)
+++ head/net/linphone/distinfo	Mon Jul 14 10:29:38 2014	(r361763)
@@ -1,2 +1,2 @@
-SHA256 (linphone-3.2.1.tar.gz) = b34bf066e07895b4d7b51a4a64e2a7524ab1cb755c996ef208293228c7bc4e69
-SIZE (linphone-3.2.1.tar.gz) = 7906185
+SHA256 (linphone-3.7.0.tar.gz) = ff792b1cfc132fc4a54ae6c861c99d4139ec6f4b8ff4092ea2ce1e19d44c151c
+SIZE (linphone-3.7.0.tar.gz) = 12090691

Added: head/net/linphone/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/linphone/files/patch-configure	Mon Jul 14 10:29:38 2014	(r361763)
@@ -0,0 +1,24 @@
+--- configure.orig
++++ configure
+@@ -19486,12 +19486,6 @@
+         ;;
+ esac
+ 
+-case "$host_os" in
+-	*freebsd*)
+-		LDFLAGS="$LDFLAGS -pthread"
+-	;;
+-esac
+-
+ case "$host_cpu" in
+ 	*arm*)
+ 
+@@ -20993,7 +20987,7 @@
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+-		SQLITE3_CFLAGS+="-DMSG_STORAGE_ENABLED"
++		SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DMSG_STORAGE_ENABLED"
+ 
+ 
+ 		enable_msg_storage=true

Added: head/net/linphone/files/patch-coreapi__presence.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/linphone/files/patch-coreapi__presence.c	Mon Jul 14 10:29:38 2014	(r361763)
@@ -0,0 +1,11 @@
+--- coreapi/presence.c.orig
++++ coreapi/presence.c
+@@ -167,7 +167,7 @@
+ 		ms_error("mktime() failed: %s", strerror(errno));
+ 		return (time_t)-1;
+ 	}
+-	return seconds - timezone;
++	return seconds;
+ }
+ 
+ static char * timestamp_to_string(time_t timestamp) {

Modified: head/net/linphone/pkg-descr
==============================================================================
--- head/net/linphone-base/pkg-descr	Mon Jul 14 10:13:11 2014	(r361761)
+++ head/net/linphone/pkg-descr	Mon Jul 14 10:29:38 2014	(r361763)
@@ -1,7 +1,11 @@
-Linphone is a web phone: it let you phone to your friends anywhere in the
-whole world, freely, simply by using the internet. The cost of the phone call
-is the cost that you spend connected to the internet.
+Linphone is an internet phone or Voice Over IP phone (VoIP).
 
-This package includes libraries, headers and console frontend.
+* With linphone you can communicate freely with people over the internet,
+  with voice, video, and text instant messaging
+* Linphone makes use of the SIP protocol, an open standard for internet
+  telephony.  You can use Linphone with any SIP VoIP operator, including
+  the free SIP audio/video service provided by www.linphone.org
+* Linphone is available for desktop computers: Linux, Windows, MacOSX, and
+  for mobile phones: Android, iPhone, Blackberry
 
 WWW: http://www.linphone.org/

Modified: head/net/linphone/pkg-plist
==============================================================================
--- head/net/linphone-base/pkg-plist	Mon Jul 14 10:13:11 2014	(r361761)
+++ head/net/linphone/pkg-plist	Mon Jul 14 10:29:38 2014	(r361763)
@@ -1,97 +1,121 @@
+bin/linphone
 bin/linphonec
 bin/linphonecsh
-bin/sipomatic
-include/linphone/config.h
+bin/lp-gen-wrappers
+bin/lpc2xml_test
+bin/xml2lpc_test
+include/linphone/event.h
 include/linphone/linphonecore.h
+include/linphone/linphonecore_utils.h
+include/linphone/linphonefriend.h
+include/linphone/linphonepresence.h
+include/linphone/lpc2xml.h
 include/linphone/lpconfig.h
 include/linphone/sipsetup.h
-include/mediastreamer2/allfilters.h
-include/mediastreamer2/dtmfgen.h
-include/mediastreamer2/dsptools.h
-include/mediastreamer2/ice.h
-include/mediastreamer2/mediastream.h
-include/mediastreamer2/mscommon.h
-include/mediastreamer2/msequalizer.h
-include/mediastreamer2/msfileplayer.h
-include/mediastreamer2/msfilerec.h
-include/mediastreamer2/msfilter.h
-include/mediastreamer2/msqueue.h
-include/mediastreamer2/msrtp.h
-include/mediastreamer2/mssndcard.h
-include/mediastreamer2/msspeexec.h
-include/mediastreamer2/mstee.h
-include/mediastreamer2/msticker.h
-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
-include/ortp/port.h
-include/ortp/rtcp.h
-include/ortp/rtp.h
-include/ortp/rtpsession.h
-include/ortp/rtpsignaltable.h
-include/ortp/sessionset.h
-include/ortp/srtp.h
-include/ortp/str_utils.h
-include/ortp/stun.h
-include/ortp/stun_udp.h
-include/ortp/telephonyevents.h
-lib/liblinphone.a
-lib/liblinphone.la
+include/linphone/xml2lpc.h
 lib/liblinphone.so
-lib/liblinphone.so.5
-lib/libmediastreamer.a
-lib/libmediastreamer.la
-lib/libmediastreamer.so
-lib/libmediastreamer.so.0
-lib/libortp.a
-lib/libortp.la
-lib/libortp.so
-lib/libortp.so.8
+lib/liblinphone.so.6
+lib/liblinphone.so.6.0.0
 libdata/pkgconfig/linphone.pc
-libdata/pkgconfig/mediastreamer.pc
-libdata/pkgconfig/ortp.pc
-libexec/mediastream
+man/cs/man1/linphone.1.gz
+man/cs/man1/linphonec.1.gz
+man/cs/man1/sipomatic.1.gz
+man/man1/linphone.1.gz
 man/man1/linphonec.1.gz
 man/man1/linphonecsh.1.gz
 man/man1/sipomatic.1.gz
-%%DATADIR%%/sounds/hello16000.wav
-%%DATADIR%%/sounds/hello8000.wav
-%%DATADIR%%/sounds/ringback.wav
-%%DATADIR%%/sounds/rings/bigben.wav
-%%DATADIR%%/sounds/rings/oldphone.wav
-%%DATADIR%%/sounds/rings/orig.wav
-%%DATADIR%%/sounds/rings/rock.wav
-%%DATADIR%%/sounds/rings/sweet.wav
-%%DATADIR%%/sounds/rings/synth.wav
-%%DATADIR%%/sounds/rings/tapping.wav
-%%DATADIR%%/sounds/rings/toy.wav
+share/applications/linphone.desktop
+%%DATADIR%%/COPYING
+%%DATADIR%%/about.ui
+%%DATADIR%%/buddylookup.ui
+%%DATADIR%%/call_logs.ui
+%%DATADIR%%/call_statistics.ui
+%%DATADIR%%/config-uri.ui
+%%DATADIR%%/contact.ui
+%%DATADIR%%/dscp_settings.ui
+%%DATADIR%%/keypad.ui
+%%DATADIR%%/ldap.ui
+%%DATADIR%%/log.ui
+%%DATADIR%%/main.ui
+%%DATADIR%%/parameters.ui
+%%DATADIR%%/password.ui
+%%DATADIR%%/provisioning-fetch.ui
+%%DATADIR%%/rootca.pem
+%%DATADIR%%/sip_account.ui
+%%DATADIR%%/stock_people.png
+%%DATADIR%%/tunnel_config.ui
+%%DATADIR%%/waiting.ui
 %%NLS%%share/locale/cs/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/de/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/es/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/he/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/it/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/nb_NO/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/linphone.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/linphone.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/linphone.mo
-share/mediastreamer/images/nowebcamCIF.jpg
- at dirrm share/mediastreamer/images
- at dirrm share/mediastreamer
- at dirrm %%DATADIR%%/sounds/rings
- at dirrm %%DATADIR%%/sounds
- at dirrm %%DATADIR%%
- at dirrm include/ortp
- at dirrm include/mediastreamer2
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/linphone.mo
+share/pixmaps/linphone/active_chat.png
+share/pixmaps/linphone/addcall-green.png
+share/pixmaps/linphone/call.png
+share/pixmaps/linphone/call_status_incoming.png
+share/pixmaps/linphone/call_status_outgoing.png
+share/pixmaps/linphone/chat.png
+share/pixmaps/linphone/chat_message_delivered.png
+share/pixmaps/linphone/chat_message_inprogress.png
+share/pixmaps/linphone/chat_message_not_delivered.png
+share/pixmaps/linphone/composing_active_chat.png
+share/pixmaps/linphone/composing_chat.png
+share/pixmaps/linphone/contact-orange.png
+share/pixmaps/linphone/contact_starred.png
+share/pixmaps/linphone/contact_unstarred.png
+share/pixmaps/linphone/dialer-orange.png
+share/pixmaps/linphone/dialer.png
+share/pixmaps/linphone/history-orange.png
+share/pixmaps/linphone/hold_off.png
+share/pixmaps/linphone/hold_on.png
+share/pixmaps/linphone/linphone-banner.png
+share/pixmaps/linphone/linphone.icns
+share/pixmaps/linphone/linphone.png
+share/pixmaps/linphone/mic_active.png
+share/pixmaps/linphone/mic_muted.png
+share/pixmaps/linphone/notok.png
+share/pixmaps/linphone/ok.png
+share/pixmaps/linphone/speaker.png
+share/pixmaps/linphone/startcall-green.png
+share/pixmaps/linphone/startcall-small.png
+share/pixmaps/linphone/status-green.png
+share/pixmaps/linphone/status-offline.png
+share/pixmaps/linphone/status-orange.png
+share/pixmaps/linphone/status-red.png
+share/pixmaps/linphone/stopcall-red.png
+share/pixmaps/linphone/stopcall-small.png
+share/sounds/linphone/hello16000.wav
+share/sounds/linphone/hello8000.wav
+share/sounds/linphone/ringback.wav
+share/sounds/linphone/rings/bigben.wav
+share/sounds/linphone/rings/oldphone-mono-30s.caf
+share/sounds/linphone/rings/oldphone-mono.wav
+share/sounds/linphone/rings/oldphone.wav
+share/sounds/linphone/rings/orig.wav
+share/sounds/linphone/rings/rock.wav
+share/sounds/linphone/rings/sweet.wav
+share/sounds/linphone/rings/synth.wav
+share/sounds/linphone/rings/tapping.wav
+share/sounds/linphone/rings/toy-mono.wav
 @dirrm include/linphone
+ at dirrmtry man/cs/man1
+ at dirrmtry man/cs
+ at dirrm %%DATADIR%%
+ at dirrmtry share/locale/nb_NO/LC_MESSAGES
+ at dirrmtry share/locale/nb_NO
+ at dirrm share/pixmaps/linphone
+ at dirrm share/sounds/linphone/rings
+ at dirrm share/sounds/linphone

Modified: head/net/mediastreamer/Makefile
==============================================================================
--- head/net/mediastreamer/Makefile	Mon Jul 14 10:14:27 2014	(r361762)
+++ head/net/mediastreamer/Makefile	Mon Jul 14 10:29:38 2014	(r361763)
@@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/ortp
 
+CONFLICTS_INSTALL=	linphone-base-[0-9]*
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-alsa --disable-glx --disable-pulseaudio \
 		--disable-silent-rules --disable-strict \

Modified: head/net/ortp/Makefile
==============================================================================
--- head/net/ortp/Makefile	Mon Jul 14 10:14:27 2014	(r361762)
+++ head/net/ortp/Makefile	Mon Jul 14 10:29:38 2014	(r361763)
@@ -12,6 +12,8 @@ COMMENT=	Real-time Transport Protocol (R
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+CONFLICTS_INSTALL=	linphone-base-[0-9]*
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --disable-strict
 CPPFLAGS+=	-DHAVE_DEV_RANDOM

More information about the svn-ports-all mailing list