New version

(Portage version: 2.0.51-r15)

6 files changed, 153 insertions, 6 deletions

diff --git a/net-misc/asterisk-oh323/ChangeLog b/net-misc/asterisk-oh323/ChangeLog
index 94cc7eb3c441..f757fe17658f 100644
--- a/net-misc/asterisk-oh323/ChangeLog
+++ b/net-misc/asterisk-oh323/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/asterisk-oh323
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/ChangeLog,v 1.3 2004/06/24 23:35:05 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/ChangeLog,v 1.4 2005/03/10 01:44:19 stkn Exp $
+
+*asterisk-oh323-0.6.5 (10 Mar 2005)
+
+  10 Mar 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/asterisk-oh323-0.6.5-Makefile.patch, +asterisk-oh323-0.6.5.ebuild:
+  New version. Using openh323 and pwlib headers in /usr/include from now on.
+  Debug use-flag enables Wraptracing if needed.
 
 *asterisk-oh323-0.5.10 (12 Mar 2004)
 
diff --git a/net-misc/asterisk-oh323/asterisk-oh323-0.5.10.ebuild b/net-misc/asterisk-oh323/asterisk-oh323-0.5.10.ebuild
index dd7ab3b2aa9e..05e77dece31a 100644
--- a/net-misc/asterisk-oh323/asterisk-oh323-0.5.10.ebuild
+++ b/net-misc/asterisk-oh323/asterisk-oh323-0.5.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/asterisk-oh323-0.5.10.ebuild,v 1.2 2004/06/24 23:35:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/asterisk-oh323-0.5.10.ebuild,v 1.3 2005/03/10 01:44:19 stkn Exp $
 
 inherit eutils
 
diff --git a/net-misc/asterisk-oh323/asterisk-oh323-0.5.9.ebuild b/net-misc/asterisk-oh323/asterisk-oh323-0.5.9.ebuild
index 2a11e332040d..be6bf1eac790 100644
--- a/net-misc/asterisk-oh323/asterisk-oh323-0.5.9.ebuild
+++ b/net-misc/asterisk-oh323/asterisk-oh323-0.5.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/asterisk-oh323-0.5.9.ebuild,v 1.3 2004/06/24 23:35:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/asterisk-oh323-0.5.9.ebuild,v 1.4 2005/03/10 01:44:19 stkn Exp $
 
 IUSE=""
 
