From owner-svn-ports-all@FreeBSD.ORG Fri Sep 20 21:50:43 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 78C547D3; Fri, 20 Sep 2013 21:50:43 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 640152489; Fri, 20 Sep 2013 21:50:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8KLohjI003770; Fri, 20 Sep 2013 21:50:43 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8KLoehq003734; Fri, 20 Sep 2013 21:50:40 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201309202150.r8KLoehq003734@svn.freebsd.org> From: Koop Mast Date: Fri, 20 Sep 2013 21:50:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327751 - in head: . devel devel/ptlib devel/ptlib/files devel/ptlib26 net net-im net-im/ekiga net-im/ekiga/files net/ekiga3 net/opal net/opal/files net/opal3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Sep 2013 21:50:43 -0000 Author: kwm Date: Fri Sep 20 21:50:39 2013 New Revision: 327751 URL: http://svnweb.freebsd.org/changeset/ports/327751 Log: Move ptlib26, opal3 and ekiga3 to unversioned ports and update to: ptlib to 2.10.10 opal to 3.10.10 ekiga to 4.0.1 Added: head/devel/ptlib/ - copied from r327744, head/devel/ptlib26/ head/devel/ptlib/files/patch-include_ptlib_object.h (contents, props changed) head/devel/ptlib/files/patch-plugins_configure.in (contents, props changed) head/devel/ptlib/files/patch-src_ptlib_unix_svcproc.cxx (contents, props changed) head/net-im/ekiga/ - copied from r327744, head/net/ekiga3/ head/net/opal/ - copied from r327744, head/net/opal3/ head/net/opal/files/patch-plugins_audio_SILK_SILK-SDK_Makefile (contents, props changed) head/net/opal/files/patch-plugins_video_H.263-1998_rfc2190.cxx (contents, props changed) head/net/opal/files/patch-plugins_video_H.264_shared_x264wrap.h (contents, props changed) Deleted: head/devel/ptlib/files/patch-include_ptlib_array.h head/devel/ptlib/files/patch-make__lib.mak head/devel/ptlib/files/patch-plugins_configure head/devel/ptlib/files/patch-plugins_sound_oss_sound_oss.cxx head/devel/ptlib/files/patch-plugins_vidinput_v4l2_vidinput_v4l2.cxx head/devel/ptlib/files/patch-plugins_vidinput_v4l_Makefile.in head/devel/ptlib/files/patch-plugins_vidinput_v4l_vidinput_v4l.cxx head/devel/ptlib26/ head/net-im/ekiga/files/patch-halodbus.diff head/net-im/ekiga/files/patch-lib_engine_components_libnotify_libnotify-main.cpp head/net-im/ekiga/files/patch-src_gui_main.cpp head/net/ekiga3/ head/net/opal/files/patch-configure head/net/opal/files/patch-configure-spandsp head/net/opal/files/patch-include_h323_h323ep.h head/net/opal/files/patch-includes_video_rfc2190.cxx head/net/opal/files/patch-plugins-audio-celt-celtcodec.c head/net/opal/files/patch-plugins-video-MPEG4-ffmpeg-mpeg4.cxx head/net/opal/files/patch-plugins-video-h.263-1998-h.263-1998.cxx head/net/opal/files/patch-spandsp_fax.cpp head/net/opal/files/patch-spandsp_if.cpp head/net/opal3/ Modified: head/MOVED head/devel/Makefile head/devel/ptlib/Makefile head/devel/ptlib/distinfo (contents, props changed) head/devel/ptlib/files/patch-Makefile.in (contents, props changed) head/devel/ptlib/pkg-plist (contents, props changed) head/net-im/Makefile head/net-im/ekiga/Makefile head/net-im/ekiga/distinfo (contents, props changed) head/net-im/ekiga/files/patch-configure (contents, props changed) head/net-im/ekiga/pkg-descr (contents, props changed) head/net-im/ekiga/pkg-plist (contents, props changed) head/net/Makefile head/net/opal/Makefile head/net/opal/distinfo (contents, props changed) head/net/opal/files/patch-Makefile.in (contents, props changed) head/net/opal/files/patch-plugins_configure (contents, props changed) head/net/opal/pkg-plist (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Fri Sep 20 21:49:30 2013 (r327750) +++ head/MOVED Fri Sep 20 21:50:39 2013 (r327751) @@ -4943,3 +4943,7 @@ irc/xchat1|irc/xchat|2013-09-16|Unsuppor japanese/xchat|irc/xchat|2013-09-16|Unsupported upstream, consider using irc/xchat www/autoindex|www/autoindex2|2013-09-16|Does not work with any of the supported PHP versions textproc/rotix||2013-09-20|Has expired: no longer maintained upstream +devel/ptlib26|devel/ptlib|2013-09-20|Removed old version, update to new version and moved port +net/opal3|net/opal|2013-09-20|Removed old version, update to new version and moved port +net/ekiga|net-im/ekiga|2013-09-20|Removed old version, update to new version and moved port +net/ekiga3|net-im/ekiga|2013-09-20|Removed old version, update to new version and moved port Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Fri Sep 20 21:49:30 2013 (r327750) +++ head/devel/Makefile Fri Sep 20 21:50:39 2013 (r327751) @@ -3366,7 +3366,6 @@ SUBDIR += pth-hard SUBDIR += pthsem SUBDIR += ptlib - SUBDIR += ptlib26 SUBDIR += ptmalloc SUBDIR += ptmalloc2 SUBDIR += pty Modified: head/devel/ptlib/Makefile ============================================================================== --- head/devel/ptlib26/Makefile Fri Sep 20 20:10:22 2013 (r327744) +++ head/devel/ptlib/Makefile Fri Sep 20 21:50:39 2013 (r327751) @@ -1,108 +1,134 @@ -# Created by: Roger Hardiman +# Created by: Roger Hardiman # $FreeBSD$ PORTNAME= ptlib -PORTVERSION= 2.6.7 -PORTREVISION= 2 +PORTVERSION= 2.10.10 CATEGORIES= devel -MASTER_SITES= SF/opalvoip/v3.6%20Lalande/Final/ -DISTNAME= ptlib-${PORTVERSION} +MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org -COMMENT= A cross platform C++ library, used by OPAL +COMMENT= Cross platform C++ library, used by OPAL -LICENSE=MPL +LICENSE= MPL -LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 -CONFLICTS= pwlib-1.* ptlib-2.4.* ptlib-2.8.* +CONFLICTS= pwlib-1.* -USE_BZIP2= yes +USE_XZ= yes USES= bison gmake pkgconfig +USE_AUTOTOOLS= autoconf:env automake:env GNU_CONFIGURE= yes -WANT_GNOME= yes USE_OPENSSL= yes USE_LDCONFIG= yes +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ARGS+= --enable-oss --enable-plugins --with-expat-dir="${LOCALBASE}" -CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" +CONFIGURE_ARGS+=--enable-audio \ + --enable-ipv6 \ + --enable-exceptions \ + --enable-oss \ + --enable-plugins + +CONFIGURE_ARGS+=--disable-lua \ + --disable-sasl + +# --with-expat-dir="${LOCALBASE}" +CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" + +OPTIONS_DEFINE= BSDVIDEO DEBUG ODBC ALSA JABBER V4L SDL LDAP PULSEAUDIO +OPTIONS_DEFAULT=BSDVIDEO SDL V4L JABBER -OPTIONS_DEFINE= ODBC ALSA V4L BSDVIDEO SDL LDAP -OPTIONS_DEFAULT=BSDVIDEO SDL BSDVIDEO_DESC= BSD video support +DEBUG_DESC= Install debug library NO_STAGE= yes .include PLIST_SUB+= PORTVERSION=${PORTVERSION} \ - PVERSION_MAJOR=${PORTVERSION:C/.[0-9]+$//g} \ - PVERSION_MINOR=${PORTVERSION:C/^[0-9]+.[0-9]+.//} + PVERSION_MAJOR=${PVERSION_MAJOR} \ + PVERSION_MINOR=${PVERSION_MINOR} + +PVERSION_MAJOR= ${PORTVERSION:C/.[0-9]+.[0-9]+.//} +PVERSION_MINOR= ${PORTVERSION:C/.[0-9]+$//g} .if ${PORT_OPTIONS:MDEBUG} ALL_TARGET= optshared debugshared -BROKEN= debug libs install broken +PLIST_SUB+= DEBUG="" .else ALL_TARGET= optshared +PLIST_SUB+= DEBUG="@comment " +.endif + +.if ${PORT_OPTIONS:MPULSEAUDIO} +LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio +CONFIGURE_ARGS+=--enable-pulse +.else +CONFIGURE_ARGS+=--disable-pulse +.endif + +.if ${PORT_OPTIONS:MJABBER} +CONFIGURE_ARGS+=--enable-jabber +PLLIB_VIDEO=1 .endif .if ${PORT_OPTIONS:MODBC} -CONFIGURE_ARGS+= --enable-odbc -LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC +LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC +CONFIGURE_ARGS+=--enable-odbc .else -CONFIGURE_ARGS+= --disable-odbc +CONFIGURE_ARGS+=--disable-odbc .endif .if ${PORT_OPTIONS:MALSA} -CONFIGURE_ARGS+= --enable-alsa +LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib +CONFIGURE_ARGS+=--enable-alsa PLIST_SUB+= ALSA="" -LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib .else -CONFIGURE_ARGS+= --disable-alsa +CONFIGURE_ARGS+=--disable-alsa PLIST_SUB+= ALSA="@comment " .endif .if ${PORT_OPTIONS:MBSDVIDEO} CONFIGURE_ARGS+=--enable-bsdvideo PLIST_SUB+= BSDVIDEO="" -WITH_VIDEO=1 +PTLIB_VIDEO=1 .else CONFIGURE_ARGS+=--disable-bsdvideo PLIST_SUB+= BSDVIDEO="@comment " .endif .if ${PORT_OPTIONS:MV4L} +BUILD_DEPENDS+= v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat +LIB_DEPENDS+= libv4l2.so:${PORTSDIR}/multimedia/libv4l CONFIGURE_ARGS+=--enable-v4l --enable-v4l2 -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB+= V4L="" -BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS+= v4l1.0:${PORTSDIR}/multimedia/libv4l -WITH_VIDEO=1 +PTLIB_VIDEO=1 .else -CONFIGURE_ARGS+=--disable-v4l +CONFIGURE_ARGS+=--disable-v4l --disable-v4l2 PLIST_SUB+= V4L="@comment " .endif -.if defined(WITH_VIDEO) -CONFIGURE_ARGS+= --enable-video +.if defined(PTLIB_VIDEO) +CONFIGURE_ARGS+=--enable-video --enable-vidfile PLIST_SUB+= VIDEODIR="" .else -CONFIGURE_ARGS+= --disable-video +CONFIGURE_ARGS+=--disable-video --disable-vidfile PLIST_SUB+= VIDEODIR="@comment " .endif .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl +CONFIGURE_ARGS+=--enable-sdl .else -CONFIGURE_ARGS+= --disable-sdl +CONFIGURE_ARGS+=--disable-sdl .endif .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes -CONFIGURE_ARGS+= --enable-openldap --with-ldap-dir="${LOCALBASE}" +CONFIGURE_ARGS+=--enable-openldap .else -CONFIGURE_ARGS+= --disable-openldap +CONFIGURE_ARGS+=--disable-openldap .endif # ONLY FOR THE BRAVE! @@ -133,16 +159,18 @@ CONFIGURE_ARGS+= --disable-dc #PLIST_SUB+= DC1394="@comment " #.endif -.include - post-patch: - @${REINPLACE_CMD} -e 's|-lpt|-lpt-${PORTVERSION:C/.[0-9]+$//g}|' ${WRKSRC}/ptlib.pc.in - @${REINPLACE_CMD} -e 's|-lasound|-lasound -L${LOCALBASE}/lib|' ${WRKSRC}/plugins/sound_alsa/Makefile -.if ${ARCH} == sparc64 && ${OSVERSION} <= 700003 - @${REINPLACE_CMD} -e 's|P_PTHREADS_XPG6|0|' ${WRKSRC}/src/ptlib/unix/tlibthrd.cxx -.endif -.if ${OSVERSION} >= 800059 @${REINPLACE_CMD} -e 's/RTF_WASCLONED/0x20000/' ${WRKSRC}/src/ptlib/unix/socket.cxx + +pre-configure: + cd ${WRKSRC}/plugins/ && autoreconf -fi + +post-install: + ${LN} -sf libpt.so.${PORTVERSION} ${PREFIX}/lib/libpt.so.${PVERSION_MAJOR} + ${LN} -sf libpt.so.${PORTVERSION} ${PREFIX}/lib/libpt.so.${PVERSION_MINOR} +.if ${PORT_OPTIONS:MDEBUG} + ${LN} -sf libpt_d.so.${PORTVERSION} ${PREFIX}/lib/libpt_d.so.${PVERSION_MAJOR} + ${LN} -sf libpt_d.so.${PORTVERSION} ${PREFIX}/lib/libpt_d.so.${PVERSION_MINOR} .endif -.include +.include Modified: head/devel/ptlib/distinfo ============================================================================== --- head/devel/ptlib26/distinfo Fri Sep 20 20:10:22 2013 (r327744) +++ head/devel/ptlib/distinfo Fri Sep 20 21:50:39 2013 (r327751) @@ -1,2 +1,2 @@ -SHA256 (ptlib-2.6.7.tar.bz2) = 7dd28225fedd21154d34899b21ee4b6d27c88eb1a9f9931c8e6ced28e8f3b97f -SIZE (ptlib-2.6.7.tar.bz2) = 3275152 +SHA256 (ptlib-2.10.10.tar.xz) = 7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4 +SIZE (ptlib-2.10.10.tar.xz) = 2520444 Modified: head/devel/ptlib/files/patch-Makefile.in ============================================================================== --- head/devel/ptlib26/files/patch-Makefile.in Fri Sep 20 20:10:22 2013 (r327744) +++ head/devel/ptlib/files/patch-Makefile.in Fri Sep 20 21:50:39 2013 (r327751) @@ -1,21 +1,17 @@ ---- Makefile.in.orig 2009-10-03 19:15:36.000000000 +0400 -+++ Makefile.in 2009-10-03 21:23:44.000000000 +0400 -@@ -92,11 +92,12 @@ - $(DESTDIR)$(PREFIX)/share/ptlib/make ; \ +--- Makefile.in.orig 2013-02-20 03:12:27.000000000 +0100 ++++ Makefile.in 2013-07-11 10:16:26.000000000 +0200 +@@ -111,9 +111,7 @@ do mkdir -p $$dir ; chmod 755 $$dir ; \ done ) -- $(INSTALL) -m 444 $(PT_LIBDIR)/$(LIB_SONAME) $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -m 444 $(PT_LIBDIR)/$(LIB_SONAME) $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so@BUILD_TYPE@@BUILD_NUMBER@ - $(INSTALL) -m 444 $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a $(DESTDIR)$(LIBDIR) - (cd $(DESTDIR)$(LIBDIR) ; \ - rm -f $(PTLIB_FILE) ; \ -- ln -sf $(LIB_SONAME) $(PTLIB_FILE) \ -+ ln -sf lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) ; \ -+ ln -sf lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so@BUILD_TYPE@@BUILD_NUMBER@ lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so \ - ) - ifeq (1, $(HAS_PLUGINS)) - if test -e $(PT_LIBDIR)/device/; then \ -@@ -127,9 +128,9 @@ + ( for lib in $(PT_LIBDIR)/$(LIB_SONAME) \ +- $(PT_LIBDIR)/$(DEBUG_SONAME) \ +- $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a \ +- $(PT_LIBDIR)/lib$(PTLIB_BASE)_d_s.a ; \ ++ $(PT_LIBDIR)/$(DEBUG_SONAME) ; \ + do \ + ( if test -e $$lib ; then \ + $(INSTALL) -m 444 $$lib $(DESTDIR)$(LIBDIR); \ +@@ -160,9 +158,9 @@ $(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/ (cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config) @@ -25,10 +21,10 @@ + mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig + chmod 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig + $(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ + uninstall: rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \ - $(DESTDIR)$(PREFIX)/include/ptclib \ -@@ -137,7 +138,7 @@ +@@ -171,7 +169,7 @@ $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \ $(DESTDIR)$(PREFIX)/share/ptlib \ $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \ Added: head/devel/ptlib/files/patch-include_ptlib_object.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ptlib/files/patch-include_ptlib_object.h Fri Sep 20 21:50:39 2013 (r327751) @@ -0,0 +1,11 @@ +--- include/ptlib/object.h.orig 2013-09-16 12:18:01.000000000 +0200 ++++ include/ptlib/object.h 2013-09-16 12:19:59.000000000 +0200 +@@ -1011,7 +1011,7 @@ + + __GNUC_PATCHLEVEL__) + + // Memory pooling allocators +-#if defined(__GNUC__) && (GCC_VERSION > 40000) && !defined(P_MINGW) && !defined(P_MACOSX) ++#if defined(__GNUC__) && (GCC_VERSION > 40000) && !defined(P_MINGW) && !defined(P_MACOSX) && !defined(_LIBCPP_VERSION) + #include + template struct PFixedPoolAllocator : public PAllocatorTemplate<__gnu_cxx::__mt_alloc, Type> { }; + template struct PVariablePoolAllocator : public PAllocatorTemplate<__gnu_cxx::__mt_alloc, Type> { }; Added: head/devel/ptlib/files/patch-plugins_configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ptlib/files/patch-plugins_configure.in Fri Sep 20 21:50:39 2013 (r327751) @@ -0,0 +1,10 @@ +--- plugins/configure.in.orig 2013-07-08 22:41:36.000000000 +0200 ++++ plugins/configure.in 2013-07-08 22:44:52.000000000 +0200 +@@ -250,6 +250,7 @@ + AC_ARG_ENABLE(bsdvideo, [ --enable-bsdvideo enable BSD video support],,enable_bsdvideo=yes) + + if test "${enable_bsdvideo}z" = "yesz" ; then ++ AC_CHECK_HEADER(dev/bktr/ioctl_meteor.h, BSDVIDEOHDR=1) + AC_CHECK_HEADER(machine/ioctl_meteor.h, BSDVIDEOHDR=1) + AC_CHECK_HEADER(i386/ioctl_meteor.h, BSDVIDEOHDR=1) + AC_CHECK_HEADER(dev/ic/bt8xx.h, BSDVIDEOHDR=1) Added: head/devel/ptlib/files/patch-src_ptlib_unix_svcproc.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ptlib/files/patch-src_ptlib_unix_svcproc.cxx Fri Sep 20 21:50:39 2013 (r327751) @@ -0,0 +1,29 @@ +--- src/ptlib/unix/svcproc.cxx.orig 2013-09-20 14:46:03.000000000 +0200 ++++ src/ptlib/unix/svcproc.cxx 2013-09-20 14:46:46.000000000 +0200 +@@ -217,7 +217,7 @@ + pid_t pid; + + { +- ifstream pidfile(pidfilename); ++ ifstream pidfile((const char*)pidfilename); + if (!pidfile.is_open()) { + cout << "Could not open pid file: \"" << pidfilename << "\"" + " - " << strerror(errno) << endl; +@@ -384,7 +384,7 @@ + // Run as a daemon, ie fork + + if (!pidfilename) { +- ifstream pidfile(pidfilename); ++ ifstream pidfile((const char*)pidfilename); + if (pidfile.is_open()) { + pid_t pid; + pidfile >> pid; +@@ -412,7 +412,7 @@ + cout << "Daemon started with pid " << pid << endl; + if (!pidfilename) { + // Write out the child pid to magic file in /var/run (at least for linux) +- ofstream pidfile(pidfilename); ++ ofstream pidfile((const char*)pidfilename); + if (pidfile.is_open()) + pidfile << pid; + else Modified: head/devel/ptlib/pkg-plist ============================================================================== --- head/devel/ptlib26/pkg-plist Fri Sep 20 20:10:22 2013 (r327744) +++ head/devel/ptlib/pkg-plist Fri Sep 20 21:50:39 2013 (r327751) @@ -4,6 +4,7 @@ include/ptclib/asnber.h include/ptclib/asner.h include/ptclib/asnper.h include/ptclib/asnxer.h +include/ptclib/cli.h include/ptclib/cypher.h include/ptclib/delaychan.h include/ptclib/dtmf.h @@ -17,6 +18,7 @@ include/ptclib/httpsvc.h include/ptclib/inetmail.h include/ptclib/inetprot.h include/ptclib/ipacl.h +include/ptclib/lua.h include/ptclib/memfile.h include/ptclib/mime.h include/ptclib/modem.h @@ -51,6 +53,7 @@ include/ptclib/socks.h include/ptclib/telnet.h include/ptclib/threadpool.h include/ptclib/url.h +include/ptclib/vcard.h include/ptclib/vsdl.h include/ptclib/vxml.h include/ptclib/xmpp.h @@ -107,6 +110,7 @@ include/ptlib/sound.h include/ptlib/svcproc.h include/ptlib/syncpoint.h include/ptlib/syncthrd.h +include/ptlib/syslog.h include/ptlib/tcpsock.h include/ptlib/textfile.h include/ptlib/thread.h @@ -128,6 +132,7 @@ include/ptlib/unix/ptlib/icmpsock.h include/ptlib/unix/ptlib/ipdsock.h include/ptlib/unix/ptlib/ipsock.h include/ptlib/unix/ptlib/maccoreaudio.h +include/ptlib/unix/ptlib/mail.h include/ptlib/unix/ptlib/mutex.h include/ptlib/unix/ptlib/pdirect.h include/ptlib/unix/ptlib/pipechan.h @@ -156,26 +161,30 @@ include/ptlib/vconvert.h include/ptlib/video.h include/ptlib/videoio.h include/ptlib/videoio1394dc.h -lib/libpt-%%PVERSION_MAJOR%%.so -lib/libpt-%%PVERSION_MAJOR%%.so.%%PVERSION_MINOR%% +include/ptlib/wxstring.h lib/libpt.so -lib/libpt_s.a -%%ALSA%%lib/ptlib-%%PORTVERSION%%/devices/sound/alsa_pwplugin.so +lib/libpt.so.%%PVERSION_MINOR%% +lib/libpt.so.%%PVERSION_MAJOR%% +lib/libpt.so.%%PORTVERSION%% +%%DEBUG%%lib/libpt_d.so +%%DEBUG%%lib/libpt_d.so.%%PVERSION_MINOR%% +%%DEBUG%%lib/libpt_d.so.%%PVERSION_MAJOR%% +%%DEBUG%%lib/libpt_d.so.%%PORTVERSION%% lib/ptlib-%%PORTVERSION%%/devices/sound/oss_pwplugin.so %%BSDVIDEO%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/bsdvideo_pwplugin.so %%V4L%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/v4l_pwplugin.so %%V4L%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/v4l2_pwplugin.so libdata/pkgconfig/ptlib.pc -%%DATADIR%%/make/common.mak -%%DATADIR%%/make/lib.mak -%%DATADIR%%/make/plugins.mak -%%DATADIR%%/make/ptbuildopts.mak -%%DATADIR%%/make/ptlib-config -%%DATADIR%%/make/ptlib.mak -%%DATADIR%%/make/unix.mak -@dirrm %%DATADIR%%/make -@dirrm %%DATADIR%% -%%VIDEODIR%%@dirrm lib/ptlib-%%PORTVERSION%%/devices/videoinput +share/ptlib/make/common.mak +share/ptlib/make/lib.mak +share/ptlib/make/plugins.mak +share/ptlib/make/ptbuildopts.mak +share/ptlib/make/ptlib-config +share/ptlib/make/ptlib.mak +share/ptlib/make/unix.mak +@dirrm share/ptlib/make +@dirrm share/ptlib +%%V4L%%@dirrm lib/ptlib-%%PORTVERSION%%/devices/videoinput @dirrm lib/ptlib-%%PORTVERSION%%/devices/sound @dirrm lib/ptlib-%%PORTVERSION%%/devices @dirrm lib/ptlib-%%PORTVERSION%% Modified: head/net-im/Makefile ============================================================================== --- head/net-im/Makefile Fri Sep 20 21:49:30 2013 (r327750) +++ head/net-im/Makefile Fri Sep 20 21:50:39 2013 (r327751) @@ -19,6 +19,7 @@ SUBDIR += decibel SUBDIR += echat SUBDIR += ejabberd + SUBDIR += ekiga SUBDIR += emesene SUBDIR += empathy SUBDIR += farsight2 Modified: head/net-im/ekiga/Makefile ============================================================================== --- head/net/ekiga3/Makefile Fri Sep 20 20:10:22 2013 (r327744) +++ head/net-im/ekiga/Makefile Fri Sep 20 21:50:39 2013 (r327751) @@ -1,134 +1,171 @@ # Created by: Charlie & # $FreeBSD$ -PORTNAME= ekiga3 -PORTVERSION= 3.2.6 -PORTREVISION= 10 +PORTNAME= ekiga +PORTVERSION= 4.0.1 CATEGORIES= net -MASTER_SITES= http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/ -DISTNAME= ekiga-${PORTVERSION} +MASTER_SITES= GNOME +#MASTER_SITES= http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/ +#DISTNAME= ekiga-${PORTVERSION} +DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= VoIP and video conferencing application -LIB_DEPENDS= sigc-2:${PORTSDIR}/devel/libsigc++20 \ - opal-3.6.[6-9]:${PORTSDIR}/net/opal3 -BUILD_DEPENDS= intltoolize:${PORTSDIR}/textproc/intltool \ - p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \ - ${LOCALBASE}/bin/scrollkeeper-config:${PORTSDIR}/textproc/rarian +BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat \ + gnome-icon-theme>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme +LIB_DEPENDS= libboost_signals.so:${PORTSDIR}/devel/boost-libs \ + libopal.so:${PORTSDIR}/net/opal \ + libv4l2.so:${PORTSDIR}/multimedia/libv4l +RUN_DEPENDS= gnome-icon-theme>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme -CONFLICTS= ekiga-2.* - -USE_GCC= any -USE_AUTOTOOLS= libtool +USE_XZ= yes GNU_CONFIGURE= yes -USES= gettext gmake perl5 pkgconfig +USES= gettext gmake pathfix perl5 pkgconfig USE_XORG= xv -USE_GNOME= gtk20 gnomehack -DIST_SUBDIR= gnome2 +USE_GNOME= gtk20 intltool libxml2 INSTALLS_OMF= yes INSTALLS_ICONS= yes +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -I${LOCALBASE}/lib + MAN1= ekiga.1 -OPTIONS_DEFINE= LDAP KDE4 H323 VIDEO NOTIFY EVOLUTION GCONF DBUS AVAHI \ - GNOMEHELP GCONFEDITOR -OPTIONS_DEFAULT=VIDEO NOTIFY GCONF AVAHI -KDE4_DESC= KDE4 support (experimental) +OPTIONS_DEFINE= LDAP NOTIFY EVOLUTION GCONF DBUS AVAHI GNOMEHELP +OPTIONS_DEFAULT=NOTIFY DBUS GCONF AVAHI + EVOLUTION_DESC= Evolution data server support GNOMEHELP_DESC= Build Ekiga help files -GCONFEDITOR_DESC=Depend on gconf-editor +#OPTIONS_GROUP= EXP +#OPTIONS_GROUP_EXP= KDE KAB GSTREAMER XCAP LOUDMOUTH +EXP_DESC= Experimental features +KDE_DESC= KDE 4 support +KAB_DESC= KAddressBook support (implies KDE option) +GSTREAMER_DESC= Gstreamer support +XCAP_DESC= Remote contact storage via HTTP in xml format +LOUDMOUTH_DESC= XMPP (jabber) support + +# Note that h.323 support is enabled when opal is build with it. + +NO_STAGE= yes .include -.if ${PORT_OPTIONS:MKDE4} -. if !${PORT_OPTIONS:MDBUS} -BROKEN= Please set DBUS option or remove the KDE4 option! -. endif -USE_KDE4= kdehier kdelibs -USE_QT4= # empty -CONFIGURE_ARGS+= --enable-kde -CONFIGURE_ENV+= KDE_CFLAGS="-I${KDE4_PREFIX}/include -I${QT_INCDIR} \ - -I${LOCALBASE}/include" KDE_LIBS="-L${KDE4_PREFIX}/lib" +PLIST_SUB+= VERSION=${PORTVERSION} + +.if ${PORT_OPTIONS:MKDE} || ${PORT_OPTIONS:MKAB} +USE_KDE4= kdehier kdelibs +USE_QT4= corelib +CONFIGURE_ARGS+=--enable-kde +#CONFIGURE_ENV+=KDE_CFLAGS="-I${KDE4_PREFIX}/include -I${QT_INCDIR} \ +# -I${LOCALBASE}/include" KDE_LIBS="-L${KDE4_PREFIX}/lib" +CPPFLAGS+= -I${KDE4_PREFIX}/include +LDFLAGS+= -L${KDE4_PREFIX}/lib +.else +CONFIGURE_ARGS+=--disable-kde +.endif + +.if ${PORT_OPTIONS:MKAB} +CONFIGURE_ARGS+=--enable-kab +USE_KDE4+= pimlibs +.else +CONFIGURE_ARGS+=--disable-kab +.endif + +.if ${PORT_OPTIONS:MGSTREAMER} +CONFIGURE_ARGS+=--enable-gstreamer +USE_GSTREAMER= yes +.else +CONFIGURE_ARGS+=--disable-gstreamer +.endif + +.if ${PORT_OPTIONS:MXCAP} +CONFIGURE_ARGS+=--enable-xcap +LIB_DEPENDS+= libsoup-2.4.so:${PORTSDIR}/devel/libsoup .else -CONFIGURE_ARGS+= --disable-kde +CONFIGURE_ARGS+=--disable-xcap .endif -.if ${PORT_OPTIONS:MVIDEO} -BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat +.if ${PORT_OPTIONS:MLOUDMOUTH} +CONFIGURE_ARGS+=--enable-loudmouth +LIB_DEPENDS+= libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth +.else +CONFIGURE_ARGS+=--disable-loudmouth .endif .if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes -LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 -CONFIGURE_ARGS+= --enable-ldap --with-ldap-dir="${LOCALBASE}" --with-libsasl2-dir="${LOCALBASE}" +LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 +CONFIGURE_ARGS+=--enable-ldap --with-ldap-dir="${LOCALBASE}" --with-libsasl2-dir="${LOCALBASE}" +PLIST_SUB+= LDAP="" +WITH_PLUGINS= 1 .else -CONFIGURE_ARGS+= --disable-ldap +CONFIGURE_ARGS+=--disable-ldap +PLIST_SUB+= LDAP="@comment " .endif -.if ${PORT_OPTIONS:MH323} -CONFIGURE_ARGS+= --enable-h323 +.if defined(WITH_PLUGINS) +PLIST_SUB+= PLUGINS="" .else -CONFIGURE_ARGS+= --disable-h323 +PLIST_SUB+= PLUGINS="@comment " .endif .if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify -CONFIGURE_ARGS+= --enable-notify +LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify +CONFIGURE_ARGS+=--enable-notify +PLIST_SUB+= NOTIFY="" +WITH_PLUGINS= 1 .else -CONFIGURE_ARGS+= --disable-notify +CONFIGURE_ARGS+=--disable-notify +PLIST_SUB+= NOTIFY="@comment " .endif .if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= dbus-1:${PORTSDIR}/devel/dbus -CONFIGURE_ARGS+= --enable-dbus --enable-dbus-service -PLIST_SUB+= DBUS="" +LIB_DEPENDS+= libdbus-1.so:${PORTSDIR}/devel/dbus +CONFIGURE_ARGS+=--enable-dbus --enable-dbus-service +PLIST_SUB+= DBUS="" .else -CONFIGURE_ARGS+= --disable-dbus --disable-dbus-service -PLIST_SUB+= DBUS="@comment " +CONFIGURE_ARGS+=--disable-dbus --disable-dbus-service +PLIST_SUB+= DBUS="@comment " .endif .if ${PORT_OPTIONS:MGCONF} -USE_GNOME+= gconf2 -CONFIGURE_ARGS+= --enable-gconf -GCONF_SCHEMAS= ekiga.schemas -PLIST_SUB+= NO_GCONF="@comment " +USE_GNOME+= gconf2 +CONFIGURE_ARGS+=--enable-gconf +GCONF_SCHEMAS= ekiga.schemas +PLIST_SUB+= GCONF="@comment " .else -CONFIGURE_ARGS+= --disable-gconf -PLIST_SUB+= NO_GCONF="" +CONFIGURE_ARGS+=--disable-gconf +PLIST_SUB+= GCONF="" .endif .if ${PORT_OPTIONS:MEVOLUTION} -USE_GNOME+= evolutiondataserver -CONFIGURE_ARGS+= --enable-eds +USE_GNOME+= evolutiondataserver +CONFIGURE_ARGS+=--enable-eds +PLIST_SUB+= EVOLUTION="" +WITH_PLUGINS= 1 .else -CONFIGURE_ARGS+= --disable-eds +CONFIGURE_ARGS+=--disable-eds +PLIST_SUB+= EVOLUTION="@comment " .endif .if ${PORT_OPTIONS:MAVAHI} -CONFIGURE_ARGS+= --enable-avahi -LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app +CONFIGURE_ARGS+=--enable-avahi +LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app +PLIST_SUB+= AVAHI="" +WITH_PLUGINS= 1 .else -CONFIGURE_ARGS+= --disable-avahi -.endif - -.if ${PORT_OPTIONS:MGCONFEDITOR} -RUN_DEPENDS+= ${LOCALBASE}/bin/gconf-editor:${PORTSDIR}/sysutils/gconf-editor +CONFIGURE_ARGS+=--disable-avahi +PLIST_SUB+= AVAHI="@comment " .endif .if ${PORT_OPTIONS:MGNOMEHELP} -PLIST_SUB+= GNOMEHELP="" -USE_GNOME+= gnomedocutils +PLIST_SUB+= GNOMEHELP="" +USE_GNOME+= gnomedocutils .else -CONFIGURE_ARGS+= --disable-gdu -PLIST_SUB+= GNOMEHELP="@comment " +CONFIGURE_ARGS+=--disable-gdu +PLIST_SUB+= GNOMEHELP="@comment " .endif -post-patch: - @${REINPLACE_CMD} -e 's/V4L="enabled"/V4L="disabled"/' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's?^\(KDE_CFLAGS.*\)$$?\1 -I'"${KDE4_PREFIX}/include?" ${WRKSRC}/lib/engine/components/kde/Makefile.in - -post-configure: - @${REINPLACE_CMD} -e 's?^\(CPPFLAGS\) =\(.*\)$$?\1 = '"-I${LOCALBASE}/include"' \2?' ${WRKSRC}/lib/engine/addressbook/Makefile - .include Modified: head/net-im/ekiga/distinfo ============================================================================== --- head/net/ekiga3/distinfo Fri Sep 20 20:10:22 2013 (r327744) +++ head/net-im/ekiga/distinfo Fri Sep 20 21:50:39 2013 (r327751) @@ -1,2 +1,2 @@ -SHA256 (gnome2/ekiga-3.2.6.tar.gz) = 92e91a92fa13c9634c9cc35282a6db0f0d0bd4fed999d343bb54f9c993bc873f -SIZE (gnome2/ekiga-3.2.6.tar.gz) = 9939808 +SHA256 (gnome3/ekiga-4.0.1.tar.xz) = 5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b +SIZE (gnome3/ekiga-4.0.1.tar.xz) = 8339364 Modified: head/net-im/ekiga/files/patch-configure ============================================================================== --- head/net/ekiga3/files/patch-configure Fri Sep 20 20:10:22 2013 (r327744) +++ head/net-im/ekiga/files/patch-configure Fri Sep 20 21:50:39 2013 (r327751) @@ -1,20 +1,11 @@ ---- configure.orig 2010-08-28 15:04:35.000000000 -0400 -+++ configure 2010-08-28 15:05:31.000000000 -0400 -@@ -17255,7 +17255,7 @@ if test -n "$PKG_CONFIG"; then - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null` -+ pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" "gtk+-2.0" 2>/dev/null` - else - pkg_failed=yes +--- configure.orig 2013-07-11 12:30:00.000000000 +0200 ++++ configure 2013-07-11 12:31:26.000000000 +0200 +@@ -18351,7 +18351,7 @@ + # Check whether --enable-gconf was given. + if test "${enable_gconf+set}" = set; then : + enableval=$enable_gconf; if test "x$enableval" = "xyes"; then +- enable_gconf = yes ++ enable_gconf=yes fi -@@ -17273,7 +17273,7 @@ if test -n "$PKG_CONFIG"; then - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null` -+ pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" "gtk+-2.0" 2>/dev/null` else - pkg_failed=yes - fi + enable_gconf=yes Modified: head/net-im/ekiga/pkg-descr ============================================================================== --- head/net/ekiga3/pkg-descr Fri Sep 20 20:10:22 2013 (r327744) +++ head/net-im/ekiga/pkg-descr Fri Sep 20 21:50:39 2013 (r327751) @@ -2,4 +2,4 @@ Ekiga (formely known as GnomeMeeting) is VoIP and video conferencing application for GNOME/KDE. Ekiga uses both the H.323 and SIP protocols. -WWW: http://ekiga.org +WWW: http://www.ekiga.org Modified: head/net-im/ekiga/pkg-plist ============================================================================== --- head/net/ekiga3/pkg-plist Fri Sep 20 20:10:22 2013 (r327744) +++ head/net-im/ekiga/pkg-plist Fri Sep 20 21:50:39 2013 (r327751) @@ -1,97 +1,23 @@ bin/ekiga bin/ekiga-config-tool %%DBUS%%bin/ekiga-helper -%%NO_GCONF%%etc/ekiga/ekiga.schemas -share/locale/am/LC_MESSAGES/ekiga.mo -share/locale/ar/LC_MESSAGES/ekiga.mo -share/locale/as/LC_MESSAGES/ekiga.mo -share/locale/az/LC_MESSAGES/ekiga.mo -share/locale/be/LC_MESSAGES/ekiga.mo -share/locale/bg/LC_MESSAGES/ekiga.mo -share/locale/bn/LC_MESSAGES/ekiga.mo -share/locale/bn_IN/LC_MESSAGES/ekiga.mo -share/locale/bs/LC_MESSAGES/ekiga.mo -share/locale/ca/LC_MESSAGES/ekiga.mo -share/locale/ca@valencia/LC_MESSAGES/ekiga.mo -share/locale/crh/LC_MESSAGES/ekiga.mo -share/locale/cs/LC_MESSAGES/ekiga.mo -share/locale/cy/LC_MESSAGES/ekiga.mo -share/locale/da/LC_MESSAGES/ekiga.mo -share/locale/de/LC_MESSAGES/ekiga.mo -share/locale/dz/LC_MESSAGES/ekiga.mo -share/locale/el/LC_MESSAGES/ekiga.mo -share/locale/en_CA/LC_MESSAGES/ekiga.mo -share/locale/en_GB/LC_MESSAGES/ekiga.mo -share/locale/eo/LC_MESSAGES/ekiga.mo -share/locale/es/LC_MESSAGES/ekiga.mo -share/locale/et/LC_MESSAGES/ekiga.mo -share/locale/eu/LC_MESSAGES/ekiga.mo -share/locale/fa/LC_MESSAGES/ekiga.mo -share/locale/fi/LC_MESSAGES/ekiga.mo -share/locale/fr/LC_MESSAGES/ekiga.mo -share/locale/ga/LC_MESSAGES/ekiga.mo -share/locale/gl/LC_MESSAGES/ekiga.mo -share/locale/gu/LC_MESSAGES/ekiga.mo -share/locale/he/LC_MESSAGES/ekiga.mo -share/locale/hi/LC_MESSAGES/ekiga.mo -share/locale/hr/LC_MESSAGES/ekiga.mo -share/locale/hu/LC_MESSAGES/ekiga.mo -share/locale/id/LC_MESSAGES/ekiga.mo -share/locale/is/LC_MESSAGES/ekiga.mo -share/locale/it/LC_MESSAGES/ekiga.mo -share/locale/ja/LC_MESSAGES/ekiga.mo -share/locale/ka/LC_MESSAGES/ekiga.mo -share/locale/kn/LC_MESSAGES/ekiga.mo -share/locale/ko/LC_MESSAGES/ekiga.mo -share/locale/ku/LC_MESSAGES/ekiga.mo -share/locale/lt/LC_MESSAGES/ekiga.mo -share/locale/lv/LC_MESSAGES/ekiga.mo -share/locale/mai/LC_MESSAGES/ekiga.mo -share/locale/mk/LC_MESSAGES/ekiga.mo -share/locale/ml/LC_MESSAGES/ekiga.mo -share/locale/mn/LC_MESSAGES/ekiga.mo -share/locale/mr/LC_MESSAGES/ekiga.mo -share/locale/ms/LC_MESSAGES/ekiga.mo -share/locale/nb/LC_MESSAGES/ekiga.mo -share/locale/ne/LC_MESSAGES/ekiga.mo -share/locale/nl/LC_MESSAGES/ekiga.mo -share/locale/nn/LC_MESSAGES/ekiga.mo -share/locale/oc/LC_MESSAGES/ekiga.mo -share/locale/or/LC_MESSAGES/ekiga.mo -share/locale/pa/LC_MESSAGES/ekiga.mo -share/locale/pl/LC_MESSAGES/ekiga.mo -share/locale/pt/LC_MESSAGES/ekiga.mo -share/locale/pt_BR/LC_MESSAGES/ekiga.mo -share/locale/ro/LC_MESSAGES/ekiga.mo -share/locale/ru/LC_MESSAGES/ekiga.mo -share/locale/rw/LC_MESSAGES/ekiga.mo -share/locale/si/LC_MESSAGES/ekiga.mo -share/locale/sk/LC_MESSAGES/ekiga.mo -share/locale/sl/LC_MESSAGES/ekiga.mo -share/locale/sq/LC_MESSAGES/ekiga.mo -share/locale/sr/LC_MESSAGES/ekiga.mo -share/locale/sr@latin/LC_MESSAGES/ekiga.mo -share/locale/sv/LC_MESSAGES/ekiga.mo -share/locale/ta/LC_MESSAGES/ekiga.mo -share/locale/te/LC_MESSAGES/ekiga.mo -share/locale/th/LC_MESSAGES/ekiga.mo -share/locale/tr/LC_MESSAGES/ekiga.mo -share/locale/uk/LC_MESSAGES/ekiga.mo -share/locale/vi/LC_MESSAGES/ekiga.mo -share/locale/wa/LC_MESSAGES/ekiga.mo -share/locale/xh/LC_MESSAGES/ekiga.mo -share/locale/zh_CN/LC_MESSAGES/ekiga.mo -share/locale/zh_HK/LC_MESSAGES/ekiga.mo -share/locale/zh_TW/LC_MESSAGES/ekiga.mo +%%GCONF%%etc/ekiga/ekiga.schemas +lib/ekiga/%%VERSION%%/libekiga.so +lib/ekiga/%%VERSION%%/libekiga.la +%%AVAHI%%lib/ekiga/%%VERSION%%/plugins/libgmavahi.so +%%AVAHI%%lib/ekiga/%%VERSION%%/plugins/libgmavahi.la +%%EVOLUTION%%lib/ekiga/4.0.1/plugins/libgmevolution.la +%%EVOLUTION%%lib/ekiga/4.0.1/plugins/libgmevolution.so +%%LDAP%%lib/ekiga/4.0.1/plugins/libgmldap.la +%%LDAP%%lib/ekiga/4.0.1/plugins/libgmldap.so +%%NOTIFY%%lib/ekiga/%%VERSION%%/plugins/libgmlibnotify.so +%%NOTIFY%%lib/ekiga/%%VERSION%%/plugins/libgmlibnotify.la share/applications/ekiga.desktop %%DBUS%%share/dbus-1/services/org.ekiga.Ekiga.service %%DBUS%%share/dbus-1/services/org.ekiga.Helper.service %%GNOMEHELP%%share/gnome/help/ekiga/C/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/lumi.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_window.png %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d1.png %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d2.png %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d3.png @@ -100,13 +26,26 @@ share/applications/ekiga.desktop %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d6.png %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d7.png %%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/lumi.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d9.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/roster.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/addressbook_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/addressbook_d2.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/addressbook_d3.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/chat_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/status.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_history.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_ekiga_net.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_ekiga_call_out.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_sip.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_h323.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/monitoring_lines.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/audio_codecs.png +%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/video_codecs.png %%GNOMEHELP%%share/gnome/help/ekiga/bg/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/lumi.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_window.png %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d1.png %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d2.png %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d3.png @@ -115,13 +54,26 @@ share/applications/ekiga.desktop %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d6.png %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d7.png %%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/lumi.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d9.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/roster.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/addressbook_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/addressbook_d2.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/addressbook_d3.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/chat_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/status.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_history.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_ekiga_net.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_ekiga_call_out.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_sip.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_h323.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/monitoring_lines.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/audio_codecs.png +%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/video_codecs.png %%GNOMEHELP%%share/gnome/help/ekiga/ca/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/lumi.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_window.png %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d1.png %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d2.png %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d3.png @@ -130,13 +82,26 @@ share/applications/ekiga.desktop %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d6.png %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d7.png %%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/lumi.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d9.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/roster.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/addressbook_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/addressbook_d2.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/addressbook_d3.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/chat_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/status.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_history.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_ekiga_net.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_ekiga_call_out.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_sip.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_h323.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/monitoring_lines.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/audio_codecs.png +%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/video_codecs.png %%GNOMEHELP%%share/gnome/help/ekiga/de/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/lumi.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_window.png %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d1.png %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d2.png %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d3.png @@ -145,13 +110,26 @@ share/applications/ekiga.desktop %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d6.png %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d7.png %%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/lumi.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d9.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/roster.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/addressbook_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/addressbook_d2.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/addressbook_d3.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/chat_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/status.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_history.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_ekiga_net.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_ekiga_call_out.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_sip.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_h323.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/monitoring_lines.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/audio_codecs.png +%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/video_codecs.png %%GNOMEHELP%%share/gnome/help/ekiga/el/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_d1.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_h323.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_sip.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/audio_codecs.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/lumi.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_window.png %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d1.png %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d2.png %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d3.png @@ -160,13 +138,26 @@ share/applications/ekiga.desktop %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d6.png %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d7.png %%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d8.png -%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/lumi.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d9.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/roster.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/addressbook_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/addressbook_d2.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/addressbook_d3.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/chat_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/status.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_history.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_d1.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_ekiga_net.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_ekiga_call_out.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_sip.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_h323.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/monitoring_lines.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/audio_codecs.png +%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/video_codecs.png %%GNOMEHELP%%share/gnome/help/ekiga/en_GB/ekiga.xml -%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_d1.png *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***