3 files changed, 15 insertions, 39 deletions

diff --git a/net/opal/Makefile b/net/opal/Makefile
index f6aefcd8e7cb..b724116d7666 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	opal
-PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTVERSION=	2.2.8
 CATEGORIES=	net
-MASTER_SITES=	http://www.voxgratia.org/releases/
-DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}-src-
-EXTRACT_SUFX=	tar.gz
+MASTER_SITES=	http://www.ekiga.org/admin/downloads/latest/sources/sources/
 
-MAINTAINER=	jbq@caraldi.com
+MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	VoIP abstraction library
 
-LIB_DEPENDS=	pt_r:${PORTSDIR}/devel/pwlib
+OPTIONS=	FFMPEG	"Support H263 audio/video codec"	on \
+		SPEEX	"Use speex installed by audio/speex"	on
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g}
+LIB_DEPENDS=	pt_r:${PORTSDIR}/devel/pwlib
 
 # In opal's Makefile the default make's target is optshared
 ALL_TARGET=	optshared
@@ -27,6 +25,7 @@ USE_AUTOTOOLS=	autoconf:259
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+MAKE_ARGS=	-j`${SYSCTL} -n hw.ncpu`
 
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
@@ -37,16 +36,17 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}
 # Be sure to compile position-independent objects for the shared libraries
 CFLAGS+=	-fPIC
 
-.ifdef (WITH_FFMPEG)
+.if defined(WITHOUT_FFMPEG)
+CONFIGURE_ARGS+=--disable-h263avcodec
+.else
 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=--enable-h263avcodec=${LOCALBASE}/include/ffmpeg
 .endif
 
-.ifdef (WITH_SPEEX)
-LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
-BUILD_DEPENDS+=	${LOCALBASE}/include/speex/speex_echo.h:${PORTSDIR}/audio/speex
+.if defined(WITHOUT_SPEEX)
 CONFIGURE_ARGS+=--enable-localspeex=no
 .else
+LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
 CONFIGURE_ARGS+=--enable-localspeex=yes
 .endif
 
diff --git a/net/opal/distinfo b/net/opal/distinfo
index fd4e60083302..952051fa3317 100644
--- a/net/opal/distinfo
+++ b/net/opal/distinfo
@@ -1,3 +1,3 @@
-MD5 (opal-v2_2_4-src-tar.gz) = 5f204f240bb9f2ba8cff73c9ede90d8e
-SHA256 (opal-v2_2_4-src-tar.gz) = eb2519d32f717bb33b11d78b9019f5c45a3b0ef527138efe83dfdf51a329d494
-SIZE (opal-v2_2_4-src-tar.gz) = 4107375
+MD5 (opal-2.2.8.tar.gz) = 700b0c3a7606afc0dc6c9d3c12fcb23b
+SHA256 (opal-2.2.8.tar.gz) = 890132438781c980ab5297795f049d57b13ae78b64c238c936c320adf2bd35fa
+SIZE (opal-2.2.8.tar.gz) = 4162369
diff --git a/net/opal/files/patch-configure.ac b/net/opal/files/patch-configure.ac
deleted file mode 100644
index 0ff721a18000..000000000000
--- a/net/opal/files/patch-configure.ac
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./configure.ac.orig	Tue Feb 21 00:47:28 2006
-+++ ./configure.ac	Sun Jan  7 13:01:14 2007
-@@ -60,6 +60,11 @@
-         AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PTLIB=1)
-         if test "${HAS_PTLIB:-unset}" != "unset" ; then
-           AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make/)
-+        else
-+          AC_CHECK_FILE(${prefix}/include/ptlib.h, HAS_PTLIB=1)
-+          if test "${HAS_PTLIB:-unset}" != "unset" ; then
-+            AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , ${prefix}/bin)
-+          fi
-         fi
-       fi
-     fi
-@@ -84,6 +89,9 @@
- fi
- if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
-   PWLIBDIR="/usr/local/share/pwlib/"
-+fi
-+if test "x$PWLIBDIR" = "x${prefix}"; then
-+  PWLIBDIR="${prefix}/share/pwlib/"
- fi
- 
- echo "PWLib prefix set to.... $PWLIBDIR"