diff --git a/net-misc/asterisk-oh323/asterisk-oh323-0.6.5.ebuild b/net-misc/asterisk-oh323/asterisk-oh323-0.6.5.ebuild
new file mode 100644
index 000000000000..6dd6223c7057
--- /dev/null
+++ b/net-misc/asterisk-oh323/asterisk-oh323-0.6.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-oh323/asterisk-oh323-0.6.5.ebuild,v 1.1 2005/03/10 01:44:19 stkn Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="debug"
+
+DESCRIPTION="H.323 Support for the Asterisk soft PBX"
+HOMEPAGE="http://www.inaccessnetworks.com/projects/asterisk-oh323/"
+SRC_URI="http://www.inaccessnetworks.com/projects/asterisk-oh323/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+DEPEND="~dev-libs/pwlib-1.6.6
+	~net-libs/openh323-1.13.5
+	>=net-misc/asterisk-1.0.0"
+
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-Makefile.patch
+
+	# add -fPIC and use our own flags
+	append-flags -fPIC
+
+	sed -i  -e "s:^\(CPPFLAGS=\)\(.*\):\1 ${CXXFLAGS} \2:" \
+		-e "s:^\(CFLAGS=\)\(.*\):\1 ${CFLAGS} \2:" \
+		Makefile
+
+	# disable wraptracing if you dont need it
+	if ! use debug; then
+		sed -i -e "s:^\(WRAPTRACING\).*:\1=0:" Makefile
+	fi
+}
+
+src_compile() {
+	# NOTRACE=1 is set in the Makefile
+	# emake breaks version detection for pwlib and openh323
+	make || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}
diff --git a/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.5-Makefile.patch b/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.5-Makefile.patch
new file mode 100644
index 000000000000..0588c14381ed
--- /dev/null
+++ b/net-misc/asterisk-oh323/files/asterisk-oh323-0.6.5-Makefile.patch
@@ -0,0 +1,91 @@
+--- asterisk-oh323-0.6.5/Makefile.orig	2004-11-03 12:52:59.000000000 +0100
++++ asterisk-oh323-0.6.5/Makefile	2005-03-09 06:26:56.042637240 +0100
+@@ -49,7 +49,7 @@
+ # compile asterisk-oh323. Do not use the installed library of your
+ # distribution. It won't work.
+ #
+-PWLIBDIR=/root/src/oh323/pwlib
++PWLIBDIR=/usr/share/pwlib
+ 
+ #
+ # Set OPENH323LIBDIR variable to the directory containing the sources of
+@@ -59,13 +59,13 @@
+ # compile asterisk-oh323. Do not use the installed library of your
+ # distribution. It won't work.
+ #
+-OPENH323DIR=/root/src/oh323/openh323
++OPENH323DIR=/usr/share/openh323
+ 
+ #
+ # Set ASTERISKINCDIR variable to the directory containing the include files of
+ # Asterisk PBX.
+ #
+-ASTERISKINCDIR=/root/src/asterisk/include
++ASTERISKINCDIR=/usr/include
+ 
+ #
+ # Set ASTERISKMODDIR variable to the directory where ASTERISK's modules reside.
+@@ -91,7 +91,7 @@
+ #
+ # Note: This directory is created under $DESTDIR.
+ #
+-OH323WRAPLIBDIR=/usr/local/lib
++OH323WRAPLIBDIR=/usr/lib
+ 
+ #
+ # Set SSLINCDIR variable to the directory where ssl/crypto
+@@ -121,7 +121,7 @@
+ # With this flag on the channel driver is huge, in size, but Asterisk boots
+ # faster!
+ #
+-OH323STAT=1
++OH323STAT=0
+ 
+ #
+ # Define options that were used during Asterisk compilation
+@@ -137,7 +137,7 @@
+ #NOVIDEO=1
+ #NO_SPEEX=1
+ #NOAUDIOCODECS=1
+-#NOTRACE=1
++NOTRACE=1
+ #NO_IPv6=1
+ #P_PTHREADS=1
+ 
+@@ -165,13 +165,9 @@
+ AR=ar
+ STRIP=strip
+ STRIPFLAGS=
+-OH323WRAPINCLUDE= \
+-				 -I$(PWLIBDIR)/include/ptlib/unix \
+-				 -I$(PWLIBDIR)/include \
+-				 -I$(OPENH323DIR)/include \
+-				 -I$(OPENH323DIR)/include/openh323 \
+-				 -I../asterisk-driver
+-#				 -I$(SSLINCDIR)
++OH323WRAPINCLUDE=-I$(SSLINCDIR) \
++		 -I/usr/include/openh323 \
++		 -I../asterisk-driver
+ OPENH323USERFLAGS=
+ ifdef	NOVIDEO
+ OPENH323USERFLAGS += NOVIDEO=1
+@@ -192,7 +189,7 @@
+ OPENH323USERFLAGS += P_PTHREADS=1
+ endif
+ OPENH323FLAGS=$(shell make $(OPENH323USERFLAGS) --no-print-directory -s \
+-		-C $(OPENH323DIR) \
++		-C $(OPENH323DIR) -f openh323u.mak \
+ 		PWLIBDIR=$(PWLIBDIR) OPENH323DIR=$(OPENH323DIR) ccflags)
+ CPPFLAGS=$(OPENH323FLAGS) -Wall -x c++ -Os
+ ASTERISKINCLUDE=-I$(ASTERISKINCDIR) -I../wrapper
+--- asterisk-oh323-0.6.5/asterisk-driver/Makefile.orig	2004-10-04 13:52:09.000000000 +0200
++++ asterisk-oh323-0.6.5/asterisk-driver/Makefile	2005-03-09 06:28:39.092971208 +0100
+@@ -31,6 +31,8 @@
+ TARGET=chan_oh323.so
+ TARGET_OBJ=chan_oh323.o
+ 
++OPENH323DIR=/usr
++
+ ifndef SKIP_SUFFIX
+ 	ifeq ($(OH323STAT),1)
+ 		LIBPTPATH=$(word 1,$(shell ls $(PWLIBDIR)/lib/libpt*s.a))
diff --git a/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.5 b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.5
new file mode 100644
index 000000000000..0dcb5ac8f01d
--- /dev/null
+++ b/net-misc/asterisk-oh323/files/digest-asterisk-oh323-0.6.5
@@ -0,0 +1 @@
+MD5 4cf3ff5362bb5db498f2a2dfb8b24087 asterisk-oh323-0.6.5.tar.gz 87112