diff -ruN devel/pwlib.orig/Makefile devel/pwlib/Makefile --- devel/pwlib.orig/Makefile Fri Jun 10 21:29:51 2005 +++ devel/pwlib/Makefile Tue Jul 12 11:35:11 2005 @@ -6,38 +6,61 @@ # PORTNAME= pwlib -PORTVERSION= 1.5.2 +PORTVERSION= 1.8.4 PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= http://www.openh323.org/bin/ \ - http://www.de.openh323.org/bin/ \ - http://www.gnomemeeting.org/downloads/0.98.0/sources/ -DISTNAME= ${PORTNAME}_${PORTVERSION} +MASTER_SITES= http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/ MAINTAINER= ports@FreeBSD.org COMMENT= A cross platform C++ library, used by OpenH323 LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 -WRKSRC= ${WRKDIR}/${PORTNAME} - USE_BISON= yes USE_GMAKE= yes -USE_OPENLDAP= yes -USE_AUTOCONF_VER= 253 -CONFIGURE_ENV= OSRELEASE=${OSVERSION} -ALL_TARGET= optnoshared -MAKE_ENV= PWLIBDIR=${WRKDIR}/pwlib -THE_MACHTYPE= ${ARCH:S/i386/x86/} -MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} +WANT_SDL= yes +USE_OPENSSL= yes +NO_FILTER_SHLIBS=yes +USE_AUTOCONF_VER= 259 +# to get some defines for LOCALBASE and such .include -.if ${OSVERSION} < 502101 -ONLY_FOR_ARCHS= i386 +# if explicitely asked for, depend upon it +.if defined(WITH_SDL) +USE_SDL+= sdl +.endif + +# if explicitely disabled, do not depend upon it +.if defined(WITHOUT_SDL) +CONFIGURE_ARGS+= --disable-sdl +.endif + +# if nobody cares, use it if it is installed already +.if !defined(WITHOUT_SDL) && !defined(WITH_SDL) +.if ${HAVE_SDL:Msdl} +USE_SDL+= sdl +.else +CONFIGURE_ARGS+= --disable-sdl +.endif .endif -do-install: -# ${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin +# disable plugins' support in PWLIB (enabled by default) +.if !defined(WITHOUT_PLUGINS) +CONFIGURE_ARGS+= --enable-plugins +.endif + +#disable OpenLDAP support in PWLIB +.if defined(WITHOUT_LDAP) +CONFIGURE_ARGS+= --disable-openldap +.else +USE_OPENLDAP= yes +.endif + +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" SDLLIBDIR="${LOCALBASE}/lib" + +#.if ${OSVERSION} < 502101 +#ONLY_FOR_ARCHS= i386 +#.endif .include diff -ruN devel/pwlib.orig/distinfo devel/pwlib/distinfo --- devel/pwlib.orig/distinfo Fri Jun 10 21:29:51 2005 +++ devel/pwlib/distinfo Tue Jul 12 10:39:11 2005 @@ -1,2 +1,2 @@ -MD5 (pwlib_1.5.2.tar.gz) = 0fa33ba1b32b254abe0b731a52c0f2f9 -SIZE (pwlib_1.5.2.tar.gz) = 1085203 +MD5 (pwlib-1.8.4.tar.gz) = fc638a64216b7751271c539ee4ccd0a8 +SIZE (pwlib-1.8.4.tar.gz) = 1382438 diff -ruN devel/pwlib.orig/files/patch-configure.ac devel/pwlib/files/patch-configure.ac --- devel/pwlib.orig/files/patch-configure.ac Thu Jan 1 00:00:00 1970 +++ devel/pwlib/files/patch-configure.ac Tue Jul 12 10:57:17 2005 @@ -0,0 +1,157 @@ +--- configure.ac.orig Mon Nov 22 00:15:49 2004 ++++ configure.ac Tue May 24 13:28:59 2005 +@@ -125,7 +125,7 @@ + x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86 + ;; + +- x86_64) MACHTYPE=x86_64 ; ++ x86_64|amd64) MACHTYPE=x86_64 ; + P_64BIT=1 ; + LIB64=1 ; + ;; +@@ -256,7 +256,7 @@ + + AC_MSG_CHECKING(if linker accepts -Wreorder) + AC_LANG_CONFTEST([[int main(int ac,char **av) { return 0; }]]) +-$STDCXX $CXXFLAGS -Wreorder conftest.cc > /dev/null 2>&1 ++$CXX $CXXFLAGS -Wreorder conftest.cc > /dev/null 2>&1 + if test $? = 0 ; then + AC_MSG_RESULT(yes) + STDCXXFLAGS="$STDCXXFLAGS -Wreorder" +@@ -269,7 +269,7 @@ + # $CXX $CFLAGS -Woverloaded-virtual conftest.cc > /dev/null 2>&1 + # if test $? = 0 ; then + # AC_MSG_RESULT(yes) +-# STDCCFLAGS="$STDCCFLAGS -Woverloaded-virtual" ++# STDCXXFLAGS="$STDCXXFLAGS -Woverloaded-virtual" + # else + # AC_MSG_RESULT(no) + # fi +@@ -298,7 +298,7 @@ + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) +- STDCXXFLAGS="$STDCCFLAGS -rtti" ++ STDCXXFLAGS="$STDCXXFLAGS -rtti" + fi + + GCSECTIONS=0 +@@ -319,7 +319,7 @@ + $CXX $CFLAGS -ffunction-sections -c conftest.cc > /dev/null 2>&1 + if test $? = 0 ; then + AC_MSG_RESULT(yes) +- STDCCFLAGS="$STDCCFLAGS -ffunction-sections" ++ STDCXXFLAGS="$STDCXXFLAGS -ffunction-sections" + GCSECTIONS=1 + else + AC_MSG_RESULT(no) +@@ -335,7 +335,7 @@ + dnl $CXX $CFLAGS -fdata-sections -c conftest.cc > /dev/null 2>&1 + dnl if test $? = 0 ; then + dnl AC_MSG_RESULT(yes) +- dnl STDCCFLAGS="$STDCCFLAGS -fdata-sections" ++ dnl STDCXXFLAGS="$STDCXXFLAGS -fdata-sections" + dnl GCSECTIONS=1 + dnl else + dnl AC_MSG_RESULT(no) +@@ -348,7 +348,7 @@ + dnl $CXX $CFLAGS -fvtable-gc -c conftest.cc > /dev/null 2>&1 + dnl if test $? = 0 ; then + dnl AC_MSG_RESULT(yes) +- dnl STDCCFLAGS="$STDCCFLAGS -fvtable-gc" ++ dnl STDCXXFLAGS="$STDCXXFLAGS -fvtable-gc" + dnl GCSECTIONS=1 + dnl else + dnl AC_MSG_RESULT(no) +@@ -498,19 +498,19 @@ + dnl MSWIN_DISPLAY semaphore,Semaphore Support + dnl MSWIN_DEFINE semaphore,P_HAS_SEMAPHORES + +-dnl Linux, Mac OS X use libpthread and -lpthread +-dnl FreeBSD uses the -pthread compiler option and uses libc_r ++dnl FreeBSD >= 5.x, Linux, Mac OS X use libpthread and -lpthread ++dnl FreeBSD < 5.x uses the -pthread compiler option and uses libc_r + + AC_CHECK_LIB(pthread, pthread_create, HAS_PTHREADS=yes, HAS_PTHREADS=no) + if test ${HAS_PTHREADS} = yes ; then +- ENDLDLIBS="$ENDLDLIBS -lpthread" +- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT" ++ ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}" ++ STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_LIBS}" + else + dnl FreeBSD checks + AC_CHECK_LIB(c_r, pthread_create, HAS_PTHREADS=yes, HAS_PTHREADS=no) + if test ${HAS_PTHREADS} = yes ; then +- ENDLDLIBS="$ENDLDLIBS -pthread" +- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread" ++ ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}" ++ STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_CFLAGS}" + fi + fi + +@@ -957,7 +957,7 @@ + + AC_CHECK_HEADERS(expat.h, HAS_EXPAT=1) + if test "${HAS_EXPAT:-unset}" != "unset" ; then +- AC_CHECK_LIB(expat, XML_ParserCreate, HAS_EXPAT=1, HAS_EXPAT=) ++ AC_SEARCH_LIBS(XML_ParserCreate, expat, HAS_EXPAT=1, HAS_EXPAT=) + else + AC_CHECK_FILE(/usr/local/include/expat.h, HAS_EXPAT=1) + if test "${HAS_EXPAT:-unset}" != "unset" ; then +@@ -1013,7 +1013,8 @@ + if test $HAS_IPV6 = no ; then + AC_MSG_RESULT(no) + else +- AC_TRY_COMPILE([#include ++ AC_TRY_COMPILE([#include ++ #include + #include ], + [getnameinfo(NULL, 0, NULL, 0, NULL, 0, 0);], HAS_IPV6=yes, HAS_IPV6=no) + if test $HAS_IPV6 = no ; then +@@ -1079,9 +1080,9 @@ + AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext -laa) + fi + +- dnl freeBSD SDL check ++ dnl FreeBSD SDL check + if test "${HAS_SDL:-unset}" = "unset" ; then +- AC_CHECK_FILE(/usr/local/include/SDL11/SDL.h, HAS_SDL=1) ++ AC_CHECK_HEADERS(SDL11/SDL.h, HAS_SDL=1) + if test "${HAS_SDL:-unset}" != "unset" ; then + SDLLIB=SDL-1.1 + fi +@@ -1104,7 +1105,7 @@ + dnl ######################################################################## + dnl check for video capture support. + dnl videodev.h on linux +-dnl machine/ioctl_meteor on FreeBSD ++dnl machine/ioctl_meteor or dev/bktr/ioctl_meteor.h on FreeBSD + dnl i386/ioctl_meteor on OpenBSD + dnl dev/ic/bt8xx on NetBSD + +@@ -1116,9 +1117,10 @@ + if test "$HAS_PLUGINS" = "0" ; then + if test "$video" != "no" ; then + AC_CHECK_HEADER(linux/videodev.h, HAS_VIDEO_CAPTURE=1) +- dnl AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1) +- dnl AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1) +- dnl AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=1) ++ AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1) ++ AC_CHECK_HEADER(dev/bktr/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1) ++ AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1) ++ AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=1) + if test "${HAS_VIDEO_CAPTURE}" = "0" ; then + AC_MSG_NOTICE(No Video Capture support) + AC_DEFINE([NO_VIDEO_CAPTURE], [], [No video capture]) +@@ -1207,6 +1209,11 @@ + dnl this reduces the size of all executables and libraries + + STDCCFLAGS="$STDCCFLAGS -fno-exceptions" ++ ++dnl ######################################################################## ++dnl respect default CPPFLAGS ++STDCCFLAGS="$CPPFLAGS $STDCCFLAGS" ++STDCXXFLAGS="$CPPFLAGS $STDCXXFLAGS" + + dnl ######################################################################## + dnl final declarations diff -ruN devel/pwlib.orig/files/patch-configurein devel/pwlib/files/patch-configurein --- devel/pwlib.orig/files/patch-configurein Fri Mar 5 02:37:57 2004 +++ devel/pwlib/files/patch-configurein Thu Jan 1 00:00:00 1970 @@ -1,26 +0,0 @@ ---- configure.in.orig Thu May 22 05:19:16 2003 -+++ configure.in Sun Feb 15 23:57:20 2004 -@@ -39,7 +39,7 @@ - STDCCFLAGS="-DP_LINUX=$OSRELEASE" ;; - - freebsd* ) OSTYPE=FreeBSD ; -- OSRELEASE=`sysctl -n kern.osreldate` ; -+## use enviroment variable OSRELEASE=`sysctl -n kern.osreldate` ; - STDCCFLAGS="-DP_FREEBSD=$OSRELEASE" ;; - - openbsd* ) OSTYPE=OpenBSD ; -@@ -452,12 +452,13 @@ - dnl ######################################################################## - dnl check for video capture support. - dnl videodev.h on linux --dnl machine/ioctl_meteor on FreeBSD -+dnl dev/bktr/ioctl_meteor or machine/ioctl_meteor on FreeBSD - dnl i386/ioctl_meteor on OpenBSD - dnl dev/ic/bt8xx on NetBSD - - HAS_VIDEO_CAPTURE=no - AC_CHECK_HEADER(linux/videodev.h, HAS_VIDEO_CAPTURE=yes) -+AC_CHECK_HEADER(dev/bktr/ioctl_meteor.h, HAS_VIDEO_CAPTURE=yes) - AC_CHECK_HEADER(machine/ioctl_meteor.h, HAS_VIDEO_CAPTURE=yes) - AC_CHECK_HEADER(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=yes) - AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=yes) diff -ruN devel/pwlib.orig/files/patch-include_ptlib_unix_ptlib_videoio.h devel/pwlib/files/patch-include_ptlib_unix_ptlib_videoio.h --- devel/pwlib.orig/files/patch-include_ptlib_unix_ptlib_videoio.h Thu Jan 1 00:00:00 1970 +++ devel/pwlib/files/patch-include_ptlib_unix_ptlib_videoio.h Tue Jul 12 10:58:56 2005 @@ -0,0 +1,110 @@ +--- include/ptlib/unix/ptlib/videoio.h.orig Tue May 24 10:36:49 2005 ++++ include/ptlib/unix/ptlib/videoio.h Tue May 24 10:38:49 2005 +@@ -23,82 +23,7 @@ + * + * Contributor(s): ______________________________________. + * +- * $Log: videoio.h,v $ +- * Revision 1.20 2003/09/17 01:18:03 csoutheren +- * Removed recursive include file system and removed all references +- * to deprecated coooperative threading support +- * +- * Revision 1.19 2003/01/06 18:41:08 rogerh +- * Add NetBSD patches, taken from the NetBSD pkg patches. +- * Submitted by Andreas Wrede +- * +- * Revision 1.18 2002/04/10 08:40:36 rogerh +- * Simplify the SetVideoChannelFormat() code. Use the implementation in the +- * ancestor class. +- * +- * Revision 1.17 2002/04/05 06:41:54 rogerh +- * Apply video changes from Damien Sandras . +- * The Video Channel and Format are no longer set in Open(). Instead +- * call the new SetVideoChannelFormat() method. This makes video capture +- * and GnomeMeeting more stable with certain Linux video capture devices. +- * +- * Revision 1.16 2002/01/16 03:36:51 dereks +- * Add variable to match each VIDIOCMCAPTURE with a VIDIOCSYNC +- * +- * Revision 1.15 2001/11/28 00:07:32 dereks +- * Locking added to PVideoChannel, allowing reader/writer to be changed mid call +- * Enabled adjustment of the video frame rate +- * New fictitous image, a blank grey area +- * +- * Revision 1.14 2001/11/25 23:47:05 robertj +- * Changed sense of HAS_VIDEO_CAPTURE to NO_VIDEO_CAPTURE to reduce cmd line. +- * +- * Revision 1.13 2001/11/22 16:08:32 rogerh +- * Allow compiles on Linux without V4L installed (eg 2.0.36 / RedHat 5.2) +- * +- * Revision 1.12 2001/08/08 06:46:44 rogerh +- * Only implement the Whiteness and Colour methods on Linux. +- * +- * Revision 1.11 2001/08/06 19:35:27 rogerh +- * Include the relevent header file based on the version of OpenBSD. +- * Submitted by Marius Aamodt Eriksen +- * +- * Revision 1.10 2001/08/06 07:27:21 rogerh +- * Make a note of the new location of a header file, but do not use it yet. +- * +- * Revision 1.9 2001/08/03 04:21:51 dereks +- * Add colour/size conversion for YUV422->YUV411P +- * Add Get/Set Brightness,Contrast,Hue,Colour for PVideoDevice, and +- * Linux PVideoInputDevice. +- * Add lots of PTRACE statement for debugging colour conversion. +- * Add support for Sony Vaio laptop under linux. Requires 2.4.7 kernel. +- * +- * Revision 1.8 2001/05/22 12:49:32 robertj +- * Did some seriously wierd rewrite of platform headers to eliminate the +- * stupid GNU compiler warning about braces not matching. +- * +- * Revision 1.7 2001/03/20 02:21:57 robertj +- * More enhancements from Mark Cooke +- * +- * Revision 1.6 2001/03/03 06:13:01 robertj +- * Major upgrade of video conversion and grabbing classes. +- * +- * Revision 1.5 2001/01/05 10:50:04 rogerh +- * More BSD Unix support for PVideoInputDevice +- * +- * Revision 1.4 2001/01/03 10:34:18 rogerh +- * Put Linux specific parts in P_LINUX sections and start adding some FreeBSD +- * and OpenBSD code. +- * +- * Revision 1.3 2000/12/19 22:20:26 dereks +- * Add video channel classes to connect to the PwLib PVideoInputDevice class. +- * Add PFakeVideoInput class to generate test images for video. +- * +- * Revision 1.2 2000/07/30 03:54:28 robertj +- * Added more colour formats to video device enum. +- * +- * Revision 1.1 2000/07/26 02:40:29 robertj +- * Added video I/O devices. ++ * $Id$ + * + */ + +@@ -106,9 +31,13 @@ + #include /* change this to "videodev2.h" for v4l2 */ + #endif + +-#if defined(P_FREEBSD) ++#if defined(P_FREEBSD) && !defined(NO_VIDEO_CAPTURE) ++#if P_FREEBSD >= 502101 ++#include ++#else + #include + #endif ++#endif + + #if defined(P_OPENBSD) || defined(P_NETBSD) + #if P_OPENBSD >= 200105 +@@ -178,7 +107,7 @@ + struct video_mmap frameBuffer[2]; + #endif + +-#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) ++#if (defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)) && !defined(NO_VIDEO_CAPTURE) + struct video_capability + { + int channels; /* Num channels */ diff -ruN devel/pwlib.orig/files/patch-make-common.mak devel/pwlib/files/patch-make-common.mak --- devel/pwlib.orig/files/patch-make-common.mak Fri Jun 10 21:29:51 2005 +++ devel/pwlib/files/patch-make-common.mak Thu Jan 1 00:00:00 1970 @@ -1,19 +0,0 @@ -*** make/common.mak.orig Tue Jul 29 11:25:23 2003 ---- make/common.mak Wed Jun 8 16:50:19 2005 -*************** -*** 262,268 **** - endif - - ifneq ($(P_SHAREDLIB),1) -! LDFLAGS += -static - endif - - # clean whitespace out of source file list ---- 262,268 ---- - endif - - ifneq ($(P_SHAREDLIB),1) -! #LDFLAGS += -static - endif - - # clean whitespace out of source file list diff -ruN devel/pwlib.orig/files/patch-make_unix.mak devel/pwlib/files/patch-make_unix.mak --- devel/pwlib.orig/files/patch-make_unix.mak Thu Jan 1 00:00:00 1970 +++ devel/pwlib/files/patch-make_unix.mak Tue Jul 12 10:59:23 2005 @@ -0,0 +1,139 @@ +--- make/unix.mak.orig Tue Nov 16 00:32:34 2004 ++++ make/unix.mak Wed Jun 15 15:04:07 2005 +@@ -28,103 +28,7 @@ + # + # Contributor(s): ______________________________________. + # +-# $Log: unix.mak,v $ +-# Revision 1.193 2004/11/16 00:32:34 csoutheren +-# Added Cygwin support +-# +-# Revision 1.192 2004/10/28 20:07:10 csoutheren +-# Fixes for MacOSX platforms, thanks to Hannes Friederich +-# +-# Revision 1.191 2004/08/31 23:52:31 csoutheren +-# Changed check for Mac OS version, thanks to Hannes Friederich +-# +-# Revision 1.190 2004/06/18 00:38:08 csoutheren +-# Added check for FD_SETSIZE as suggested by Joegen E. Baclor +-# +-# Revision 1.189 2004/06/10 01:36:44 csoutheren +-# Fixed problems with static links +-# +-# Revision 1.188 2004/05/30 04:49:42 ykiryanov +-# Streamlined BeOS section +-# +-# Revision 1.187 2004/04/25 22:11:34 ykiryanov +-# Added posix library to make files +-# +-# Revision 1.186 2004/04/21 03:47:36 ykiryanov +-# Added libdl.so to library list for BeOS +-# +-# Revision 1.185 2004/04/12 03:35:27 csoutheren +-# Fixed problems with non-recursuve mutexes and critical sections on +-# older compilers and libc +-# +-# Revision 1.184 2004/02/26 11:19:07 csoutheren +-# Added changes for BeOS, thanks to Yuri Kiryanov +-# Added changes to fix link problems on some platforms, thanks to Klaus Kaempf +-# +-# Revision 1.183 2004/02/21 19:44:54 ykiryanov +-# Fixed make parameters for BeOS: Changed default on BeOS to using Be BONE +-# +-# Revision 1.182 2004/02/11 05:09:14 csoutheren +-# Fixed problems with regex libraries on Solaris, and with host OS numbering +-# being a quoted string rather than a number. Thanks to Chad Attermann +-# Fixed problems SSL detection problems thanks to Michal Zygmuntowicz +-# +-# Revision 1.181 2004/02/09 06:24:37 csoutheren +-# Allowed CXX environment variable to define C++ compiler to use +-# as required by configure +-# +-# Revision 1.180 2004/01/29 13:43:59 csoutheren +-# Moved some preprocessor symbols from the command line to include files +-# Modified to set P_HAS_SEMAPHORES to 0 for Linux kernels >= 2.6 +-# Applied patches for Solaris thanks to Michal Zygmuntowicz +-# +-# Revision 1.179 2003/11/02 16:00:26 shawn +-# Panther requires -lresolv +-# +-# Revision 1.178 2003/09/18 23:02:35 csoutheren +-# Removed definition of PMEMORY_CHECK +-# +-# Revision 1.177 2003/09/17 01:18:03 csoutheren +-# Removed recursive include file system and removed all references +-# to deprecated coooperative threading support +-# +-# Revision 1.176 2003/09/08 21:11:09 dereksmithies +-# Remove hardcoded path from make file. Thanks Damien Sandras. +-# +-# Revision 1.175 2003/07/24 22:01:42 dereksmithies +-# Add fixes from Peter Nixon for fixing install problems. Thanks. +-# +-# Revision 1.174 2003/06/18 13:19:01 csoutheren +-# Default debug builds now shared +-# +-# Revision 1.173 2003/06/17 12:05:01 csoutheren +-# Changed compiler flags for optimised build +-# +-# Revision 1.172 2003/05/22 12:17:06 dsandras +-# +-# Removed unneeded code since Firewire support has been moved to configure. +-# +-# Revision 1.171 2003/05/06 09:47:20 robertj +-# Fixed up MacOSX changes so is compatible with previous "API" not requiring +-# downstream libraries to change +-# +-# Revision 1.170 2003/05/06 06:59:12 robertj +-# Dynamic library support for MacOSX, thanks Hugo Santos +-# +-# Revision 1.169 2003/05/05 13:10:59 robertj +-# Solaris compatibility +-# +-# Revision 1.168 2003/04/17 07:29:27 robertj +-# Fixed solaris link problem +-# +-# Revision 1.167 2003/04/17 00:05:04 craigs +-# Added patches from Hugo Santos mainly for Darwin compatibility +-# +-# Revision 1.166 2003/04/16 07:16:55 craigs +-# Modified for new autoconf based configuration +-# +-# +-# Log truncated by CRS 14 April 2003 ++# $Id$ + # + + ifndef PWLIBDIR +@@ -416,15 +320,17 @@ + + ifeq ($(OSTYPE),FreeBSD) + +-ifeq ($(MACHTYPE),x86) +-ifdef CPUTYPE +-STDCCFLAGS += -mcpu=$(CPUTYPE) +-endif +-endif ++#ifeq ($(MACHTYPE),x86) ++#ifdef CPUTYPE ++#STDCCFLAGS += -mcpu=$(CPUTYPE) ++#endif ++#endif + + P_USE_RANLIB := 1 +-#STDCCFLAGS += -DP_USE_PRAGMA # migrated to configure + ++SYSLIBDIR := $(shell $(PWLIBDIR)/make/ptlib-config --libdir) ++SYSLIBS += -lpthread ++LDLIBS += $(SYSLIBS) + + endif # FreeBSD + +@@ -871,6 +777,7 @@ + # Directories + + ifdef PREFIX ++# XXX: folgende auskommentieren? + UNIX_INC_DIR = $(PREFIX)/include/ptlib/unix + else + UNIX_INC_DIR = $(PWLIBDIR)/include/ptlib/unix diff -ruN devel/pwlib.orig/files/patch-makefile devel/pwlib/files/patch-makefile --- devel/pwlib.orig/files/patch-makefile Fri Mar 5 02:37:57 2004 +++ devel/pwlib/files/patch-makefile Thu Jan 1 00:00:00 1970 @@ -1,14 +0,0 @@ -*** src/ptlib/unix/Makefile.orig Tue Dec 2 11:15:55 2003 ---- src/ptlib/unix/Makefile Tue Dec 2 11:16:39 2003 -*************** VIDEO_CAPTURE_SOURCE = video4linux.cxx -*** 422,428 **** ---- 422,430 ---- - endif - - ifeq ($(OSTYPE),FreeBSD) -+ ifneq (,$(wildcard $(SYSINCDIR)/dev/bktr/ioctl_meteor.h $(SYSINCDIR)/machine/ioctl_meteor.h)) - VIDEO_CAPTURE_SOURCE = video4bsd.cxx -+ endif - endif - - ifeq ($(OSTYPE),OpenBSD) diff -ruN devel/pwlib.orig/files/patch-src-ptclib-ansper.cxx devel/pwlib/files/patch-src-ptclib-ansper.cxx --- devel/pwlib.orig/files/patch-src-ptclib-ansper.cxx Fri Jun 10 21:29:51 2005 +++ devel/pwlib/files/patch-src-ptclib-ansper.cxx Thu Jan 1 00:00:00 1970 @@ -1,56 +0,0 @@ ---- src/ptclib/asnper.cxx Fri Aug 1 02:11:38 2003 -+++ src/ptclib/asnper.cxx Fri Jun 3 14:32:55 2005 -@@ -1224,6 +1224,11 @@ - return -1; - - value += lower; -+ -+ // clamp value to upper limit -+ if (value > upper) -+ value = upper; -+ - return 0; - } - -@@ -1268,7 +1273,14 @@ - unsigned base; - if (!MultiBitDecode(CountBits(upper - lower + 1), base)) - return -1; -- return lower + base; // 10.9.4.1 -+ len = lower + base; // 10.9.4.1 -+ -+ // clamp value to upper limit -+ if (len > upper) -+ len = upper; -+ -+ return len; -+ - } - - if (upper < 65536) // 10.9.3.3 -@@ -1279,13 +1291,20 @@ - if (IsAtEnd()) - return -1; - -- if (SingleBitDecode() == 0) -- return MultiBitDecode(7, len) ? 0 : -1; // 10.9.3.6 -+ if (SingleBitDecode() == 0) { -+ if (!MultiBitDecode(7, len)) // 10.9.3.6 -+ return -1; // 10.9.3.8 unsupported -+ } -+ else if (SingleBitDecode() == 0) { -+ if (!MultiBitDecode(14, len)) // 10.9.3.7 -+ return -1; // 10.9.3.8 unsupported -+ } - -- if (SingleBitDecode() == 0) -- return MultiBitDecode(14, len) ? 0 : -1; // 10.9.3.7 -+ // clamp value to upper limit -+ if (len > upper) -+ len = upper; - -- return -1; // 10.9.3.8 unsupported -+ return 0; - } - - diff -ruN devel/pwlib.orig/files/patch-src_ptlib_common_getdate.y devel/pwlib/files/patch-src_ptlib_common_getdate.y --- devel/pwlib.orig/files/patch-src_ptlib_common_getdate.y Mon May 16 02:45:08 2005 +++ devel/pwlib/files/patch-src_ptlib_common_getdate.y Tue Jul 12 10:39:11 2005 @@ -1,5 +1,5 @@ ---- src/ptlib/common/getdate.y.orig Fri Jan 24 21:21:06 2003 -+++ src/ptlib/common/getdate.y Sun May 15 14:41:11 2005 +--- src/ptlib/common/getdate.y.orig Tue May 24 10:27:43 2005 ++++ src/ptlib/common/getdate.y Tue May 24 10:28:48 2005 @@ -1,3 +1,4 @@ +%pure-parser %{ diff -ruN devel/pwlib.orig/files/patch-src_ptlib_unix_Makefile devel/pwlib/files/patch-src_ptlib_unix_Makefile --- devel/pwlib.orig/files/patch-src_ptlib_unix_Makefile Thu Jan 1 00:00:00 1970 +++ devel/pwlib/files/patch-src_ptlib_unix_Makefile Tue Jul 12 11:00:24 2005 @@ -0,0 +1,438 @@ +--- src/ptlib/unix/Makefile.orig Tue May 24 10:16:58 2005 ++++ src/ptlib/unix/Makefile Tue May 24 10:22:12 2005 +@@ -25,405 +25,7 @@ + # + # Contributor(s): ______________________________________. + # +-# $Log: Makefile,v $ +-# Revision 1.130 2004/10/28 20:07:11 csoutheren +-# Fixes for MacOSX platforms, thanks to Hannes Friederich +-# +-# Revision 1.129 2004/05/31 22:59:04 csoutheren +-# Added enum.cxx +-# +-# Revision 1.128 2004/04/28 11:26:43 csoutheren +-# Hopefully fixed SASL and SASL2 problems +-# +-# Revision 1.127 2004/04/26 04:17:19 rjongbloed +-# Fixed GNU warnings +-# +-# Revision 1.126 2004/04/24 06:13:06 rjongbloed +-# Changed XMPP code to only be compiled if have EXPAT +-# +-# Revision 1.125 2004/04/24 01:37:43 csoutheren +-# Added PNotifier extensions and XMPP (Jabber) support, +-# thanks to Federico Pinna and Reitek S.p.A. +-# +-# Revision 1.124 2004/04/18 12:37:41 csoutheren +-# Modified to detect sem_wait etc on Linux systems +-# +-# Revision 1.123 2004/04/02 03:59:46 ykiryanov +-# Uncommented beaudio code +-# +-# Revision 1.122 2004/03/17 05:52:59 csoutheren +-# Removed obsolete udp.cxx +-# +-# Revision 1.121 2004/02/15 22:36:29 csoutheren +-# Included ALSA in default non-plugin sound drivers +-# +-# Revision 1.120 2003/11/18 10:41:20 csoutheren +-# Fixed problem with linking in static plugins +-# +-# Revision 1.119 2003/11/14 05:32:09 csoutheren +-# Removed video input device +-# +-# Revision 1.118 2003/11/12 03:29:51 csoutheren +-# Initial version of plugin code from Snark of GnomeMeeting with changes +-# by Craig Southeren of Post Increment +-# +-# Revision 1.117 2003/10/27 04:06:13 csoutheren +-# Added code to allow compilation of new QoS code on Unix +-# +-# Revision 1.116 2003/10/06 02:30:06 dereksmithies +-# Remove Stun.cxx as it is not in the repositary. +-# +-# Revision 1.115 2003/09/17 08:57:33 csoutheren +-# Moved PSmartPointer and PNotifier into seperate files +-# Added detection for system regex libraries on all platforms +-# +-# Revision 1.114 2003/07/28 18:44:01 dsandras +-# Make use of the libc regex on Linux. +-# +-# Revision 1.113 2003/05/22 12:41:42 dsandras +-# +-# Check if TRY_1394AVC/DC=1 to compile support for it or not. +-# +-# Revision 1.112 2003/04/28 08:37:06 craigs +-# Added SDL +-# +-# Revision 1.111 2003/04/16 08:05:50 craigs +-# CHanged checks of variosu vars to use ifeq +-# +-# Revision 1.110 2003/04/15 08:05:43 craigs +-# Added pdns.cxx +-# +-# Revision 1.109 2003/04/14 21:20:59 dereks +-# Fix problems for Firewire video. Thanks to Snark on #gnomemeeting +-# +-# Revision 1.108 2003/03/31 09:03:04 robertj +-# Added ILS support file. +-# +-# Revision 1.107 2003/03/28 03:03:28 craigs +-# Added LDAP sources +-# +-# Revision 1.106 2003/02/24 17:49:02 rogerh +-# Add Mac Core Audio changes from Shawn. +-# +-# Revision 1.105 2003/02/18 03:55:59 dereks +-# Add 1394AVC pathces from Georgi Georgiev. Thanks! +-# +-# Revision 1.104 2003/02/04 22:51:20 robertj +-# Added basic SOAP support, thanks Andreas Sikkema +-# +-# Revision 1.103 2003/02/04 07:41:10 craigs +-# Added stun elements +-# +-# Revision 1.102 2003/01/11 05:30:13 robertj +-# Added support for IEEE 1394 AV/C cameras, thanks Georgi Georgiev +-# +-# Revision 1.101 2003/01/06 18:41:08 rogerh +-# Add NetBSD patches, taken from the NetBSD pkg patches. +-# Submitted by Andreas Wrede +-# +-# Revision 1.100 2002/11/22 10:14:07 robertj +-# QNX port, thanks Xiaodan Tang +-# +-# Revision 1.99 2002/11/05 01:43:39 robertj +-# Added missing VxWorks files. +-# +-# Revision 1.98 2002/10/21 13:01:33 rogerh +-# bison 1.5 and above need -o to specify the output filename +-# +-# Revision 1.97 2002/10/10 04:43:44 robertj +-# VxWorks port, thanks Martijn Roest +-# +-# Revision 1.96 2002/10/02 08:59:13 craigs +-# Added pxmlrpcs.cxx +-# +-# Revision 1.95 2002/09/09 06:42:00 robertj +-# Added check for Sun audio header before compiling module, thanks Nils Bokermann +-# +-# Revision 1.94 2002/08/29 01:45:07 robertj +-# Changed default opt build to include PTRACE +-# +-# Revision 1.93 2002/08/14 15:18:54 craigs +-# Added ptts.cxx to build +-# +-# Revision 1.92 2002/06/27 05:39:34 craigs +-# Added vxml.cxx +-# +-# Revision 1.91 2002/06/27 03:53:01 robertj +-# Added PMemoryFile class. +-# +-# Revision 1.90 2002/05/01 04:16:43 robertj +-# Added thread safe collection classes. +-# +-# Revision 1.89 2002/04/18 05:12:20 robertj +-# Changed /usr/include to SYSINCDIR helps with X-compiling, thanks Bob Lindell +-# +-# Revision 1.88 2002/04/02 11:59:32 craigs +-# Added pxmlrpc +-# +-# Revision 1.87 2002/02/20 02:37:26 dereks +-# Initial release of Firewire camera support for linux. +-# Many thanks to Ryutaroh Matsumoto . +-# +-# Revision 1.86 2002/01/23 12:09:46 rogerh +-# Add dtmf decoder to the compilation +-# +-# Revision 1.85 2002/01/22 03:55:32 craigs +-# Moved PWavFile to PTCLib +-# +-# Revision 1.84 2001/12/06 05:39:05 craigs +-# Added support for PXML component library +-# +-# Revision 1.83 2001/11/27 22:42:13 robertj +-# Changed to make system to better support non-shared library building. +-# +-# Revision 1.82 2001/11/25 23:28:04 robertj +-# Fixed correct setting of HAS_VIDEO_CAPTURE compile flag +-# +-# Revision 1.81 2001/08/11 15:38:43 rogerh +-# Add Mac OS Carbon changes from John Woods +-# +-# Revision 1.80 2001/07/20 07:36:59 rogerh +-# Move ESD detection. +-# +-# Revision 1.79 2001/07/19 09:53:29 rogerh +-# Add the PWAVFile class to read and write .wav files +-# +-# Revision 1.78 2001/07/19 09:27:12 rogerh +-# Add support for EsounD and esd (the Enlightenment Sound Daemon). +-# This allows OhPhone to run on platforms where EsounD and esd have been +-# ported which includes Mac OS X. +-# Code written by Shawn Pai-Hsiang Hsiao . +-# +-# Revision 1.77 2001/07/10 03:45:14 robertj +-# Added queue channel and delay channel classes to ptclib. +-# +-# Revision 1.76 2001/07/09 06:16:15 yurik +-# Jac Goudsmit's BeOS changes of July,6th. Cleaning up media subsystem etc. +-# +-# Revision 1.75 2001/06/27 17:25:46 rogerh +-# Compile the dummyvideo.cxx file on platforms with no video capture hardware +-# +-# Revision 1.74 2001/06/26 15:49:15 rogerh +-# Define HAS_VIDEOCAPTURE on platforms with video capture code +-# +-# Revision 1.73 2001/06/26 14:20:36 rogerh +-# Compile the generic video files on all platforms +-# +-# Revision 1.72 2001/05/29 03:34:39 craigs +-# Changed to use new HAS_OPENSSL define +-# +-# Revision 1.71 2001/02/27 01:05:24 robertj +-# Updated regular expression parser to latest version from Henry Spencer. +-# +-# Revision 1.70 2001/02/23 08:42:17 rogerh +-# Add dummyaudio as the default SOUND_SOURCE +-# +-# Revision 1.69 2001/02/15 04:58:51 robertj +-# Added class to do secure HTTP based service process. +-# +-# Revision 1.68 2001/01/24 02:51:15 robertj +-# Changed definition of list of files for make clean to more correct position +-# as expected by common.mak +-# +-# Revision 1.67 2001/01/04 18:13:32 rogerh +-# Tidy up the Makefile when building video4bsd.cxx +-# +-# Revision 1.66 2001/01/04 18:02:16 rogerh +-# remove some old parts refering to linux +-# +-# Revision 1.65 2001/01/03 23:10:09 craigs +-# Fixed Makefile problem when video not available +-# +-# Revision 1.64 2001/01/03 16:48:13 rogerh +-# Rename V4L_SOURCE to VIDEO_SOURCE (to be less platform specific). +-# Specify which files to use for VIDEO_SOURCE on non-linux systems eg BSD. +-# +-# Revision 1.63 2000/12/19 22:20:26 dereks +-# Add video channel classes to connect to the PwLib PVideoInputDevice class. +-# Add PFakeVideoInput class to generate test images for video. +-# +-# Revision 1.62 2000/12/16 13:00:46 rogerh +-# BeOS changes, submitted by Yuri Kiryanov +-# +-# Revision 1.61 2000/07/26 02:40:30 robertj +-# Added video I/O devices. +-# +-# Revision 1.60 2000/06/21 01:01:22 robertj +-# AIX port, thanks Wolfgang Platzer (wolfgang.platzer@infonova.at). +-# +-# Revision 1.59 2000/04/26 00:40:48 robertj +-# Redesigned version number system to have single file to change on releases. +-# +-# Revision 1.58 2000/04/19 00:13:52 robertj +-# BeOS port changes. +-# +-# Revision 1.57 2000/04/09 18:19:23 rogerh +-# Add my changes for NetBSD support. +-# +-# Revision 1.56 2000/03/08 18:22:03 rogerh +-# Select oss.cxx sound support for OpenBSD +-# +-# Revision 1.55 2000/03/03 00:30:31 robertj +-# Removed ptclilb/proto directory. +-# +-# Revision 1.54 2000/02/24 11:03:27 craigs +-# Fixed problem with making PW programs +-# +-# Revision 1.53 2000/02/17 12:09:19 robertj +-# Added better random number generator after finding major flaws in MSVCRT version. +-# +-# Revision 1.52 2000/02/15 23:11:34 robertj +-# Audio support for FreeBSD, thanks Roger Hardiman. +-# +-# Revision 1.51 2000/01/31 01:56:48 robertj +-# Fixed BeOS compatibility problem. +-# +-# Revision 1.50 2000/01/22 00:52:06 craigs +-# Added ability to use in any directory, and to create shared libraries +-# +-# Revision 1.49 2000/01/10 02:22:41 craigs +-# Updated for new OpenSSL functionality +-# +-# Revision 1.48 1999/09/27 01:04:42 robertj +-# BeOS support changes. +-# +-# Revision 1.47 1999/07/03 04:31:53 robertj +-# Fixed problems with not including oss.cxx in library if OSTYPE not "linux" +-# +-# Revision 1.46 1999/06/28 09:28:02 robertj +-# Portability issues, especially n BeOS (thanks Yuri!) +-# +-# Revision 1.45 1999/06/21 00:57:10 robertj +-# Fixed inclusion of getdate.tab.c to clean files. +-# +-# Revision 1.44 1999/06/09 15:41:18 robertj +-# Added better UI to make files. +-# +-# Revision 1.43 1999/04/18 09:36:31 robertj +-# Get date grammar build. +-# +-# Revision 1.42 1999/04/16 14:37:41 craigs +-# Added build for getdate.y +-# +-# Revision 1.41 1999/03/02 05:41:59 robertj +-# More BeOS changes +-# +-# Revision 1.40 1999/02/25 03:44:58 robertj +-# Sound driver implementation changes for various unix platforms. +-# +-# Revision 1.39 1999/02/22 13:24:47 robertj +-# Added first cut sound implmentation. +-# +-# Revision 1.38 1999/02/19 11:33:51 robertj +-# Added IP access control lists file. +-# +-# Revision 1.37 1999/01/22 00:30:46 robertj +-# Yet more build environment changes. +-# +-# Revision 1.36 1999/01/21 08:27:18 robertj +-# Added tarfiles target +-# +-# Revision 1.35 1999/01/16 09:54:04 robertj +-# Changed some macros to more informative names. +-# +-# Revision 1.34 1998/12/04 12:53:14 craigs +-# Fixed problem with regex in wrong directory +-# +-# Revision 1.33 1998/12/02 02:10:19 robertj +-# New directory structure +-# +-# Revision 1.32 1998/11/22 10:44:10 craigs +-# New GUI build system - for sure! +-# +-# Revision 1.31 1998/11/22 08:11:28 craigs +-# Changed for new GUI build mechanism +-# +-# Revision 1.29 1998/10/15 07:03:46 robertj +-# Moved object.cxx to last place so memory leak destructor is called at the right time. +-# +-# Revision 1.28 1998/09/24 07:40:34 robertj +-# Moved structured file to common. +-# Removed small files only containing pragma implementations +-# +-# Revision 1.27 1998/09/24 04:20:50 robertj +-# Added open software license. +-# +-# Revision 1.26 1998/08/21 05:32:14 robertj +-# Allowed for multiple "all" target, so can build lib from app makefile. +-# +-# Revision 1.25 1998/02/12 04:17:55 robertj +-# Made DEBUG variable optional +-# +-# Revision 1.24 1998/01/26 07:25:21 robertj +-# Removed tiny files, as now have pragma in the common files. +-# +-# Revision 1.22 1998/01/04 09:41:20 robertj +-# Changed perasn.cxx to asner.cxx +-# +-# Revision 1.21 1998/01/04 08:29:37 craigs +-# Changed for Linux +-# +-# Revision 1.20 1997/04/22 11:00:01 craigs +-# Added SSL and DLL functions +-# +-# Revision 1.19 1996/11/17 08:35:50 craigs +-# Fixed distsrc target +-# +-# Revision 1.18 1996/11/17 02:35:12 craigs +-# Removed SSL from list of build targets +-# +-# Revision 1.16 1996/10/31 10:30:03 craigs +-# Lots of changes +-# +-# Revision 1.15 1996/09/21 05:41:41 craigs +-# Added new common files +-# +-# Revision 1.14 1996/08/03 12:05:10 craigs +-# *** empty log message *** +-# +-# Revision 1.13 1996/07/03 06:32:18 craigs +-# Removed spurious lines causing warnings during library make +-# +-# Revision 1.12 1996/06/29 11:37:28 craigs +-# Added unix system type to object directories +-# Added support for Linux shared libraries +-# +-# Revision 1.11 1996/06/19 01:56:26 craigs +-# Added uhttpsvc to the list +-# +-# Revision 1.10 1996/06/14 09:30:43 craigs +-# Included buildinc stuff +-# +-# Revision 1.9 1996/05/10 11:03:22 craigs +-# Fixed distsrc rule to only include ptlib stuff +-# +-# Revision 1.8 1996/05/03 13:48:58 craigs +-# Sun4 fixes +-# +-# Revision 1.7 1996/05/02 10:53:24 craigs +-# Fixed problem with SUN4 target +-# +-# Revision 1.6 1996/04/17 11:12:20 craigs +-# Latest version pre mibmaster release 1.0 +-# +-# Revision 1.5 1996/04/15 10:50:13 craigs +-# Last revision prior to release of MibMaster +-# +-# Revision 1.4 1996/01/26 11:09:04 craigs +-# *** empty log message *** +-# +-# Revision 1.3 1995/12/08 13:18:13 craigs +-# Lots of changes +-# +-# Revision 1.2 1995/07/09 00:35:42 craigs +-# Latest and greatest omnibus change +-# +-# Revision 1.1 1995/01/16 20:50:44 craigs +-# Initial revision +-# +-# Revision 1.1 1993/07/12 21:22:16 craigs +-# Initial revision +-# ++# $Id$ + # + + ifndef PWLIBDIR +@@ -495,9 +97,11 @@ + + # VIDEO_CAPTURE_SOURCE = dummyvideo.cxx + # +-# ifeq ($(OSTYPE),FreeBSD) +-# VIDEO_CAPTURE_SOURCE = video4bsd.cxx +-# endif ++ifeq ($(OSTYPE),FreeBSD) ++ifneq (,$(wildcard $(SYSINCDIR)/dev/bktr/ioctl_meteor.h $(SYSINCDIR)/machine/ioctl_meteor.h)) ++VIDEO_CAPTURE_SOURCE = video4bsd.cxx ++endif ++endif + # + # ifeq ($(OSTYPE),OpenBSD) + # VIDEO_CAPTURE_SOURCE = video4bsd.cxx +@@ -548,9 +152,10 @@ + # endif + # endif + # +-# ifeq ($(OSTYPE),FreeBSD) +-# SOUND_SOURCE = oss.cxx +-# endif ++ifeq ($(OSTYPE),FreeBSD) ++VPATH_CXX += $(PLUGIN_DIR)/sound_oss ++SOUND_SOURCE = $(PLUGIN_DIR)/sound_oss/sound_oss.cxx ++endif + # + # ifeq ($(OSTYPE),OpenBSD) + # SOUND_SOURCE = oss.cxx diff -ruN devel/pwlib.orig/files/patch-unix devel/pwlib/files/patch-unix --- devel/pwlib.orig/files/patch-unix Fri Jun 10 21:29:51 2005 +++ devel/pwlib/files/patch-unix Thu Jan 1 00:00:00 1970 @@ -1,70 +0,0 @@ -*** make/unix.mak.orig Thu Jul 24 22:01:42 2003 ---- make/unix.mak Fri Jun 3 15:13:47 2005 -*************** -*** 358,368 **** - - ifeq ($(OSTYPE),FreeBSD) - -! ifeq ($(MACHTYPE),x86) -! ifdef CPUTYPE -! STDCCFLAGS += -mcpu=$(CPUTYPE) -! endif -! endif - - ifndef OSRELEASE - OSRELEASE := $(shell sysctl -n kern.osreldate) ---- 358,368 ---- - - ifeq ($(OSTYPE),FreeBSD) - -! #ifeq ($(MACHTYPE),x86) -! #ifdef CPUTYPE -! #STDCCFLAGS += -mcpu=$(CPUTYPE) -! #endif -! #endif - - ifndef OSRELEASE - OSRELEASE := $(shell sysctl -n kern.osreldate) -*************** -*** 891,901 **** - - # Directories - -! ifdef PREFIX -! UNIX_INC_DIR = $(PREFIX)/include/ptlib/unix -! else - UNIX_INC_DIR = $(PWLIBDIR)/include/ptlib/unix -! endif - - ifndef UNIX_SRC_DIR - UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix ---- 891,901 ---- - - # Directories - -! ##ifdef PREFIX -! ##UNIX_INC_DIR = $(PREFIX)/include/ptlib/unix -! ##else - UNIX_INC_DIR = $(PWLIBDIR)/include/ptlib/unix -! ##endif - - ifndef UNIX_SRC_DIR - UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix -*************** -*** 932,938 **** - else - - ifneq ($(OSTYPE),Darwin) -! OPTCCFLAGS += -Os -DNDEBUG - else - OPTCCFLAGS += -O2 -DNDEBUG - endif ---- 932,939 ---- - else - - ifneq ($(OSTYPE),Darwin) -! # OPTCCFLAGS += -Os -DNDEBUG -! OPTCCFLAGS += -DNDEBUG - else - OPTCCFLAGS += -O2 -DNDEBUG - endif diff -ruN devel/pwlib.orig/files/patch-videoio devel/pwlib/files/patch-videoio --- devel/pwlib.orig/files/patch-videoio Fri Mar 5 02:37:57 2004 +++ devel/pwlib/files/patch-videoio Thu Jan 1 00:00:00 1970 @@ -1,26 +0,0 @@ ---- include/ptlib/unix/ptlib/videoio.h.orig Mon Jan 6 10:41:08 2003 -+++ include/ptlib/unix/ptlib/videoio.h Sun Feb 15 23:42:39 2004 -@@ -106,9 +106,13 @@ - #include /* change this to "videodev2.h" for v4l2 */ - #endif - --#if defined(P_FREEBSD) -+#if defined(P_FREEBSD) && !defined(NO_VIDEO_CAPTURE) -+#if P_FREEBSD >= 502101 -+#include -+#else - #include - #endif -+#endif - - #if defined(P_OPENBSD) || defined(P_NETBSD) - #if P_OPENBSD >= 200105 -@@ -186,7 +190,7 @@ - struct video_mmap frameBuffer[2]; - #endif - --#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) -+#if (defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD)) && !defined(NO_VIDEO_CAPTURE) - struct video_capability - { - int channels; /* Num channels */ diff -ruN devel/pwlib.orig/pkg-plist devel/pwlib/pkg-plist --- devel/pwlib.orig/pkg-plist Fri Mar 5 02:37:57 2004 +++ devel/pwlib/pkg-plist Tue Jul 12 10:39:11 2005 @@ -1 +1,178 @@ -@comment this plist intentionally left empty +bin/ptlib-config +include/ptbuildopts.h +include/ptclib/asnber.h +include/ptclib/asner.h +include/ptclib/asnper.h +include/ptclib/asnxer.h +include/ptclib/cypher.h +include/ptclib/delaychan.h +include/ptclib/dtmf.h +include/ptclib/enum.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/memfile.h +include/ptclib/mime.h +include/ptclib/modem.h +include/ptclib/pasn.h +include/ptclib/pdns.h +include/ptclib/pils.h +include/ptclib/pldap.h +include/ptclib/psasl.h +include/ptclib/psnmp.h +include/ptclib/psoap.h +include/ptclib/pssl.h +include/ptclib/pstun.h +include/ptclib/ptts.h +include/ptclib/pwavfile.h +include/ptclib/pxml.h +include/ptclib/pxmlrpc.h +include/ptclib/pxmlrpcs.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/ptclib/vsdl.h +include/ptclib/vxml.h +include/ptclib/xmpp.h +include/ptclib/xmpp_c2s.h +include/ptclib/xmpp_muc.h +include/ptclib/xmpp_roster.h +@dirrm include/ptclib +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/contain.inl +include/ptlib/critsec.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/int64.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/notifier.h +include/ptlib/notifier_ext.h +include/ptlib/object.h +include/ptlib/osutil.inl +include/ptlib/pdirect.h +include/ptlib/pfactory.h +include/ptlib/pipechan.h +include/ptlib/plugin.h +include/ptlib/pluginmgr.h +include/ptlib/pprocess.h +include/ptlib/psharedptr.h +include/ptlib/pstring.h +include/ptlib/ptime.h +include/ptlib/qos.h +include/ptlib/remconn.h +include/ptlib/safecoll.h +include/ptlib/semaphor.h +include/ptlib/serchan.h +include/ptlib/sfile.h +include/ptlib/smartptr.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/unix/ptlib/beaudio.h +include/ptlib/unix/ptlib/bevideo.h +include/ptlib/unix/ptlib/channel.h +include/ptlib/unix/ptlib/conchan.h +include/ptlib/unix/ptlib/config.h +include/ptlib/unix/ptlib/contain.h +include/ptlib/unix/ptlib/critsec.h +include/ptlib/unix/ptlib/dynalink.h +include/ptlib/unix/ptlib/ethsock.h +include/ptlib/unix/ptlib/file.h +include/ptlib/unix/ptlib/filepath.h +include/ptlib/unix/ptlib/icmpsock.h +include/ptlib/unix/ptlib/ipdsock.h +include/ptlib/unix/ptlib/ipsock.h +include/ptlib/unix/ptlib/maccoreaudio.h +include/ptlib/unix/ptlib/mutex.h +include/ptlib/unix/ptlib/pdirect.h +include/ptlib/unix/ptlib/pipechan.h +include/ptlib/unix/ptlib/pmachdep.h +include/ptlib/unix/ptlib/pprocess.h +include/ptlib/unix/ptlib/ptime.h +include/ptlib/unix/ptlib/ptlib.inl +include/ptlib/unix/ptlib/remconn.h +include/ptlib/unix/ptlib/resampler.h +include/ptlib/unix/ptlib/semaphor.h +include/ptlib/unix/ptlib/serchan.h +include/ptlib/unix/ptlib/sfile.h +include/ptlib/unix/ptlib/socket.h +include/ptlib/unix/ptlib/sound.h +include/ptlib/unix/ptlib/svcproc.h +include/ptlib/unix/ptlib/syncpoint.h +include/ptlib/unix/ptlib/tcpsock.h +include/ptlib/unix/ptlib/textfile.h +include/ptlib/unix/ptlib/thread.h +include/ptlib/unix/ptlib/timeint.h +include/ptlib/unix/ptlib/timer.h +include/ptlib/unix/ptlib/udpsock.h +include/ptlib/unix/ptlib/video.h +include/ptlib/unix/ptlib/videoio.h +include/ptlib/unix/ptlib/videoio1394avc.h +@dirrm include/ptlib/unix/ptlib +@dirrm include/ptlib/unix +include/ptlib/vconvert.h +include/ptlib/video.h +include/ptlib/videoio.h +include/ptlib/videoio1394dc.h +@dirrm include/ptlib +lib/libpt.so +lib/libpt_FreeBSD_x86_r.so +lib/libpt_FreeBSD_x86_r.so.1 +lib/libpt_FreeBSD_x86_r.so.1.8 +lib/libpt_FreeBSD_x86_r.so.1.8.4 +lib/pwlib/devices/sound/oss_pwplugin.so +@dirrm lib/pwlib/devices/sound +lib/pwlib/devices/videoinput/bsdvideo_pwplugin.so +@dirrm lib/pwlib/devices/videoinput +@dirrm lib/pwlib/devices +@dirrm lib/pwlib +share/pwlib/make/common.mak +share/pwlib/make/defaultgui.mak +share/pwlib/make/gui.mak +share/pwlib/make/lib.mak +share/pwlib/make/motif.mak +share/pwlib/make/plugins.mak +share/pwlib/make/ptbuildopts.mak +share/pwlib/make/ptlib-config +share/pwlib/make/ptlib.mak +share/pwlib/make/pwlib.mak +share/pwlib/make/qt.mak +share/pwlib/make/unix.mak +share/pwlib/make/xlib.mak +@dirrm share/pwlib/make +@dirrm share/pwlib