summaryrefslogtreecommitdiff
path: root/net/opal3
diff options
context:
space:
mode:
authorRoger Hardiman <roger@FreeBSD.org>2003-09-01 05:29:21 +0000
committerRoger Hardiman <roger@FreeBSD.org>2003-09-01 05:29:21 +0000
commit7a5003ba21345a2de88bde75c78d3af518dbf2ce (patch)
treed97c1281d6b924878d4fb3a35828c6b2e4813f6b /net/opal3
parentUpdate to 0.6.4 (diff)
Put back a patch I had accidentaly deleted which meant that IXJ support
was not compiled in. Add ldap dependency. Bump revision
Notes
Notes: svn path=/head/; revision=88247
Diffstat (limited to 'net/opal3')
-rw-r--r--net/opal3/Makefile4
-rw-r--r--net/opal3/files/patch-openh323uin30
2 files changed, 31 insertions, 3 deletions
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 727419ab0398..22a23a779a07 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openh323
PORTVERSION= 1.12.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
@@ -18,7 +19,8 @@ COMMENT= A H323 Video Conferencing library
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
-LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2 \
+ ldap.2:${PORTSDIR}/net/openldap20-client
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
diff --git a/net/opal3/files/patch-openh323uin b/net/opal3/files/patch-openh323uin
index 170eb28038b9..4613a12f810e 100644
--- a/net/opal3/files/patch-openh323uin
+++ b/net/opal3/files/patch-openh323uin
@@ -1,5 +1,5 @@
-*** openh323u.mak.in.orig Sat Aug 23 08:09:48 2003
---- openh323u.mak.in Sat Aug 23 08:10:34 2003
+*** openh323u.mak.in.orig Wed May 14 20:52:44 2003
+--- openh323u.mak.in Sun Aug 31 21:26:51 2003
*************** LIBDIRS += $(OPENH323DIR)
*** 142,152 ****
@@ -25,3 +25,29 @@
OH323_LIBDIR = $(OPENH323DIR)/lib
+*************** ifdef OH323_SUPPRESS_H235
+*** 184,189 ****
+--- 184,190 ----
+ STDCCFLAGS += -DOH323_SUPPRESS_H235
+ endif
+
++ # Check for the ixj/telephony header files on the system.
+ ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h))
+ HAS_IXJ = 1
+ STDCCFLAGS += -DHAS_IXJ
+*************** endif
+*** 197,202 ****
+--- 198,210 ----
+ ifneq (,$(wildcard /usr/local/include/sys/telephony.h))
+ HAS_IXJ = 1
+ STDCCFLAGS += -DHAS_IXJ -I/usr/local/include
++ endif
++
++ # In the FreeBSD port, we make a local copy of the ixj header files from
++ # the ixj driver in openh323/include/sys
++ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h))
++ HAS_IXJ = 1
++ STDCCFLAGS += -DHAS_IXJ
+ endif
+
+ #Check if we have an OSS soundcard.h