summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/aqualung/Makefile3
-rw-r--r--audio/gstreamer-plugins-speex/Makefile2
-rw-r--r--audio/icecast2/Makefile4
-rw-r--r--audio/libshout2/Makefile4
-rw-r--r--audio/moc/Makefile3
-rw-r--r--audio/sdl_sound/Makefile4
-rw-r--r--audio/sweep/Makefile4
-rw-r--r--audio/vorbis-tools/Makefile4
-rw-r--r--audio/xmms-speex/Makefile4
-rw-r--r--games/alephone/Makefile4
-rw-r--r--games/glob2/Makefile4
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common2
-rw-r--r--multimedia/gstreamer-plugins80/Makefile.common2
-rw-r--r--multimedia/libxine/Makefile4
-rw-r--r--multimedia/mplayer/Makefile4
-rw-r--r--multimedia/vlc-devel/Makefile3
-rw-r--r--multimedia/vlc/Makefile4
-rw-r--r--net-im/libjingle/Makefile4
-rw-r--r--net/asterisk-bristuff/Makefile4
-rw-r--r--net/asterisk/Makefile4
-rw-r--r--net/asterisk10/Makefile4
-rw-r--r--net/asterisk12/Makefile4
-rw-r--r--net/asterisk14/Makefile4
-rw-r--r--net/asterisk16/Makefile4
-rw-r--r--net/linphone-base/Makefile2
-rw-r--r--net/linphone-base/Makefile.common2
-rw-r--r--net/linphone-base/files/patch-configure59
-rw-r--r--net/openh323/Makefile4
-rw-r--r--net/twinkle/Makefile4
29 files changed, 51 insertions, 107 deletions
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 060b9c831caf..8dc1fef4982f 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -7,6 +7,7 @@
PORTNAME= aqualung
DISTVERSION= 0.9beta7
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF
@@ -19,7 +20,7 @@ LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack \
FLAC.7:${PORTSDIR}/audio/flac \
vorbis.3:${PORTSDIR}/audio/libvorbis \
oggz.3:${PORTSDIR}/audio/liboggz \
- speex.3:${PORTSDIR}/audio/speex \
+ speex.1:${PORTSDIR}/audio/speex \
mad.2:${PORTSDIR}/audio/libmad \
modplug.0:${PORTSDIR}/audio/libmodplug \
mpcdec.4:${PORTSDIR}/audio/libmpcdec \
diff --git a/audio/gstreamer-plugins-speex/Makefile b/audio/gstreamer-plugins-speex/Makefile
index 5ed23593b2a3..cd5c8280d623 100644
--- a/audio/gstreamer-plugins-speex/Makefile
+++ b/audio/gstreamer-plugins-speex/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
COMMENT= Gstreamer speex voice plugin
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 1728ed7410c1..3af4277d19cb 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icecast2
PORTVERSION= 2.3.1
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= audio net ipv6
MASTER_SITES= http://svn.xiph.org/releases/icecast/
@@ -18,7 +18,7 @@ COMMENT= A streaming mp3/ogg-vorbis audio server
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
shout.5:${PORTSDIR}/audio/libshout2 \
- speex.3:${PORTSDIR}/audio/speex \
+ speex.1:${PORTSDIR}/audio/speex \
theora.2:${PORTSDIR}/multimedia/libtheora \
vorbis.3:${PORTSDIR}/audio/libvorbis \
xslt.2:${PORTSDIR}/textproc/libxslt
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 2d0a3cacbbdd..b923f4b6d224 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libshout2
PORTVERSION= 2.2
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= audio net
MASTER_SITES= http://downloads.xiph.org/releases/libshout/
@@ -16,7 +16,7 @@ DISTNAME= libshout-${PORTVERSION}
MAINTAINER= lofi@freebsd.org
COMMENT= Routines for connecting and transmitting data to the icecast server
-LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
theora.2:${PORTSDIR}/multimedia/libtheora \
vorbis.3:${PORTSDIR}/audio/libvorbis
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index ce92f2bdb0c2..261766bed748 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= moc
PORTVERSION= 2.4.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ftp://ftp.daper.net/pub/soft/moc/stable/
@@ -97,7 +98,7 @@ CONFIGURE_ARGS+= --without-sndfile
.endif
.if defined(WITH_SPEEX)
-LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
+LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
PLIST_FILES+= lib/moc/decoder_plugins/libspeex_decoder.la \
lib/moc/decoder_plugins/libspeex_decoder.so
.else
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index 66c758d935a6..90dcca39147f 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sdl_sound
PORTVERSION= 1.0.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://www.icculus.org/SDL_sound/downloads/
DISTNAME= SDL_sound-${PORTVERSION}
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --disable-smpeg
.endif
.if !defined(WITHOUT_SPEEX)
-LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
+LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
.else
CONFIGURE_ARGS+= --disable-speex
.endif
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 063187d2fb3e..3f55053cfaee 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sweep
PORTVERSION= 0.9.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT= A sound editor for the GNOME/GTK 2.0 desktop
LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
samplerate.1:${PORTSDIR}/audio/libsamplerate \
vorbis.3:${PORTSDIR}/audio/libvorbis \
- speex.3:${PORTSDIR}/audio/speex \
+ speex.1:${PORTSDIR}/audio/speex \
mad.2:${PORTSDIR}/audio/mad
USE_BZIP2= yes
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index fe5a04cf5ee2..08e3aa507f7e 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vorbis-tools
PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 3
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/vorbis/
@@ -18,7 +18,7 @@ COMMENT= Play, encode, and manage Ogg Vorbis files
LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
curl.4:${PORTSDIR}/ftp/curl \
FLAC.7:${PORTSDIR}/audio/flac \
- speex.3:${PORTSDIR}/audio/speex \
+ speex.1:${PORTSDIR}/audio/speex \
vorbis.3:${PORTSDIR}/audio/libvorbis
USE_GETTEXT= yes
diff --git a/audio/xmms-speex/Makefile b/audio/xmms-speex/Makefile
index 92df52daa5a8..d0e2da10e332 100644
--- a/audio/xmms-speex/Makefile
+++ b/audio/xmms-speex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmms-speex
PORTVERSION= 0.9.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://jzb.rapanden.dk/pub/
DISTNAME= speex-xmms-${PORTVERSION}
@@ -16,7 +16,7 @@ MAINTAINER= dyeske@yahoo.com
COMMENT= XMMS input plugin to play speex files
BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
PLIST_FILES= lib/xmms/Input/libspeex.so
diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 6555dd23efe1..6eeef5f590ff 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alephone
PORTVERSION= 20061202
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= marathon
@@ -17,7 +17,7 @@ MAINTAINER= ray@cultofray.net
COMMENT= The open source version of Bungie's Marathon game
BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost
-LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index eba00d812001..f90fc6f9530e 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glob2
PORTVERSION= 0.8.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://globulation2.org/releases/${PORTVERSION}/
@@ -16,7 +16,7 @@ COMMENT= Globulation 2 - a free and innovative strategy game
BUILD_DEPENDS= ${LOCALBASE}/include/boost/rational.hpp:${PORTSDIR}/devel/boost
LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
- speex.3:${PORTSDIR}/audio/speex \
+ speex.1:${PORTSDIR}/audio/speex \
freetype.9:${PORTSDIR}/print/freetype2
USE_SDL= image net sdl ttf
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 4bfd23e2e140..aae69207523c 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -317,7 +317,7 @@ gst_spc_LIB_DEPENDS+= OpenSPC.3:${PORTSDIR}/audio/openspc
gst_spc_DIST= bad
# speex
-gst_speex_LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
+gst_speex_LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
# swfdec
gst_swfdec_LIB_DEPENDS+=swfdec-0.3.0:${PORTSDIR}/graphics/swfdec
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
index 9fe234687421..41d65365895d 100644
--- a/multimedia/gstreamer-plugins80/Makefile.common
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -479,7 +479,7 @@ USE_GNOME+= gtk20
# speex
.if ${GST_PLUGIN}=="speex"
-LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
+LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
.endif
# swfdec
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 510e861560b2..64dcb23ed0b2 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xine
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +20,7 @@ COMMENT= Libraries for xine multimedia player
BUILD_DEPENDS= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
LIB_DEPENDS= FLAC.7:${PORTSDIR}/audio/flac \
vorbis.3:${PORTSDIR}/audio/libvorbis \
- speex.3:${PORTSDIR}/audio/speex \
+ speex.1:${PORTSDIR}/audio/speex \
mng.1:${PORTSDIR}/graphics/libmng \
png.5:${PORTSDIR}/graphics/png \
dvdread.3:${PORTSDIR}/multimedia/libdvdread \
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 2df58db63e9c..60b3aad4a6f7 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -84,7 +84,7 @@
PORTNAME= mplayer
PORTVERSION= 0.99.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia audio
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -531,7 +531,7 @@ CONFIGURE_ARGS+= --disable-ladspa
.if !defined(WITHOUT_SPEEX)
CONFIGURE_ARGS+= --enable-speex
-LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
+LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
.else
CONFIGURE_ARGS+= --disable-speex
.endif
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index ed681d8bbd58..ab07584630a3 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -10,6 +10,7 @@
PORTNAME= vlc
DISTVERSION= 0.8.6a
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \
@@ -494,7 +495,7 @@ CONFIGURE_ARGS+=--disable-slp
.endif
.if !defined(WITHOUT_SPEEX)
-LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
+LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
CONFIGURE_ARGS+=--enable-speex
CPPFLAGS+=-I${LOCALBASE}/include/speex
.else
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 218bbf7ce3ef..8d8c8723fbc2 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -10,7 +10,7 @@
PORTNAME= vlc
DISTVERSION= 0.8.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
@@ -444,7 +444,7 @@ CONFIGURE_ARGS+=--disable-slp
.endif
.if !defined(WITHOUT_SPEEX)
-LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
+LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
CONFIGURE_ARGS+=--enable-speex
CPPFLAGS+=-I${LOCALBASE}/include/speex
.else
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index 0762bdcf6063..cbee98fbdf3a 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libjingle
PORTVERSION= 0.3.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT= Google Talk's implementation of Jingle and Jingle-Audio
BUILD_DEPENDS= \
pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= \
- speex.3:${PORTSDIR}/audio/speex \
+ speex.1:${PORTSDIR}/audio/speex \
ilbc.0:${PORTSDIR}/net/ilbc \
ortp.5:${PORTSDIR}/net/ortp \
expat.6:${PORTSDIR}/textproc/expat2
diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index 5c62b4a4ef3e..6f09b56e1369 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.2.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
@@ -24,7 +24,7 @@ MAINTAINER= fjoe@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
newt.51:${PORTSDIR}/devel/newt \
curl.4:${PORTSDIR}/ftp/curl
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index e8a54877d30c..084330745cb8 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.2.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
@@ -24,7 +24,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
newt.51:${PORTSDIR}/devel/newt \
curl.4:${PORTSDIR}/ftp/curl
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index e8a54877d30c..084330745cb8 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.2.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
@@ -24,7 +24,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
newt.51:${PORTSDIR}/devel/newt \
curl.4:${PORTSDIR}/ftp/curl
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index e8a54877d30c..084330745cb8 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.2.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
@@ -24,7 +24,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
newt.51:${PORTSDIR}/devel/newt \
curl.4:${PORTSDIR}/ftp/curl
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index e8a54877d30c..084330745cb8 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.2.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
@@ -24,7 +24,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
newt.51:${PORTSDIR}/devel/newt \
curl.4:${PORTSDIR}/ftp/curl
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index e8a54877d30c..084330745cb8 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.2.13
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
@@ -24,7 +24,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
newt.51:${PORTSDIR}/devel/newt \
curl.4:${PORTSDIR}/ftp/curl
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index 8990a739580b..413a7aafaf51 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -24,7 +24,7 @@ EXPIRATION_DATE=2007-01-01
LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm \
jack.0:${PORTSDIR}/audio/jack \
samplerate.1:${PORTSDIR}/audio/libsamplerate \
- speex.3:${PORTSDIR}/audio/speex \
+ speex.1:${PORTSDIR}/audio/speex \
osip2.3:${PORTSDIR}/net/libosip2
USE_GNOME= glib20 gnomehack gnometarget intlhack pkgconfig
diff --git a/net/linphone-base/Makefile.common b/net/linphone-base/Makefile.common
index 13cceac03ac7..2b7c2a7fc832 100644
--- a/net/linphone-base/Makefile.common
+++ b/net/linphone-base/Makefile.common
@@ -4,7 +4,7 @@
LINPHONE_PORTNAME= linphone
LINPHONE_PORTVERSION= 1.3.5
-LINPHONE_PORTREVISION= 0
+LINPHONE_PORTREVISION= 1
LINPHONE_PORTEPOCH= 1
LINPHONE_MASTER_SITES= http://simon.morlat.free.fr/download/stable/source/
diff --git a/net/linphone-base/files/patch-configure b/net/linphone-base/files/patch-configure
index 38e35fd9e371..1e56a72a2c1e 100644
--- a/net/linphone-base/files/patch-configure
+++ b/net/linphone-base/files/patch-configure
@@ -24,62 +24,3 @@
found_sound=no
-@@ -27917,12 +27900,12 @@
- pkg_cv_SPEEX_CFLAGS="$SPEEX_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speex >= 1.1.12\"") >&5
-- ($PKG_CONFIG --exists --print-errors "speex >= 1.1.12") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speex >= 1.0.5\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "speex >= 1.0.5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_SPEEX_CFLAGS=`$PKG_CONFIG --cflags "speex >= 1.1.12" 2>/dev/null`
-+ pkg_cv_SPEEX_CFLAGS=`$PKG_CONFIG --cflags "speex >= 1.0.5" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -27935,12 +27918,12 @@
- pkg_cv_SPEEX_LIBS="$SPEEX_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speex >= 1.1.12\"") >&5
-- ($PKG_CONFIG --exists --print-errors "speex >= 1.1.12") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speex >= 1.0.5\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "speex >= 1.0.5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_SPEEX_LIBS=`$PKG_CONFIG --libs "speex >= 1.1.12" 2>/dev/null`
-+ pkg_cv_SPEEX_LIBS=`$PKG_CONFIG --libs "speex >= 1.0.5" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -27959,14 +27942,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "speex >= 1.1.12"`
-+ SPEEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "speex >= 1.0.5"`
- else
-- SPEEX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "speex >= 1.1.12"`
-+ SPEEX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "speex >= 1.0.5"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$SPEEX_PKG_ERRORS" >&5
-
-- { { echo "$as_me:$LINENO: error: Package requirements (speex >= 1.1.12) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements (speex >= 1.0.5) were not met:
-
- $SPEEX_PKG_ERRORS
-
-@@ -27977,7 +27960,7 @@
- and SPEEX_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--echo "$as_me: error: Package requirements (speex >= 1.1.12) were not met:
-+echo "$as_me: error: Package requirements (speex >= 1.0.5) were not met:
-
- $SPEEX_PKG_ERRORS
-
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 744de96269be..4f1084603992 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openh323
PORTVERSION= 1.18.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.voxgratia.org/releases/
DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --enable-rfc2190avcodec=${LOCALBASE}/include/ffmpeg
.endif
.ifdef (WITH_SPEEX)
-LIB_DEPENDS+= speex.3:${PORTSDIR}/audio/speex
+LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
CONFIGURE_ARGS+= --enable-localspeex=no
.else
CONFIGURE_ARGS+= --enable-localspeex=yes
diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile
index 8c8de31b93a8..864b04af2fb7 100644
--- a/net/twinkle/Makefile
+++ b/net/twinkle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= twinkle
PORTVERSION= 0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.xs4all.nl/~mfnboer/twinkle/download/
@@ -19,7 +19,7 @@ LIB_DEPENDS= ccgnu2-1.5.0:${PORTSDIR}/devel/commoncpp \
ccrtp1-1.5.0:${PORTSDIR}/devel/ccrtp \
sndfile.1:${PORTSDIR}/audio/libsndfile \
boost_regex.3:${PORTSDIR}/devel/boost \
- speex.3:${PORTSDIR}/audio/speex \
+ speex.1:${PORTSDIR}/audio/speex \
ilbc.0:${PORTSDIR}/net/ilbc \
zrtpcpp-0.9.0:${PORTSDIR}/devel/libzrtpcpp