diff options
Diffstat (limited to 'net/ekiga')
-rw-r--r-- | net/ekiga/Makefile | 13 | ||||
-rw-r--r-- | net/ekiga/distinfo | 12 | ||||
-rw-r--r-- | net/ekiga/patches/patch-aa | 13 | ||||
-rw-r--r-- | net/ekiga/patches/patch-ab | 35 | ||||
-rw-r--r-- | net/ekiga/patches/patch-ac | 34 | ||||
-rw-r--r-- | net/ekiga/patches/patch-ad | 32 |
6 files changed, 9 insertions, 130 deletions
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile index 6319cee6aab..2026fc64e7f 100644 --- a/net/ekiga/Makefile +++ b/net/ekiga/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2009/07/22 09:01:41 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2009/08/15 15:39:23 wiz Exp $ # -DISTNAME= ekiga-3.2.0 -PKGREVISION= 1 +DISTNAME= ekiga-3.2.5 CATEGORIES= net comms MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ekiga/3.2/} EXTRACT_SUFX= .tar.bz2 @@ -10,15 +9,16 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ekiga.org/ COMMENT= VoIP and video conferencing application for GNOME +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir PREV_PKGPATH= net/ekiga-devel USE_TOOLS+= gmake intltool msgfmt pkg-config -USE_TOOLS+= autoconf USE_PKGLOCALEDIR= yes -CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client:Q} +CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client} +CONFIGURE_ARGS+= --with-libsasl2-dir=${BUILDLINK_PREFIX.cyrus-sasl} CONFIGURE_ARGS+= --enable-gstreamer .include "options.mk" @@ -29,9 +29,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ -pre-configure: - cd ${WRKSRC} && autoconf - .include "../../audio/esound/buildlink3.mk" .include "../../databases/openldap-client/buildlink3.mk" .include "../../devel/GConf/schemas.mk" diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo index 844e3fb49a0..a8be212a550 100644 --- a/net/ekiga/distinfo +++ b/net/ekiga/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.6 2009/03/22 08:51:24 wiz Exp $ +$NetBSD: distinfo,v 1.7 2009/08/15 15:39:23 wiz Exp $ -SHA1 (ekiga-3.2.0.tar.bz2) = 6a8d6f203cd982cbfb37822b2a96f176176cd763 -RMD160 (ekiga-3.2.0.tar.bz2) = f31e94dbe03038e39fb5b50bd71372992c13ae8b -Size (ekiga-3.2.0.tar.bz2) = 7679645 bytes -SHA1 (patch-aa) = feecff1e35c7c55d63354393f2d4c4d14e36a57d -SHA1 (patch-ab) = 58f5d5c7bd341bba963a01f4aca1b08807b18127 -SHA1 (patch-ac) = e78684eaa3d26817571dd374d4beed61ee529d1b -SHA1 (patch-ad) = ae3d7eb1886b82bdfd127c256daa15304cd7e5e4 +SHA1 (ekiga-3.2.5.tar.bz2) = fc8b9ed0492ebc083655cf706048032e552d347f +RMD160 (ekiga-3.2.5.tar.bz2) = 5792890c13d376242defd0757a67c8aa7772ae23 +Size (ekiga-3.2.5.tar.bz2) = 7714135 bytes diff --git a/net/ekiga/patches/patch-aa b/net/ekiga/patches/patch-aa deleted file mode 100644 index 91936c9f907..00000000000 --- a/net/ekiga/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2009/03/18 13:08:07 jmcneill Exp $ - ---- configure.ac.orig 2009-03-16 17:42:46.000000000 -0400 -+++ configure.ac -@@ -340,6 +340,8 @@ if test "x$enable_ldap" = "xyes"; then - AC_SUBST(LDAP_LIBS) - LDAP="enabled" - AC_DEFINE(HAVE_LDAP,1,[LDAP support]) -+ -+ LDAP_LIBS="${LDAP_LIBS} -lsasl2" - fi - - AM_CONDITIONAL(HAVE_LDAP, test "x$found_ldap" = "xyes") diff --git a/net/ekiga/patches/patch-ab b/net/ekiga/patches/patch-ab deleted file mode 100644 index 3584d2923df..00000000000 --- a/net/ekiga/patches/patch-ab +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2009/03/22 08:51:24 wiz Exp $ - -http://svn.gnome.org/viewvc/ekiga?view=revision&revision=7785 - ---- lib/engine/components/gstreamer/gst-audiooutput.cpp.orig 2009-01-27 20:32:29.000000000 +0000 -+++ lib/engine/components/gstreamer/gst-audiooutput.cpp -@@ -354,8 +354,11 @@ GST::AudioOutputManager::detect_alsasink - descr = g_strdup_printf ("volume name=ekiga_volume ! alsasink device=%s", - g_value_get_string (device)); - -- devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr; -- g_free (name); -+ if (name != 0) { -+ -+ devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr; -+ g_free (name); -+ } - g_free (descr); - } - g_value_array_free (array); -@@ -400,8 +403,12 @@ GST::AudioOutputManager::detect_pulsesin - descr = g_strdup_printf ("volume name=ekiga_volume ! pulsesink device=%s", - g_value_get_string (device)); - -- devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr; -- g_free (name); -+ if (name != 0) { -+ -+ devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr; -+ -+ g_free (name); -+ } - g_free (descr); - } - g_value_array_free (array); diff --git a/net/ekiga/patches/patch-ac b/net/ekiga/patches/patch-ac deleted file mode 100644 index 2720c01bf16..00000000000 --- a/net/ekiga/patches/patch-ac +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2009/03/22 08:51:24 wiz Exp $ - -http://svn.gnome.org/viewvc/ekiga?view=revision&revision=7785 - ---- lib/engine/components/gstreamer/gst-audioinput.cpp.orig 2009-01-18 15:45:41.000000000 +0000 -+++ lib/engine/components/gstreamer/gst-audioinput.cpp -@@ -304,8 +304,11 @@ GST::AudioInputManager::detect_alsasrc_d - descr = g_strdup_printf ("alsasrc device=%s ! volume name=ekiga_volume", - g_value_get_string (device)); - -- devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr; -- g_free (name); -+ if (name != 0) { -+ -+ devices_by_name[std::pair<std::string,std::string>("ALSA", name)] = descr; -+ g_free (name); -+ } - g_free (descr); - } - g_value_array_free (array); -@@ -350,8 +353,11 @@ GST::AudioInputManager::detect_pulsesrc_ - descr = g_strdup_printf ("pulsesrc device=%s ! volume name=ekiga_volume", - g_value_get_string (device)); - -- devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr; -- g_free (name); -+ if (name != 0) { -+ -+ devices_by_name[std::pair<std::string,std::string>("PULSEAUDIO", name)] = descr; -+ g_free (name); -+ } - g_free (descr); - } - g_value_array_free (array); diff --git a/net/ekiga/patches/patch-ad b/net/ekiga/patches/patch-ad deleted file mode 100644 index c56946f17f2..00000000000 --- a/net/ekiga/patches/patch-ad +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2009/03/22 08:51:24 wiz Exp $ - -http://svn.gnome.org/viewvc/ekiga?view=revision&revision=7785 - ---- lib/engine/components/gstreamer/gst-videoinput.cpp.orig 2009-01-23 09:29:44.000000000 +0000 -+++ lib/engine/components/gstreamer/gst-videoinput.cpp -@@ -274,7 +274,11 @@ GST::VideoInputManager::detect_v4l2src_d - descr = g_strdup_printf ("v4l2src device=%s" - " ! videoscale ! ffmpegcolorspace", - g_value_get_string (device)); -- devices_by_name[std::pair<std::string,std::string>("V4L2",name)] = descr; -+ if (name != 0) { -+ -+ devices_by_name[std::pair<std::string,std::string>("V4L2",name)] = descr; -+ g_free (name); -+ } - g_free (descr); - } - -@@ -339,7 +343,11 @@ GST::VideoInputManager::detect_dv1394src - " ! videoscale" - " ! ffmpegcolorspace", - g_value_get_uint64 (guid)); -- devices_by_name[std::pair<std::string,std::string>("DV",name)] = descr; -+ if (name != 0) { -+ -+ devices_by_name[std::pair<std::string,std::string>("DV",name)] = descr; -+ g_free (name); -+ } - g_free (descr); - } - |