(this is a repost)
Hi.
I just imported devel/pwlib into the three.
Now would be a good time to update openh323.
Comments/Ok?
--
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/openh323/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 28 Nov 2006 14:04:16 -0000 1.9
+++ Makefile 15 Apr 2007 16:26:52 -0000
@@ -1,74 +1,66 @@
# $OpenBSD: Makefile,v 1.9 2006/11/28 14:04:16 robert Exp $
-BROKEN= "Needs upgrade to newer version"
+SHARED_ONLY= Yes
-COMMENT= "H.323 Video Conferencing library"
+COMMENT= "H.323 video conferencing library"
-VERSION= 1.8.5
-DISTNAME= openh323-${VERSION}
-CATEGORIES= net
+DISTNAME= openh323-v1_18_0
+PKGNAME= openh323-1.18.0
+CATEGORIES= net devel
-HOMEPAGE= http://www.openh323.org/
+EXTRACT_SUFX= -src-tar.gz
-MAINTAINER= Damien Couderc <[EMAIL PROTECTED]>
+SHARED_LIBS= h323 1.18 # 1.18
-# MPL
+HOMEPAGE= http://www.voxgratia.org/
+
+MAINTAINER= Antoine Jacoutot <[EMAIL PROTECTED]>
+
+# MPL - LGPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://www.openh323.org/bin/ \
- http://www.de.openh323.org/bin/
+MASTER_SITES= ${HOMEPAGE}/releases/
-DISTFILES= openh323_${VERSION}.tar.gz \
- pwlib_1.2.17.tar.gz
+WANTLIB= crypto expat ossaudio pthread ssl
-BUILD_DEPENDS= ::devel/bison
-USE_GMAKE= Yes
+LIB_DEPENDS= pt.>=1::devel/pwlib \
+ speex.>=4::audio/speex \
+ avutil.>=2::graphics/ffmpeg
-VMEM_WARNING= Yes
-
-ALL_TARGET= opt
-MAKE_FLAGS= CC="${CC}" CXX="${CXX}" \
- CFLAGS="${CFLAGS} ${CXXFLAGS} -pthread"
-MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib \
- OPENH323DIR=${WRKDIR}/openh323
-
-.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "vax" || \
- ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || \
- ${MACHINE_ARCH} == "arm")
-MAKE_ENV+= ENDIAN="PLITTLE_ENDIAN"
-.else
-. if (${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" || \
- ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "powerpc" || \
- ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "mips64")
-MAKE_ENV+= ENDIAN="PBIG_ENDIAN"
-. else
-ERRORS+= "Fatal: Unknown endianness for ${MACHINE_ARCH}"
-. endif
-.endif
+WRKDIST= ${WRKDIR}/${DISTNAME:S/-/_/}
+SUBST_VARS= LOCALBASE
-WRKDIST= ${WRKDIR}
-WRKSRC= ${WRKDIST}/openh323
+USE_GMAKE= Yes
+ALL_TARGET= optshared
+NO_REGRESS= Yes
+
+CONFIGURE_STYLE=gnu
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg"
\
+ LDFLAGS="-L${LOCALBASE}/lib -pthread -lavutil"
+CONFIGURE_ARGS= --enable-h263avcodec \
+ --disable-localspeex
+
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
+CFLAGS+= -fPIC
+.endif
-PWLDIR= ${WRKDIST}/pwlib
-OPHDIR= ${WRKDIST}/openh323
+MAKE_ENV+= STDCCFLAGS="${STDCCFLAGS} -I${WRKSRC}/include" \
+ CC=${CC} CPLUS=${CXX} BUILDSELF="1"
-do-install:
- ${INSTALL_DATA} ${PWLDIR}/include/ptlib.h ${PREFIX}/include
- ${INSTALL_DATA_DIR} ${PREFIX}/include/ptclib
- ${INSTALL_DATA} ${PWLDIR}/include/ptclib/*.h ${PREFIX}/include/ptclib
- ${INSTALL_DATA_DIR} ${PREFIX}/include/ptlib
- ${INSTALL_DATA} ${PWLDIR}/include/ptlib/*.h ${PREFIX}/include/ptlib
- ${INSTALL_DATA} ${PWLDIR}/lib/libpt.so.* ${PREFIX}/lib
- ${INSTALL_DATA} ${PWLDIR}/lib/libpt.a ${PREFIX}/lib
-
- ${INSTALL_DATA_DIR} ${PREFIX}/include/openh323
- ${INSTALL_DATA} ${OPHDIR}/include/*.h ${PREFIX}/include/openh323
- ${INSTALL_DATA} ${OPHDIR}/lib/libh323.so.* ${PREFIX}/lib
- ${INSTALL_DATA} ${OPHDIR}/lib/libh323.a ${PREFIX}/lib
+do-extract:
+ @tar xzf ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} -C ${WRKDIR}
- ${INSTALL_PROGRAM} ${OPHDIR}/samples/simple/obj_OpenBSD_*_r/simph323
${PREFIX}/bin
+pre-configure:
+ @perl -pi -e 's,MAJOR_VERSION.*,MAJOR_VERSION ${LIBh323_VERSION:R},g;' \
+ -e 's,MINOR_VERSION.*,MINOR_VERSION ${LIBh323_VERSION:E},g' \
+ ${WRKSRC}/version.h
+ @perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g' \
+ ${WRKSRC}/plugins/audio/Speex/Makefile.in
+ @perl -pi -e 's,!!PREFIX!!,${PREFIX},g;' \
+ -e 's,!!SOSUFX!!,so.${LIBh323_VERSION},g' \
+ ${WRKSRC}/openh323u.mak.in
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/openh323/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 5 Apr 2007 16:20:12 -0000 1.3
+++ distinfo 15 Apr 2007 16:26:52 -0000
@@ -1,10 +1,5 @@
-MD5 (openh323_1.8.5.tar.gz) = 8F6Qit7s9/po/Ib9WUA6Yg==
-MD5 (pwlib_1.2.17.tar.gz) = nxRDIUUkw9loumuAo2ObVw==
-RMD160 (openh323_1.8.5.tar.gz) = pC7y4xDjix6Kt8m4HZ5qdb3YEuA=
-RMD160 (pwlib_1.2.17.tar.gz) = Xr7784TwQNErPOAZVb9wehVXLfc=
-SHA1 (openh323_1.8.5.tar.gz) = 11tJiF+nQK8yWzREghD29wRFa6Q=
-SHA1 (pwlib_1.2.17.tar.gz) = jgf+sIt5WLbsWkXeNl+if6bhFxo=
-SHA256 (openh323_1.8.5.tar.gz) = V1YqkRWEvkCWZg56VW7p8g3V53fk6BfsOxFnWaQeI4M=
-SHA256 (pwlib_1.2.17.tar.gz) = TbOXpGCrRyamPeaduruRuwsXoQUEjueElY/hrDlLmRk=
-SIZE (openh323_1.8.5.tar.gz) = 1707700
-SIZE (pwlib_1.2.17.tar.gz) = 828821
+MD5 (openh323-v1_18_0-src-tar.gz) = 1wQ7o0tQOPAROwme3giE+w==
+RMD160 (openh323-v1_18_0-src-tar.gz) = H8Kr427veA8Q9Sqi690ZUKpPzrs=
+SHA1 (openh323-v1_18_0-src-tar.gz) = fRDMPjVFD3u96SU3WpnWauNDafo=
+SHA256 (openh323-v1_18_0-src-tar.gz) =
JrTJzyHcHJLt8VgwRmcPzmvlsTBF710G4RQD02//8hg=
+SIZE (openh323-v1_18_0-src-tar.gz) = 3742730
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 15 Apr 2007 16:26:52 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- Makefile.in.orig Thu Aug 4 21:31:59 2005
++++ Makefile.in Thu Apr 12 10:10:44 2007
+@@ -336,24 +336,7 @@ docs:
+
+ install:
+ mkdir -p $(DESTDIR)$(LIBDIR)
+- rm -f $(DESTDIR)$(LIBDIR)/libh323_*_r.so*
+- $(INSTALL) -m 444 lib/$(OH323_FILE)[EMAIL PROTECTED]@[EMAIL
PROTECTED]@[EMAIL PROTECTED]@ $(DESTDIR)$(LIBDIR)
+- (cd $(DESTDIR)$(LIBDIR) ; \
+- rm -f $(OH323_FILE)[EMAIL PROTECTED]@[EMAIL PROTECTED]@ ; \
+- ln -sf $(OH323_FILE)[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@ $(OH323_FILE)[EMAIL PROTECTED]@[EMAIL PROTECTED]@ \
+- )
+- (cd $(DESTDIR)$(LIBDIR) ; \
+- rm -f $(OH323_FILE)[EMAIL PROTECTED]@ ; \
+- ln -sf $(OH323_FILE)[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@ $(OH323_FILE)[EMAIL PROTECTED]@ \
+- )
+- (cd $(DESTDIR)$(LIBDIR) ; \
+- rm -f $(OH323_FILE) ; \
+- ln -sf $(OH323_FILE)[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@ $(OH323_FILE) \
+- )
+- (cd $(DESTDIR)$(LIBDIR); \
+- rm -f [EMAIL PROTECTED]@ ; \
+- ln -sf $(OH323_FILE) [EMAIL PROTECTED]@ \
+- )
++ $(INSTALL) -m 444 lib/$(OH323_FILE)[EMAIL PROTECTED]@[EMAIL PROTECTED]@
$(DESTDIR)$(LIBDIR)
+ ( for dir in $(DESTDIR)$(LIBDIR) \
+ $(DESTDIR)$(PREFIX)/include/openh323 \
+ $(DESTDIR)$(PREFIX)/share/openh323 ;\
Index: patches/patch-openh323_Makefile
===================================================================
RCS file: patches/patch-openh323_Makefile
diff -N patches/patch-openh323_Makefile
--- patches/patch-openh323_Makefile 2 Aug 2002 21:28:34 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-openh323_Makefile,v 1.1 2002/08/02 21:28:34 naddy Exp $
---- openh323/Makefile.orig Mon Feb 11 07:20:07 2002
-+++ openh323/Makefile Fri Aug 2 21:40:17 2002
-@@ -195,7 +195,7 @@
- # Revision 1.1 1999/01/16 10:32:26 robertj
- # Initial revision
- #
--export INSTALL_DIR=/usr/local
-+export INSTALL_DIR=$(PREFIX)
-
- ifndef PWLIBDIR
- export PWLIBDIR=$(HOME)/pwlib
-@@ -253,4 +253,4 @@ docs:
- doc++ --dir html --tables openh323.dxx
-
- install:
-- make -C src install
-+ $(MAKE) -C src install
Index: patches/patch-openh323_openh323u_mak
===================================================================
RCS file: patches/patch-openh323_openh323u_mak
diff -N patches/patch-openh323_openh323u_mak
--- patches/patch-openh323_openh323u_mak 2 Aug 2002 21:28:34 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-openh323_openh323u_mak,v 1.1 2002/08/02 21:28:34 naddy Exp $
---- openh323/openh323u.mak.orig Mon Jan 14 16:38:09 2002
-+++ openh323/openh323u.mak Fri Aug 2 21:40:17 2002
-@@ -106,7 +106,7 @@ endif
-
-
-
--OH323_BASE = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
-+OH323_BASE = h323$(LIB_TYPE)
- OH323_FILE = lib$(OH323_BASE).$(LIB_SUFFIX)
-
- LDFLAGS += -L$(OH323_LIBDIR)
Index: patches/patch-openh323u_mak_in
===================================================================
RCS file: patches/patch-openh323u_mak_in
diff -N patches/patch-openh323u_mak_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-openh323u_mak_in 15 Apr 2007 16:26:52 -0000
@@ -0,0 +1,45 @@
+$OpenBSD$
+--- openh323u.mak.in.orig Mon Jan 3 07:25:51 2005
++++ openh323u.mak.in Thu Apr 12 11:11:58 2007
+@@ -163,8 +163,12 @@
+ #
+
+ PWLIBDIR = @PWLIBDIR@
++ifdef BUILDSELF
+ OPENH323DIR = @OPENH323DIR@
+ STDCCFLAGS += @STDCCFLAGS@
++else
++OPENH323DIR = !!PREFIX!!/share/openh323
++endif
+ LDFLAGS += @LDFLAGS@
+ LDLIBS += @LDLIBS@
+ ENDLDLIBS := @ENDLDLIBS@ $(ENDLDLIBS)
+@@ -197,11 +201,11 @@ LIBDIRS += $(OPENH323DIR)
+ #OH323_SUPPRESS_H235 = 1
+
+ OH323_SRCDIR = $(OPENH323DIR)/src
+-ifdef PREFIX
+-OH323_INCDIR = $(PREFIX)/include/openh323
++ifndef BUILDSELF
++OH323_INCDIR = $(OPENH323DIR)/include/openh323
+ else
+ OH323_INCDIR = $(OPENH323DIR)/include
+-endif # PREFIX
++endif
+
+ ifndef OH323_LIBDIR
+ OH323_LIBDIR = $(OPENH323DIR)/lib
+@@ -216,8 +220,12 @@ RCFLAGS += -DPTRACING
+ OH323_SUFFIX = $(OBJ_SUFFIX)
+ endif # NOTRACE
+
+-OH323_BASE = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
++OH323_BASE = h323$(LIB_TYPE)
++ifdef BUILDSELF
+ OH323_FILE = lib$(OH323_BASE).$(LIB_SUFFIX)
++else
++OH323_FILE = lib$(OH323_BASE).!!SOSUFX!!
++endif
+
+ LDFLAGS += -L$(OH323_LIBDIR)
+ LDLIBS := -l$(OH323_BASE) $(LDLIBS)
Index: patches/patch-plugins_audio_Speex_Makefile_in
===================================================================
RCS file: patches/patch-plugins_audio_Speex_Makefile_in
diff -N patches/patch-plugins_audio_Speex_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_audio_Speex_Makefile_in 15 Apr 2007 16:26:52
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- plugins/audio/Speex/Makefile.in.orig Wed Apr 11 16:49:42 2007
++++ plugins/audio/Speex/Makefile.in Wed Apr 11 16:49:55 2007
+@@ -79,7 +79,7 @@ SRCS += $(SRCDIR)/nb_celp.c $(SRCDIR)/sb_celp.c $(SR
+ $(SRCDIR)/speex_header.c $(SRCDIR)/speex_callbacks.c
+ EXTRALIBS =
+ else
+-EXTRALIBS = -lspeex
++EXTRALIBS = -L!!LOCALBASE!!/lib -lspeex
+ endif
+
+ OBJDIR = ./obj
Index: patches/patch-pwlib_make_lib_mak
===================================================================
RCS file: patches/patch-pwlib_make_lib_mak
diff -N patches/patch-pwlib_make_lib_mak
--- patches/patch-pwlib_make_lib_mak 2 Aug 2002 21:28:34 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
-$OpenBSD: patch-pwlib_make_lib_mak,v 1.1 2002/08/02 21:28:34 naddy Exp $
---- pwlib/make/lib.mak.orig Fri Feb 1 12:11:27 2002
-+++ pwlib/make/lib.mak Fri Aug 2 21:40:17 2002
-@@ -84,14 +84,14 @@
-
- LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION)
- LIBNAME_MIN = $(LIBNAME_MAJ).$(MINOR_VERSION)
--LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER)$(BUILD_TYPE)
-+LIBNAME_PAT = $(LIBNAME_MIN)
-
- CLEAN_FILES += $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_FILENAME)
$(LIBDIR)/$(LIBNAME_MAJ) $(LIBDIR)/$(LIBNAME_MIN)
-
- ifneq ($(P_SHAREDLIB),1)
- STATIC_LIB_FILE=$(LIBDIR)/$(LIB_FILENAME)
- else
--STATIC_LIB_FILE=$(LIBDIR)/lib$(LIB_BASENAME)_s.a
-+STATIC_LIB_FILE=$(LIBDIR)/lib$(LIB_BASENAME).a
-
- ifndef MAJOR_VERSION
- MAJOR_VERSION := 1
-@@ -146,9 +146,9 @@ LD = $(CPLUS)
- endif
-
- $(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT)
-- cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT)
$(LIB_FILENAME)
-- cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT)
$(LIBNAME_MAJ)
-- cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT)
$(LIBNAME_MIN)
-+# cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT)
$(LIB_FILENAME)
-+# cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT)
$(LIBNAME_MAJ)
-+# cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT)
$(LIBNAME_MIN)
-
- $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE)
- @if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
-@@ -156,9 +156,9 @@ $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_F
-
- install: $(LIBDIR)/$(LIBNAME_PAT)
- $(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT)
-- ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_BASENAME)
-- ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
-- ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
-+# ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_BASENAME)
-+# ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
-+# ln -s $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
-
- endif # P_SHAREDLIB
-
Index: patches/patch-pwlib_make_unix_mak
===================================================================
RCS file: patches/patch-pwlib_make_unix_mak
diff -N patches/patch-pwlib_make_unix_mak
--- patches/patch-pwlib_make_unix_mak 14 Sep 2002 14:46:32 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@
-$OpenBSD: patch-pwlib_make_unix_mak,v 1.3 2002/09/14 14:46:32 couderc Exp $
---- pwlib/make/unix.mak.orig Thu Apr 18 07:12:20 2002
-+++ pwlib/make/unix.mak Sat Sep 14 12:27:12 2002
-@@ -668,24 +668,24 @@ ifeq ($(OSTYPE),OpenBSD)
-
- P_PTHREADS := 1
-
--ifeq ($(MACHTYPE),x86)
--STDCCFLAGS += -m486
--endif
--
- LDLIBS += -lossaudio
-
--ifndef OSRELASE
-+ifndef OSRELEASE
- OSRELEASE := $(shell sysctl -n kern.osrevision)
- endif
--
-+
-+CC := ${CC}
-+CPLUS := ${CXX}
-+CFLAGS += ${CFLAGS}
-+ENDIAN := ${ENDIAN}
- STDCCFLAGS += -DP_OPENBSD=$(OSRELEASE)
-
--ifdef P_PTHREADS
-+#ifdef P_PTHREADS
- CFLAGS += -pthread
--endif
-+#endif
-
- P_USE_RANLIB := 1
--
-+HAS_EXPAT := 0
- endif # OpenBSD
-
-
-@@ -1106,7 +1106,7 @@ endif
- PW_LIBDIR = $(PWLIBDIR)/lib
-
- # set name of the PT library
--PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-+PTLIB_BASE = pt
- PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
- PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
- PT_OBJDIR = $(PW_LIBDIR)/$(PT_OBJBASE)
-@@ -1133,7 +1133,8 @@ LDFLAGS += $(DEBLDFLAGS)
-
- else
-
--OPTCCFLAGS += -O3 -DNDEBUG
-+OPTCCFLAGS += -DNDEBUG
-+#OPTCCFLAGS += -O3 -DNDEBUG
- #OPTCCFLAGS += -DP_USE_INLINES=1
- #OPTCCFLAGS += -fconserve-space
- ifneq ($(OSTYPE),Carbon)
-@@ -1172,18 +1173,18 @@ endif
-
-
- # define expat (XML parser) variables if installed
--ifneq (,$(wildcard $(SYSINCDIR)/expat.h))
--HAS_EXPAT = 1
--ENDLDLIBS += -lexpat
--STDCCFLAGS += -DP_EXPAT
--endif
--
--ifneq (,$(wildcard /usr/local/include/expat.h))
--HAS_EXPAT = 1
--ENDLDLIBS += -lexpat
--STDCCFLAGS += -DP_EXPAT -I /usr/local/include
--LDFLAGS += -L /usr/local/lib
--endif
-+# ifneq (,$(wildcard $(SYSINCDIR)/expat.h))
-+# HAS_EXPAT = 1
-+# ENDLDLIBS += -lexpat
-+# STDCCFLAGS += -DP_EXPAT
-+# endif
-+
-+# ifneq (,$(wildcard /usr/local/include/expat.h))
-+# HAS_EXPAT = 1
-+# ENDLDLIBS += -lexpat
-+# STDCCFLAGS += -DP_EXPAT -I /usr/local/include
-+# LDFLAGS += -L /usr/local/lib
-+# endif
-
-
- # define ESDDIR variables if installed
Index: patches/patch-src_ffh263codec_cxx
===================================================================
RCS file: patches/patch-src_ffh263codec_cxx
diff -N patches/patch-src_ffh263codec_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ffh263codec_cxx 15 Apr 2007 16:26:52 -0000
@@ -0,0 +1,69 @@
+$OpenBSD$
+--- src/ffh263codec.cxx.orig Wed Dec 8 03:03:59 2004
++++ src/ffh263codec.cxx Sat Apr 14 17:26:09 2007
+@@ -193,7 +193,7 @@ class FfmpgLink : public H323DynaLink
+
+ AVFrame *AvcodecAllocFrame(void);
+
+- BOOL IsLoaded();
++ //BOOL IsLoaded();
+
+ int AvcodecClose(AVCodecContext *ctx);
+ int AvcodecDecodeVideo(AVCodecContext *ctx, AVFrame *picture, int
*got_picture_ptr, BYTE *buf, int buf_size);
+@@ -217,7 +217,9 @@ class FfmpgLink : public H323DynaLink
+
+ void (*Favcodec_get_context_defaults)(AVCodecContext *s);
+ void (*Favcodec_init)(void);
++#ifdef H323_RFC2190_AVCODEC
+ void (*Favcodec_set_print_fn)(void (*print_fn)(char *));
++#endif
+ void (*Favcodec_register_all)(void);
+ };
+
+@@ -287,17 +289,21 @@ FfmpgLink::FfmpgLink()
+ return;
+ }
+
++#ifdef H323_RFC2190_AVCODEC
+ if (!GetFunction("avcodec_set_print_fn", (Function
&)Favcodec_set_print_fn)) {
+ cerr << "Failed to load avcodec_set_print_fn" << endl;
+ return;
+ }
++#endif
+
+ /* must be called before using avcodec lib */
+ Favcodec_init();
+
+ Favcodec_register_all();
+
++#ifdef H323_RFC2190_AVCODEC
+ Favcodec_set_print_fn(h263_ffmpeg_printon);
++#endif
+
+ isLoadedOK = TRUE;
+ }
+@@ -388,10 +394,12 @@ void FfmpgLink::AvcodecInit(void)
+ Favcodec_init();
+ }
+
++#ifdef H323_RFC2190_AVCODEC
+ void FfmpgLink::AvcodecSetPrintFn(void (*print_fn)(char *))
+ {
+ Favcodec_set_print_fn(print_fn);
+ }
++#endif
+
+ void FfmpgLink::AFavcodecRegisterAll(void)
+ {
+@@ -614,9 +622,9 @@ void H323_FFH263Codec::InitialiseCodec()
+ }
+
+ #ifdef FRAME_RATE_BASE
+- context->frame_rate = framesPerSec * FRAME_RATE_BASE;
++ context->time_base.den = framesPerSec * FRAME_RATE_BASE;
+ #else
+- context->frame_rate = framesPerSec * DEFAULT_FRAME_RATE_BASE;
++ context->time_base.den = framesPerSec * DEFAULT_FRAME_RATE_BASE;
+ #endif
+
+ context->rtp_mode = 0;
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/net/openh323/pkg/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- pkg/DESCR 15 Dec 2003 21:55:07 -0000 1.2
+++ pkg/DESCR 15 Apr 2007 16:26:52 -0000
@@ -1,3 +1,2 @@
-OpenH323 is a free, open-source (Mozilla Public License) library for the
-H.323 internet teleconferencing protocol (as used in NetMeeting, etc).
-A simple client is also provided for testing purposes.
+The OpenH323 project aims to create a full featured, interoperable, Open
+Source implementation of the ITU H.323 teleconferencing protocol.
Index: pkg/MESSAGE
===================================================================
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/MESSAGE 15 Apr 2007 16:26:52 -0000
@@ -0,0 +1,9 @@
+To be able to use the H.263 codec (from FFmpeg), you must create a link
+from ${LOCALBASE}/lib/libavcodec.so.X.Y to
+${LOCALBASE}/lib/pwlib/libavcodec.so so that it can be loaded as a
+run-time module by OpenH323.
+To do so run the following command as root:
+
+ ln -sf ${LOCALBASE}/lib/libavcodec.so.X.Y ${LOCALBASE}/lib/pwlib/libavcodec.so
+
+where X and Y are the corresponding major and minor version numbers.
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 28 Jul 2002 19:35:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/07/28 19:35:51 couderc
Exp $
-lib/libh323.so.1.8
-lib/libpt.so.1.2
-DYNLIBDIR(%D/lib)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/openh323/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 28 Jul 2002 19:35:51 -0000 1.1.1.1
+++ pkg/PLIST 15 Apr 2007 16:26:52 -0000
@@ -1,137 +1,87 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.1.1.1 2002/07/28 19:35:51 couderc Exp $
-bin/simph323
[EMAIL PROTECTED] $OpenBSD$
+include/openh323/
include/openh323/QTIoctl.h
include/openh323/channels.h
include/openh323/codecs.h
include/openh323/cu30codec.h
-include/openh323/g7231codec.h
-include/openh323/g726codec.h
-include/openh323/g729codec.h
+include/openh323/dynacodec.h
+include/openh323/ffh263codec.h
include/openh323/gccpdu.h
include/openh323/gkclient.h
include/openh323/gkserver.h
-include/openh323/gsmcodec.h
include/openh323/guid.h
include/openh323/h225.h
include/openh323/h225ras.h
include/openh323/h235.h
include/openh323/h235auth.h
include/openh323/h245.h
+include/openh323/h248.h
include/openh323/h261codec.h
+include/openh323/h263codec.h
include/openh323/h323.h
+include/openh323/h323annexg.h
include/openh323/h323caps.h
include/openh323/h323con.h
include/openh323/h323ep.h
include/openh323/h323neg.h
include/openh323/h323pdu.h
+include/openh323/h323pluginmgr.h
include/openh323/h323rtp.h
include/openh323/h323t120.h
include/openh323/h323t38.h
+include/openh323/h323trans.h
include/openh323/h4501.h
+include/openh323/h45010.h
+include/openh323/h45011.h
include/openh323/h4502.h
+include/openh323/h4503.h
include/openh323/h4504.h
+include/openh323/h4505.h
include/openh323/h4506.h
+include/openh323/h4507.h
+include/openh323/h4508.h
+include/openh323/h4509.h
include/openh323/h450pdu.h
+include/openh323/h460.h
+include/openh323/h501.h
+include/openh323/h501pdu.h
+include/openh323/hid.h
include/openh323/ixjDefs.h
include/openh323/ixjidb.h
include/openh323/ixjlid.h
include/openh323/jitter.h
-include/openh323/ldap_asn.h
include/openh323/lid.h
-include/openh323/lpc10codec.h
include/openh323/mcspdu.h
include/openh323/mediafmt.h
-include/openh323/mscodecs.h
+include/openh323/opalosp.h
+include/openh323/opalplugin.h
+include/openh323/opalusbdevice.h
+include/openh323/opalvxml.h
+include/openh323/opalwavfile.h
+include/openh323/openh323buildopts.h
+include/openh323/peclient.h
include/openh323/q931.h
+include/openh323/rfc2190avcodec.h
include/openh323/rfc2833.h
include/openh323/rtp.h
+include/openh323/rtp2wav.h
+include/openh323/svcctrl.h
include/openh323/t120proto.h
include/openh323/t38.h
include/openh323/t38proto.h
include/openh323/transports.h
include/openh323/vblasterlid.h
-include/openh323/videoio.h
include/openh323/vpblid.h
include/openh323/x224.h
include/openh323/x880.h
-include/ptclib/asner.h
-include/ptclib/cypher.h
-include/ptclib/delaychan.h
-include/ptclib/dtmf.h
-include/ptclib/ftp.h
-include/ptclib/html.h
-include/ptclib/http.h
-include/ptclib/httpform.h
-include/ptclib/httpsvc.h
-include/ptclib/inetmail.h
-include/ptclib/inetprot.h
-include/ptclib/ipacl.h
-include/ptclib/mime.h
-include/ptclib/modem.h
-include/ptclib/pasn.h
-include/ptclib/psnmp.h
-include/ptclib/pssl.h
-include/ptclib/pwavfile.h
-include/ptclib/pxml.h
-include/ptclib/pxmlrpc.h
-include/ptclib/qchannel.h
-include/ptclib/random.h
-include/ptclib/shttpsvc.h
-include/ptclib/socks.h
-include/ptclib/telnet.h
-include/ptclib/url.h
-include/ptlib.h
-include/ptlib/MacMainIf.h
-include/ptlib/args.h
-include/ptlib/array.h
-include/ptlib/channel.h
-include/ptlib/conchan.h
-include/ptlib/config.h
-include/ptlib/contain.h
-include/ptlib/dict.h
-include/ptlib/dynalink.h
-include/ptlib/ethsock.h
-include/ptlib/file.h
-include/ptlib/filepath.h
-include/ptlib/icmpsock.h
-include/ptlib/indchan.h
-include/ptlib/ipdsock.h
-include/ptlib/ipsock.h
-include/ptlib/ipxsock.h
-include/ptlib/lists.h
-include/ptlib/mail.h
-include/ptlib/mutex.h
-include/ptlib/object.h
-include/ptlib/pdirect.h
-include/ptlib/pipechan.h
-include/ptlib/pprocess.h
-include/ptlib/pstring.h
-include/ptlib/ptime.h
-include/ptlib/remconn.h
-include/ptlib/semaphor.h
-include/ptlib/serchan.h
-include/ptlib/sfile.h
-include/ptlib/socket.h
-include/ptlib/sockets.h
-include/ptlib/sound.h
-include/ptlib/spxsock.h
-include/ptlib/svcproc.h
-include/ptlib/syncpoint.h
-include/ptlib/syncthrd.h
-include/ptlib/tcpsock.h
-include/ptlib/textfile.h
-include/ptlib/thread.h
-include/ptlib/timeint.h
-include/ptlib/timer.h
-include/ptlib/udpsock.h
-include/ptlib/vconvert.h
-include/ptlib/vfakeio.h
-include/ptlib/video.h
-include/ptlib/videoio.h
-include/ptlib/videoio1394dc.h
-lib/libh323.a
-lib/libpt.a
-%%SHARED%%
[EMAIL PROTECTED] include/ptlib
[EMAIL PROTECTED] include/ptclib
[EMAIL PROTECTED] include/openh323
[EMAIL PROTECTED] lib/libh323.so.${LIBh323_VERSION}
+lib/pwlib/codecs/
+lib/pwlib/codecs/audio/
+lib/pwlib/codecs/audio/g726_audio_pwplugin.so
+lib/pwlib/codecs/audio/gsm0610_audio_pwplugin.so
+lib/pwlib/codecs/audio/ilbc_audio_pwplugin.so
+lib/pwlib/codecs/audio/ima_adpcm_audio_pwplugin.so
+lib/pwlib/codecs/audio/lpc10_audio_pwplugin.so
+lib/pwlib/codecs/audio/speex_audio_pwplugin.so
+share/openh323/
+share/openh323/openh323u.mak
