ports/128140: update devel/pwlib to 2.4.1 to fit GNOME 2.24
Eric L. Chen
d9364104 at mail.nchu.edu.tw
Thu Oct 16 08:20:02 UTC 2008
>Number: 128140
>Category: ports
>Synopsis: update devel/pwlib to 2.4.1 to fit GNOME 2.24
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 16 08:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Eric L. Chen
>Release: 7-STABLE/i386
>Organization:
National Chung Hsing University
>Environment:
FreeBSD lihong-nb.local 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #18: Wed Oct 15 16:04:17 CST 2008 root at lihong-nb.local:/usr/obj/usr/src/sys/lihong-nb i386
>Description:
According to GNOME 2.24 release ( http://library.gnome.org/misc/release-notes/2.24/#rnusers.ekiga ), ekiga should be version 3.0.0 in GNOME 2.24.0.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN pwlib.orig/Makefile pwlib/Makefile
--- pwlib.orig/Makefile 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/Makefile 2008-10-16 16:10:16.000000000 +0800
@@ -6,24 +6,24 @@
#
PORTNAME= pwlib
-PORTVERSION= 1.12.0
-PORTREVISION= 3
+PORTVERSION= 2.4.1
PORTEPOCH= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-DISTNAME= openh323/ptlib-v${PORTVERSION:S/./_/g}-src.
-EXTRACT_SUFX= tar.gz
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/ptlib/2.4
+
+DISTNAME= ptlib-${PORTVERSION}
+EXTRACT_SUFX= .tar.gz
MAINTAINER= steve at energistic.com
COMMENT= A cross platform C++ library, used by OpenH323
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
-WRKSRC= ${WRKDIR}/ptlib_v${PORTVERSION:S/./_/g}
USE_BISON= build
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:262
+GNU_CONFIGURE= yes
USE_GNOME= gnometarget
WANT_GNOME= yes
WANT_SDL= yes
@@ -32,26 +32,22 @@
.include <bsd.port.pre.mk>
-CFLAGS= -O1
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -O1 -I${WRKSRC}/include -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
- CFLAGS="${CFLAGS}"
-MAKE_ENV= CPPFLAGS="${CPPFLAGS} -O1 -I${WRKSRC}/include -I${LOCALBASE}/include" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- STDCCFLAGS+="-I${LOCALBASE}"
-
-.if ${OSVERSION} >= 700042
-CONFIGURE_ENV+= ATOMICITY_H="<ext/atomicity.h>"
-.else
-CONFIGURE_ENV+= ATOMICITY_H="<bits/atomicity.h>"
-.endif
+CONFIGURE_ENV= \
+ OPENSSL_CFLAGS="-I/usr/include" \
+ OPENSSL_LIBS="-lssl"
+CONFIGURE_ARGS+= \
+ --disable-atomicity \
+ --with-expat-dir="${LOCALBASE}" \
+ --enable-oss \
+ --disable-odbc
# if explicitely asked for, depend upon it
.if defined(WITH_SDL)
USE_SDL+= sdl
-CONFIGURE_ENV+= SDLLIBDIR="${LOCALBASE}/lib"
-MAKE_ENV+= SDLLIBDIR="${LOCALBASE}/lib"
+CONFIGURE_ENV+= SDL_CFLAGS="`sdl-config --cflags`" \
+ SDL_LIBS="`sdl-config --libs`"
+MAKE_ENV+= SDL_CFLAGS="`sdl-config --cflags`" \
+ SDL_LIBS="`sdl-config --libs`"
.endif
# if explicitely disabled, do not depend upon it
@@ -63,8 +59,10 @@
.if !defined(WITHOUT_SDL) && !defined(WITH_SDL)
.if ${HAVE_SDL:Msdl}
USE_SDL+= sdl
-CONFIGURE_ENV+= SDLLIBDIR="${LOCALBASE}/lib"
-MAKE_ENV+= SDLLIBDIR="${LOCALBASE}/lib"
+CONFIGURE_ENV+= SDL_CFLAGS="`sdl-config --cflags`" \
+ SDL_LIBS="`sdl-config --libs`"
+MAKE_ENV+= SDL_CFLAGS="`sdl-config --cflags`" \
+ SDL_LIBS="`sdl-config --libs`"
.else
CONFIGURE_ARGS+= --disable-sdl
.endif
@@ -74,31 +72,12 @@
CONFIGURE_ARGS+= --enable-plugins
.endif
-#explicity build OSS
-CONFIGURE_ARGS+= --enable-oss
-
#disable OpenLDAP support in PWLIB
.if defined(WITHOUT_LDAP)
CONFIGURE_ARGS+= --disable-openldap
.else
USE_OPENLDAP= yes
-CONFIGURE_ENV+= OPENLDAPLIBDIR="${LOCALBASE}/lib"
-MAKE_ENV+= OPENLDAPLIBDIR="${LOCALBASE}/lib"
-.endif
-
-#disable OBDC support... it doesn't compile and nothing _seems_ to
-#actually use it. If you do have something that requires this please
-#send patches!
-CONFIGURE_ARGS+= --disable-odbc
-
-#enable esound support
-.if defined(WITH_ESOUND) && ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+= esound
-CONFIGURE_ARGS+= --enable-esd
-PLIST_SUB+= ESD=""
-.else
-CONFIGURE_ARGS+= --disable-esd
-PLIST_SUB+= ESD="@comment "
+CONFIGURE_ARGS+= --enable-openldap --with-ldap-dir="${LOCALBASE}"
.endif
# ONLY FOR THE BRAVE!
@@ -134,8 +113,10 @@
.endif
.if (${ARCH} == "i386") || (${ARCH} == "ia64") || (${ARCH} == "amd64") || (${ARCH} == "sparc64")
+CONFIGURE_ARGS+=--enable-bsdvideo
PLIST_SUB+= BSDVIDEO=""
.else
+CONFIGURE_ARGS+=--disable-bsdvideo
PLIST_SUB+= BSDVIDEO="@comment "
.endif
diff -urN pwlib.orig/distinfo pwlib/distinfo
--- pwlib.orig/distinfo 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/distinfo 2008-10-16 16:10:16.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (openh323/ptlib-v1_12_0-src.tar.gz) = 675dc9cbe3f34c9aed07ec8650fecfd5
-SHA256 (openh323/ptlib-v1_12_0-src.tar.gz) = e150f8460b64bac3c9a90703db81c26ab3e402d19e5cd7b9ebc9d976a8f0535f
-SIZE (openh323/ptlib-v1_12_0-src.tar.gz) = 4316808
+MD5 (ptlib-2.4.1.tar.gz) = 5bcb0a6de75a892395c85fcca5e045ad
+SHA256 (ptlib-2.4.1.tar.gz) = 9a126c675c101ef2b156467486653fd3e688ea949c28cc4eb4ee11b78e26eba9
+SIZE (ptlib-2.4.1.tar.gz) = 7410936
diff -urN pwlib.orig/files/patch-Makefile.in pwlib/files/patch-Makefile.in
--- pwlib.orig/files/patch-Makefile.in 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-Makefile.in 2008-10-16 16:10:16.000000000 +0800
@@ -1,31 +1,24 @@
---- Makefile.in.orig 2005-04-06 16:10:54.000000000 +0600
-+++ Makefile.in 2007-07-13 16:16:39.000000000 +0600
-@@ -254,18 +254,10 @@
- $(DESTDIR)$(PREFIX)/share/pwlib/make ; \
- do mkdir -p $$dir ; chmod 755 $$dir ; \
- done )
-- $(INSTALL) -m 444 lib/$(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
-- (cd $(DESTDIR)$(LIBDIR) ; \
-- rm -f $(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@ ; \
-- ln -sf $(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@ \
-- )
-- (cd $(DESTDIR)$(LIBDIR) ; \
-- rm -f $(PTLIB_FILE). at MAJOR_VERSION@ ; \
-- ln -sf $(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(PTLIB_FILE). at MAJOR_VERSION@ \
-- )
-+ $(INSTALL) -m 444 lib/$(PTLIB_FILE). at MAJOR_VERSION@ $(DESTDIR)$(LIBDIR)
- (cd $(DESTDIR)$(LIBDIR) ; \
- rm -f $(PTLIB_FILE) ; \
-- ln -sf $(PTLIB_FILE). at MAJOR_VERSION@. at MINOR_VERSION@. at BUILD_NUMBER@ $(PTLIB_FILE) \
-+ ln -sf $(PTLIB_FILE). at MAJOR_VERSION@ $(PTLIB_FILE) \
- )
- (cd $(DESTDIR)$(LIBDIR); \
- rm -f libpt. at SHAREDLIBEXT@ ; \
-@@ -295,6 +287,7 @@
- (for fn in make/*.mak ; \
- do $(INSTALL) -m 444 $$fn $(DESTDIR)$(PREFIX)/share/pwlib/make; \
- done)
-+ $(INSTALL) -m 755 version.h $(DESTDIR)$(PREFIX)/share/pwlib/
- $(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/pwlib/make/
- (cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/pwlib/make/ptlib-config ptlib-config)
+--- Makefile.in.orig 2008-09-17 16:06:34.000000000 +0800
++++ Makefile.in 2008-09-25 19:09:46.000000000 +0800
+@@ -126,9 +126,9 @@
+ $(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
+ (cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
+
+- mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+- chmod 755 $(DESTDIR)$(LIBDIR)/pkgconfig
+- $(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
++ mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
++ chmod 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig
++ $(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
+ uninstall:
+ rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
+ $(DESTDIR)$(PREFIX)/include/ptclib \
+@@ -136,7 +136,7 @@
+ $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
+ $(DESTDIR)$(PREFIX)/share/ptlib \
+ $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
+- $(DESTDIR)$(LIBDIR)/pkgconfig/ptlib.pc
++ $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ptlib.pc
+ rm -f $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE)* \
+ $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a
diff -urN pwlib.orig/files/patch-configureac pwlib/files/patch-configureac
--- pwlib.orig/files/patch-configureac 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-configureac 1970-01-01 08:00:00.000000000 +0800
@@ -1,170 +0,0 @@
---- configure.ac.orig 2007-10-19 02:22:39.000000000 -0400
-+++ configure.ac 2007-12-30 16:24:01.000000000 -0500
-@@ -145,7 +145,7 @@
- x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86
- ;;
-
-- x86_64) MACHTYPE=x86_64 ;
-+ x86_64|amd64) MACHTYPE=x86_64 ;
- P_64BIT=1 ;
- LIB64=1 ;
- ;;
-@@ -162,7 +162,9 @@
- LIB64=1 ;
- ;;
-
-- sparc ) MACHTYPE=sparc ;
-+ sparc|sparc64 ) MACHTYPE=sparc ;
-+ P_64BIT=1 ;
-+ LIB64=1 ;
- ;;
-
- powerpc ) MACHTYPE=ppc ;
-@@ -348,7 +350,7 @@
- # $CXX $CFLAGS -Woverloaded-virtual conftest.cc > /dev/null 2>&1
- # if test $? = 0 ; then
- # AC_MSG_RESULT(yes)
--# STDCCFLAGS="$STDCCFLAGS -Woverloaded-virtual"
-+# STDCXXFLAGS="$STDCCFLAGS -Woverloaded-virtual"
- # else
- # AC_MSG_RESULT(no)
- # fi
-@@ -377,7 +379,7 @@
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
-- STDCXXFLAGS="$STDCCFLAGS -rtti"
-+ STDCXXFLAGS="$STDCXXFLAGS -rtti"
- fi
-
- GCSECTIONS=0
-@@ -398,7 +400,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)
-@@ -414,7 +416,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)
-@@ -427,7 +429,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)
-@@ -662,7 +664,7 @@
- P_HAS_ATOMIC_INT=0
- P_NEEDS_GNU_CXX_NAMESPACE=0
- AC_MSG_CHECKING(if atomic integer available)
--AC_TRY_COMPILE([#include <bits/atomicity.h>],
-+AC_TRY_COMPILE([#include ${ATOMICITY_H}],
- [_Atomic_word val;], P_HAS_ATOMIC_INT=1,
- AC_TRY_COMPILE([#include <ext/atomicity.h>],
- [_Atomic_word val;], P_HAS_ATOMIC_INT=2)
-@@ -671,7 +673,7 @@
- AC_MSG_RESULT(yes)
- AC_MSG_CHECKING(if __exchange_and_add is in __gnu_cxx namespace)
- if test ${P_HAS_ATOMIC_INT} = 1 ; then
-- AC_TRY_COMPILE([#include <bits/atomicity.h>],
-+ AC_TRY_COMPILE([#include ${ATOMICITY_H}],
- [_Atomic_word val; __gnu_cxx::__exchange_and_add(&val, 1)],
- P_NEEDS_GNU_CXX_NAMESPACE=1)
- else
-@@ -721,7 +723,7 @@
- AC_MSG_CHECKING(for upad128_t)
- AC_TRY_COMPILE([#include <sys/types.h>],
- [upad128_t upad; upad._q = 0.0;], has_upad128_t=y)
-- if test ${has_upad128_t} == "y"; then
-+ if test ${has_upad128_t} = "y"; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(P_HAS_UPAD128_T)
- else
-@@ -746,7 +748,7 @@
- fi
- fi
-
--if test "${P_HAS_SEMAPHORES}x" == "x" ; then
-+if test "${P_HAS_SEMAPHORES}x" = "x" ; then
-
- AC_TRY_COMPILE([#include <semaphore.h>],
- [sem_t *s = sem_open("test", O_CREAT)],
-@@ -770,18 +772,18 @@
- 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
- if test ${OSTYPE} = FreeBSD ; then
- HAS_PTHREADS=yes
-- ENDLDLIBS="$ENDLDLIBS -pthread"
-- STDCCFLAGS="$STDCCFLAGS -D_REENTRANT -pthread"
-+ ENDLDLIBS="$ENDLDLIBS ${PTHREAD_LIBS}"
-+ STDCCFLAGS="$STDCCFLAGS -D_REENTRANT ${PTHREAD_LIBS}"
- elif test ${OSTYPE} = FreeBSD ; then
- HAS_PTHREADS=yes
- ENDLDLIBS="$ENDLDLIBS -pthread"
-@@ -928,7 +930,7 @@
- AC_SUBST(HAS_PLUGINS)
-
- if test "x$LIB64" != "x" ; then
-- AC_DEFINE_UNQUOTED([P_DEFAULT_PLUGIN_DIR], ["${INSTALLPREFIX}/lib64/pwlib"], [Default plugin directory])
-+ AC_DEFINE_UNQUOTED([P_DEFAULT_PLUGIN_DIR], ["${INSTALLPREFIX}/lib/pwlib"], [Default plugin directory])
- else
- AC_DEFINE_UNQUOTED([P_DEFAULT_PLUGIN_DIR], ["${INSTALLPREFIX}/lib/pwlib"], [Default plugin directory])
- fi
-@@ -1660,7 +1662,7 @@
- dnl Linux check
- AC_CHECK_HEADERS(SDL/SDL.h, HAS_SDL=1)
- if test "${HAS_SDL:-unset}" != "unset" ; then
-- if test "${X11LIBDIR:-unset}" == "unset" ; then
-+ if test "${X11LIBDIR:-unset}" = "unset" ; then
- X11LIBDIR=/usr/X11R6/lib
- fi
- AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext)
-@@ -1718,9 +1720,10 @@
- HAS_VIDEO_CAPTURE=1
- else
- 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(i386/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
-+ AC_CHECK_HEADER(dev/ic/bt8xx.h, HAS_VIDEO_CAPTURE=1)
-+ AC_CHECK_HEADER(dev/bktr/ioctl_meteor.h, HAS_VIDEO_CAPTURE=1)
- if test "${HAS_VIDEO_CAPTURE}z" = "z" ; then
- AC_MSG_NOTICE(No Video Capture support)
- AC_DEFINE([NO_VIDEO_CAPTURE], [], [No video capture])
-@@ -2335,6 +2338,9 @@
- STDCCFLAGS="$STDCCFLAGS -fexceptions"
- fi
-
-+STDCCFLAGS="$CPPFLAGS $STDCCFLAGS"
-+STDCXXFLAGS="$CPPFLAGS $STDCXXFLAGS"
-+
- dnl ########################################################################
- dnl final declarations
-
diff -urN pwlib.orig/files/patch-include-ptclib-dtmf-h pwlib/files/patch-include-ptclib-dtmf-h
--- pwlib.orig/files/patch-include-ptclib-dtmf-h 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-include-ptclib-dtmf-h 1970-01-01 08:00:00.000000000 +0800
@@ -1,10 +0,0 @@
---- include/ptclib/dtmf.h.old 2007-10-19 02:22:38.000000000 -0400
-+++ include/ptclib/dtmf.h 2008-01-05 21:17:30.000000000 -0500
-@@ -69,6 +69,7 @@
- public:
- PDTMFDecoder();
- PString Decode(const short * sampleData, PINDEX numSamples);
-+ PString Decode(const void * buf, PINDEX bytes);
-
- protected:
- enum {
diff -urN pwlib.orig/files/patch-include_ptclib_vsdl.h pwlib/files/patch-include_ptclib_vsdl.h
--- pwlib.orig/files/patch-include_ptclib_vsdl.h 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-include_ptclib_vsdl.h 2008-10-16 16:10:16.000000000 +0800
@@ -1,14 +1,11 @@
---- include/ptclib/vsdl.h.orig Thu Sep 21 00:49:29 2006
-+++ include/ptclib/vsdl.h Thu Sep 21 00:49:53 2006
-@@ -98,11 +98,7 @@
- #if P_SDL
+--- include/ptclib/vsdl.h.orig 2008-09-25 14:51:15.000000000 +0800
++++ include/ptclib/vsdl.h 2008-09-25 14:52:15.000000000 +0800
+@@ -33,7 +33,7 @@
#include <ptlib.h>
--#if defined(P_FREEBSD)
+ #if defined(P_FREEBSD)
-#include <SDL11/SDL.h>
--#else
++#include <SDL.h>
+ #else
#include <SDL/SDL.h>
--#endif
-
- #undef main
-
+ #endif
diff -urN pwlib.orig/files/patch-make::lib.mak pwlib/files/patch-make::lib.mak
--- pwlib.orig/files/patch-make::lib.mak 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-make::lib.mak 1970-01-01 08:00:00.000000000 +0800
@@ -1,51 +0,0 @@
-
-$FreeBSD: ports/devel/pwlib/files/patch-make::lib.mak,v 1.1 2006/07/13 00:33:05 sobomax Exp $
-
---- make/lib.mak
-+++ make/lib.mak
-@@ -130,12 +127,18 @@
- #
-
- ifneq ($(OSTYPE),Darwin)
-- LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION)
-- LIBNAME_MIN = $(LIBNAME_MAJ).$(MINOR_VERSION)
-- ifeq ($(BUILD_TYPE),.)
-- LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER)
-+ ifeq ($(OSTYPE),FreeBSD)
-+ LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION)
-+ LIBNAME_MIN = $(LIBNAME_MAJ)
-+ LIBNAME_PAT = $(LIBNAME_MAJ)
- else
-- LIBNAME_PAT = $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER)
-+ LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION)
-+ LIBNAME_MIN = $(LIBNAME_MAJ).$(MINOR_VERSION)
-+ ifeq ($(BUILD_TYPE),.)
-+ LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER)
-+ else
-+ LIBNAME_PAT = $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER)
-+ endif
- endif
- else
- LIBNAME_MAJ = $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(LIB_SUFFIX),$(LIB_FILENAME))
-@@ -212,8 +215,10 @@
-
- $(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT)
- cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME)
-+ifneq ($(OSTYPE),FreeBSD)
- cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ)
- cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN)
-+endif
-
- $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE)
- @echo EXTLIBS = $(EXTLIBS)
-@@ -224,8 +229,10 @@
- install: $(LIBDIR)/$(LIBNAME_PAT)
- $(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT)
- ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
-+ifneq ($(OSTYPE),FreeBSD)
- ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
- ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
-+endif
-
- endif # P_SHAREDLIB
-
diff -urN pwlib.orig/files/patch-plugins-Makefile.in pwlib/files/patch-plugins-Makefile.in
--- pwlib.orig/files/patch-plugins-Makefile.in 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-plugins-Makefile.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,18 +0,0 @@
---- plugins/Makefile.in.orig Thu Apr 6 10:15:56 2006
-+++ plugins/Makefile.in Thu Apr 6 10:18:41 2006
-@@ -22,6 +22,15 @@
- endif
- endif
-
-+HAS_ESD = @HAS_ESD@
-+
-+ifeq (1,$(HAS_ESD))
-+SUBDIRS += sound_esd
-+ifeq (,$(DEFAULT_SOUND))
-+DEFAULT_SOUND = sound_esd
-+endif
-+endif
-+
- HAS_SUNAUDIO = @HAS_SUNAUDIO@
-
- ifeq (1,$(HAS_SUNAUDIO))
diff -urN pwlib.orig/files/patch-plugins-configure pwlib/files/patch-plugins-configure
--- pwlib.orig/files/patch-plugins-configure 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-plugins-configure 1970-01-01 08:00:00.000000000 +0800
@@ -1,348 +0,0 @@
---- plugins/configure.orig 2007-10-19 02:22:33.000000000 -0400
-+++ plugins/configure 2007-12-30 16:51:33.000000000 -0500
-@@ -309,7 +309,7 @@
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PWLIBDIR PWINSTDIR INSTALLPREFIX LIBDIR CC CFLAGS ac_ct_CC CPP EGREP HAS_ALSA HAS_ESD HAS_OSS HAS_SUNAUDIO HAS_V4L HAS_V4L2 HAS_BSDVIDEOCAP HAS_AVC1394 HAS_DC1394 DC_CFLAGS LIBOBJS LTLIBOBJS'
-+ac_subst_vars='HAS_ESD SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PWLIBDIR PWINSTDIR INSTALLPREFIX LIBDIR CC CFLAGS ac_ct_CC CPP EGREP HAS_ALSA HAS_ESD HAS_OSS HAS_SUNAUDIO HAS_V4L HAS_V4L2 HAS_BSDVIDEOCAP HAS_AVC1394 HAS_DC1394 DC_CFLAGS LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -853,6 +853,7 @@
- --enable-alsa enable ALSA audio support
- --enable-esd enable ESD audio support
- --enable-oss enable OSS audio support
-+ --enable-eds enable ESD audio support
- --enable-sunaudio enable Sun audio support
- --disable-video disable video device support in PWLIB
- --enable-v4l enable V4L video support
-@@ -3623,6 +3624,171 @@
- fi
- fi
-
-+# Check whether --enable-esd or --disable-esd was given.
-+if test "${enable_esd+set}" = set; then
-+ enableval="$enable_esd"
-+
-+else
-+ enable_oss=yes
-+fi;
-+
-+if test "${enable_esd}z" = "yesz" ; then
-+ if test "${ac_cv_header_esd_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for esd.h" >&5
-+echo $ECHO_N "checking for esd.h... $ECHO_C" >&6
-+if test "${ac_cv_header_esd_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_esd_h" >&5
-+echo "${ECHO_T}$ac_cv_header_esd_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking esd.h usability" >&5
-+echo $ECHO_N "checking esd.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <esd.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking esd.h presence" >&5
-+echo $ECHO_N "checking esd.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <esd.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: esd.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: esd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: esd.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: esd.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: esd.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: esd.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: esd.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: esd.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: esd.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: esd.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: esd.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: esd.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: esd.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: esd.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: esd.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: esd.h: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for esd.h" >&5
-+echo $ECHO_N "checking for esd.h... $ECHO_C" >&6
-+if test "${ac_cv_header_esd_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_esd_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_esd_h" >&5
-+echo "${ECHO_T}$ac_cv_header_esd_h" >&6
-+
-+fi
-+if test $ac_cv_header_esd_h = yes; then
-+ ESDHDR=1
-+fi
-+
-+
-+ echo "$as_me:$LINENO: checking for ESD sound support" >&5
-+echo $ECHO_N "checking for ESD sound support... $ECHO_C" >&6
-+ if test "${ESDHDR}z" != "z"; then
-+ HAS_ESD=1
-+
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ fi
-+fi
-+
-+
-
- # Check whether --enable-sunaudio or --disable-sunaudio was given.
- if test "${enable_sunaudio+set}" = set; then
-@@ -4277,6 +4443,148 @@
- BSDVIDEOHDR=1
- fi
-
-+
-+if test "${ac_cv_header_dev_bktr_ioctl_meteor_h+set}" = set; then
-+ echo "$as_me:$LINENO: checking for dev/bktr/ioctl_meteor.h" >&5
-+echo $ECHO_N "checking for dev/bktr/ioctl_meteor.h... $ECHO_C" >&6
-+if test "${ac_cv_header_dev_bktr_ioctl_meteor_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_dev_bktr_ioctl_meteor_h" >&5
-+echo "${ECHO_T}$ac_cv_header_dev_bktr_ioctl_meteor_h" >&6
-+else
-+ # Is the header compilable?
-+echo "$as_me:$LINENO: checking dev/bktr/ioctl_meteor.h usability" >&5
-+echo $ECHO_N "checking dev/bktr/ioctl_meteor.h usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+#include <dev/bktr/ioctl_meteor.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_header_compiler=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking dev/bktr/ioctl_meteor.h presence" >&5
-+echo $ECHO_N "checking dev/bktr/ioctl_meteor.h presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <dev/bktr/ioctl_meteor.h>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } >/dev/null; then
-+ if test -s conftest.err; then
-+ ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+ else
-+ ac_cpp_err=
-+ fi
-+else
-+ ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+ ac_header_preproc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So? What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+ yes:no: )
-+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the compiler's result" >&2;}
-+ ac_header_preproc=yes
-+ ;;
-+ no:yes:* )
-+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: in the future, the compiler will take precedence" >&2;}
-+ (
-+ cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to the AC_PACKAGE_NAME lists. ##
-+## ------------------------------------------ ##
-+_ASBOX
-+ ) |
-+ sed "s/^/$as_me: WARNING: /" >&2
-+ ;;
-+esac
-+echo "$as_me:$LINENO: checking for dev/bktr/ioctl_meteor.h" >&5
-+echo $ECHO_N "checking for dev/bktr/ioctl_meteor.h... $ECHO_C" >&6
-+if test "${ac_cv_header_dev_bktr_ioctl_meteor_h+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_header_dev_bktr_ioctl_meteor_h=$ac_header_preproc
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_header_dev_bktr_ioctl_meteor_h" >&5
-+echo "${ECHO_T}$ac_cv_header_dev_bktr_ioctl_meteor_h" >&6
-+
-+fi
-+if test $ac_cv_header_dev_bktr_ioctl_meteor_h = yes; then
-+ BSDVIDEOHDR=1
-+fi
-+
-
- if test "${ac_cv_header_i386_ioctl_meteor_h+set}" = set; then
- echo "$as_me:$LINENO: checking for i386/ioctl_meteor.h" >&5
-@@ -6060,6 +6368,7 @@
- s, at HAS_ALSA@,$HAS_ALSA,;t t
- s, at HAS_ESD@,$HAS_ESD,;t t
- s, at HAS_OSS@,$HAS_OSS,;t t
-+s, at HAS_ESD@,$HAS_ESD,;t t
- s, at HAS_SUNAUDIO@,$HAS_SUNAUDIO,;t t
- s, at HAS_V4L@,$HAS_V4L,;t t
- s, at HAS_V4L2@,$HAS_V4L2,;t t
diff -urN pwlib.orig/files/patch-plugins-sound_oss-sound_oss_cxx pwlib/files/patch-plugins-sound_oss-sound_oss_cxx
--- pwlib.orig/files/patch-plugins-sound_oss-sound_oss_cxx 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-plugins-sound_oss-sound_oss_cxx 1970-01-01 08:00:00.000000000 +0800
@@ -1,26 +0,0 @@
---- plugins/sound_oss/sound_oss.orig 2008-04-08 13:54:44.000000000 -0400
-+++ plugins/sound_oss/sound_oss.cxx 2008-04-08 13:57:40.000000000 -0400
-@@ -399,6 +399,15 @@
- PINDEX cardnum = numbers.AsInteger(); //dspN.M is truncated to dspN.
- // If we have not yet inserted something for this cardnum, insert it
- if (dsp.GetAt(cardnum+1) == NULL) {
-+#if defined P_FREEBSD
-+ // in FreeBSD the file name should be used via the devfs(5) and
-+ // is just "/dev/dsp0" and devfs(5) takes care of virtual channels,
-+ // like /dev/dsp0.0 /dev/dsp0.1 ...
-+ // everything else would conflict with other KDE apps using the
-+ // audio
-+ devname = devdir + "dsp0";
-+ PTRACE(1, "OSS\tCollectSoundDevices FreeBSD devname set to devfs(5) name:" << devname );
-+ #endif
- dsp.SetAt(cardnum+1, devname);
- }
- }
-@@ -643,6 +652,7 @@
- arg = val = (entry.numChannels == 2) ? 1 : 0;
- if (ConvertOSError(::ioctl(os_handle, SNDCTL_DSP_STEREO, &arg)) || (arg != val)) {
-
-+ resampleRate = entry.resampleRate;
- mSampleRate = entry.sampleRate;
- arg = val = entry.sampleRate;
- if (ConvertOSError(::ioctl(os_handle, SNDCTL_DSP_SPEED, &arg))) {
diff -urN pwlib.orig/files/patch-plugins-vidinput_v4l-vidinput_v4l.cxx pwlib/files/patch-plugins-vidinput_v4l-vidinput_v4l.cxx
--- pwlib.orig/files/patch-plugins-vidinput_v4l-vidinput_v4l.cxx 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-plugins-vidinput_v4l-vidinput_v4l.cxx 1970-01-01 08:00:00.000000000 +0800
@@ -1,26 +0,0 @@
---- plugins/vidinput_v4l/vidinput_v4l.cxx.orig Wed Jan 3 23:37:37 2007
-+++ plugins/vidinput_v4l/vidinput_v4l.cxx Wed Feb 7 01:30:50 2007
-@@ -484,6 +484,15 @@
- struct stat s;
- if (lstat(devname, &s) == 0) {
-
-+#if defined(P_FREEBSD)
-+ // device numbers are irrelevant here, so we match on names instead.
-+ if (filename.GetLength() <= 5 || filename.Left(5) != "video")
-+ continue;
-+ int num = atoi(filename.Mid(6));
-+ if (num < 0 || num > 63)
-+ continue;
-+ vid.SetAt(num, devname);
-+#else
- static const int deviceNumbers[] = { 81 };
- for (PINDEX i = 0; i < PARRAYSIZE(deviceNumbers); i++) {
- if (MAJOR(s.st_rdev) == deviceNumbers[i]) {
-@@ -493,6 +502,7 @@
- }
- }
- }
-+#endif
- }
- }
- }
diff -urN pwlib.orig/files/patch-src-ptlib-unix-svcproc.cxx pwlib/files/patch-src-ptlib-unix-svcproc.cxx
--- pwlib.orig/files/patch-src-ptlib-unix-svcproc.cxx 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-src-ptlib-unix-svcproc.cxx 1970-01-01 08:00:00.000000000 +0800
@@ -1,26 +0,0 @@
---- src/ptlib/unix/svcproc.cxx.orig Mon Mar 12 17:03:44 2007
-+++ src/ptlib/unix/svcproc.cxx Mon Mar 12 17:04:53 2007
-@@ -388,7 +388,7 @@
- #elif defined(BE_THREADS)
- thread_id tid = ::find_thread(NULL);
- #else
-- unsigned tid = (unsigned) pthread_self();
-+ unsigned long tid = (unsigned long) pthread_self();
- #endif
- *out << "ThreadID=0x"
- << setfill('0') << ::hex
-@@ -938,12 +938,12 @@
- #elif defined(BE_THREADS)
- thread_id tid = ::find_thread(NULL);
- #else
-- unsigned tid = (unsigned) pthread_self();
-+ unsigned long tid = (unsigned long) pthread_self();
- #endif
- PThread * thread_ptr = activeThreads.GetAt(tid);
-
- char msg[200];
-- sprintf(msg, "\nCaught %s, thread_id=%u", sigmsg, tid);
-+ sprintf(msg, "\nCaught %s, thread_id=%xu", sigmsg, tid);
-
- if (thread_ptr != NULL) {
- PString thread_name = thread_ptr->GetThreadName();
diff -urN pwlib.orig/files/patch-src-ptlib-unix-tlib-cxx pwlib/files/patch-src-ptlib-unix-tlib-cxx
--- pwlib.orig/files/patch-src-ptlib-unix-tlib-cxx 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-src-ptlib-unix-tlib-cxx 1970-01-01 08:00:00.000000000 +0800
@@ -1,11 +0,0 @@
---- src/ptlib/unix/tlib.cxx 2007-10-19 02:22:32.000000000 -0400
-+++ src/ptlib/unix/tlib.cxx 2008-01-06 21:15:54.000000000 -0500
-@@ -642,7 +642,7 @@
- {
- if (PProcessInstance != NULL) {
- PWaitAndSignal m(PProcessInstance->threadMutex);
-- PThread & thread = PProcessInstance->activeThreads[(unsigned)id];
-+ PThread & thread = PProcessInstance->activeThreads[(uintptr_t)id];
- return thread.GetThreadName();
- }
- return psprintf("%08x", id);
diff -urN pwlib.orig/files/patch-src_ptclib_dtmf_cxx pwlib/files/patch-src_ptclib_dtmf_cxx
--- pwlib.orig/files/patch-src_ptclib_dtmf_cxx 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-src_ptclib_dtmf_cxx 1970-01-01 08:00:00.000000000 +0800
@@ -1,67 +0,0 @@
---- src/ptclib/dtmf.cxx.old 2007-10-19 02:22:33.000000000 -0400
-+++ src/ptclib/dtmf.cxx 2008-01-05 21:17:37.000000000 -0500
-@@ -121,6 +121,64 @@
- }
-
-
-+PString PDTMFDecoder::Decode(const void *buf, PINDEX bytes)
-+{
-+ int x;
-+ int s, kk;
-+ int c, d, f, n;
-+ short *buffer = (short *)buf;
-+
-+ PINDEX numSamples = bytes >> 1;
-+
-+ PString keyString;
-+
-+ PINDEX pos;
-+ for (pos = 0; pos < numSamples; pos++) {
-+
-+ /* Read (and scale) the next 16 bit sample */
-+ x = ((int)(*buffer++)) / (32768/FSC);
-+
-+ /* Input amplitude */
-+ if (x > 0)
-+ ia += (x - ia) / 128;
-+ else
-+ ia += (-x - ia) / 128;
-+
-+ /* For each tone */
-+ s = 0;
-+ for(kk = 0; kk < 8; kk++) {
-+
-+ /* Turn the crank */
-+ c = (P2 * (x - k[kk])) / FSC;
-+ d = x + c;
-+ f = (p1[kk] * (d - h[kk])) / FSC;
-+ n = x - k[kk] - c;
-+ k[kk] = h[kk] + f;
-+ h[kk] = f + d;
-+
-+ /* Detect and Average */
-+ if (n > 0)
-+ y[kk] += (n - y[kk]) / 64;
-+ else
-+ y[kk] += (-n - y[kk]) / 64;
-+
-+ /* Threshold */
-+ if (y[kk] > FSC/10 && y[kk] > ia)
-+ s |= 1 << kk;
-+ }
-+
-+ /* Hysteresis and noise supressor */
-+ if (s != so) {
-+ nn = 0;
-+ so = s;
-+ } else if (nn++ == 520 && s < 256 && key[s] != '?') {
-+ PTRACE(3,"DTMF\tDetected '" << key[s] << "' in PCM-16 stream");
-+ keyString += key[s];
-+ }
-+ }
-+ return keyString;
-+}
-+
- PString PDTMFDecoder::Decode(const short * sampleData, PINDEX numSamples)
- {
- int x;
diff -urN pwlib.orig/files/patch-src_ptclib_vsdl.cxx pwlib/files/patch-src_ptclib_vsdl.cxx
--- pwlib.orig/files/patch-src_ptclib_vsdl.cxx 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-src_ptclib_vsdl.cxx 2008-10-16 16:10:16.000000000 +0800
@@ -1,14 +1,11 @@
---- src/ptclib/vsdl.cxx.orig Thu Sep 21 00:50:56 2006
-+++ src/ptclib/vsdl.cxx Thu Sep 21 00:51:11 2006
-@@ -102,11 +102,7 @@
-
+--- src/ptclib/vsdl.cxx.orig 2008-09-25 14:50:57.000000000 +0800
++++ src/ptclib/vsdl.cxx 2008-09-25 14:51:48.000000000 +0800
+@@ -44,7 +44,7 @@
extern "C" {
--#if defined(P_FREEBSD)
+ #if defined(P_FREEBSD)
-#include <SDL11/SDL.h>
--#else
++#include <SDL.h>
+ #else
#include <SDL/SDL.h>
--#endif
-
- };
-
+ #endif
diff -urN pwlib.orig/files/patch-src_ptlib_common_jidctflt.cxx pwlib/files/patch-src_ptlib_common_jidctflt.cxx
--- pwlib.orig/files/patch-src_ptlib_common_jidctflt.cxx 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-src_ptlib_common_jidctflt.cxx 1970-01-01 08:00:00.000000000 +0800
@@ -1,12 +0,0 @@
---- src/ptlib/common/jidctflt.cxx.orig Wed Apr 5 07:08:00 2006
-+++ src/ptlib/common/jidctflt.cxx Wed Apr 5 07:08:08 2006
-@@ -97,7 +97,8 @@
- #define DEQUANTIZE(coef,quantval) (((FAST_FLOAT) (coef)) * (quantval))
-
-
--#if defined(__GNUC__) && (__GNUC__ >= 3) && (defined(__i686__) || defined(__x86_64__)) && (!defined(P_64BIT)) && (!defined(__MACOSX__))
-+/* asm doesn't compile properly... avoid using */
-+#if 0
-
- static inline unsigned char descale_and_clamp(int x, int shift)
- {
diff -urN pwlib.orig/files/patch-src_ptlib_common_osutils.cxx pwlib/files/patch-src_ptlib_common_osutils.cxx
--- pwlib.orig/files/patch-src_ptlib_common_osutils.cxx 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-src_ptlib_common_osutils.cxx 1970-01-01 08:00:00.000000000 +0800
@@ -1,27 +0,0 @@
---- src/ptlib/common/osutils.cxx.orig Wed May 23 20:36:01 2007
-+++ src/ptlib/common/osutils.cxx Wed May 23 20:36:32 2007
-@@ -2356,21 +2356,21 @@ PReadWriteMutex::PReadWriteMutex()
- PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
- {
- PWaitAndSignal mutex(nestingMutex);
-- return nestedThreads.GetAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
-+ return nestedThreads.GetAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
- }
-
-
- void PReadWriteMutex::EndNest()
- {
- nestingMutex.Wait();
-- nestedThreads.RemoveAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
-+ nestedThreads.RemoveAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
- nestingMutex.Signal();
- }
-
-
- PReadWriteMutex::Nest & PReadWriteMutex::StartNest()
- {
-- POrdinalKey threadId = (PINDEX)PThread::GetCurrentThreadId();
-+ POrdinalKey threadId = (INT)PThread::GetCurrentThreadId();
-
- nestingMutex.Wait();
-
diff -urN pwlib.orig/files/patch-src_ptlib_unix_tlibthrd.cxx pwlib/files/patch-src_ptlib_unix_tlibthrd.cxx
--- pwlib.orig/files/patch-src_ptlib_unix_tlibthrd.cxx 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-src_ptlib_unix_tlibthrd.cxx 1970-01-01 08:00:00.000000000 +0800
@@ -1,47 +0,0 @@
---- src/ptlib/unix/tlibthrd.cxx.orig Wed May 23 20:31:51 2007
-+++ src/ptlib/unix/tlibthrd.cxx Wed May 23 20:35:26 2007
-@@ -754,7 +754,7 @@ BOOL PProcess::PThreadKill(pthread_t id,
- {
- PWaitAndSignal m(threadMutex);
-
-- if (!activeThreads.Contains((unsigned)id))
-+ if (!activeThreads.Contains((uintptr_t)id))
- return FALSE;
-
- return pthread_kill(id, sig) == 0;
-@@ -792,7 +792,7 @@ void PThread::InitialiseProcessThread()
- #endif
-
- ((PProcess *)this)->activeThreads.DisallowDeleteObjects();
-- ((PProcess *)this)->activeThreads.SetAt((unsigned)PX_threadId, this);
-+ ((PProcess *)this)->activeThreads.SetAt((uintptr_t)PX_threadId, this);
-
- PX_firstTimeStart = FALSE;
-
-@@ -906,7 +906,7 @@ void PThread::Restart()
- PAssertPTHREAD(pthread_create, (&PX_threadId, &threadAttr, PX_ThreadStart, this));
-
- // put the thread into the thread list
-- process.activeThreads.SetAt((unsigned)PX_threadId, this);
-+ process.activeThreads.SetAt((uintptr_t)PX_threadId, this);
- if (process.activeThreads.GetSize() > highWaterMark)
- newHighWaterMark = highWaterMark = process.activeThreads.GetSize();
-
-@@ -1229,7 +1229,7 @@ PThread * PThread::Current()
- {
- PProcess & process = PProcess::Current();
- process.threadMutex.Wait();
-- PThread * thread = process.activeThreads.GetAt((unsigned)pthread_self());
-+ PThread * thread = process.activeThreads.GetAt((uintptr_t)pthread_self());
- process.threadMutex.Signal();
- return thread;
- }
-@@ -1362,7 +1362,7 @@ void PThread::PX_ThreadEnd(void * arg)
- }
-
- // remove this thread from the active thread list
-- process.activeThreads.SetAt((unsigned)id, NULL);
-+ process.activeThreads.SetAt((uintptr_t)id, NULL);
-
- // delete the thread if required, note this is done this way to avoid
- // a race condition, the thread ID cannot be zeroed before the if!
diff -urN pwlib.orig/files/patch-unixmak pwlib/files/patch-unixmak
--- pwlib.orig/files/patch-unixmak 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/files/patch-unixmak 1970-01-01 08:00:00.000000000 +0800
@@ -1,34 +0,0 @@
---- make/unix.mak.orig Tue Jan 17 13:57:17 2006
-+++ make/unix.mak Tue Feb 14 15:12:55 2006
-@@ -871,9 +871,9 @@
- endif
-
- ifndef PTLIB_ALT
--PLATFORM_TYPE = $(OSTYPE)_$(MACHTYPE)
-+PLATFORM_TYPE =
- else
--PLATFORM_TYPE = $(OSTYPE)_$(PTLIB_ALT)_$(MACHTYPE)
-+PLATFORM_TYPE =
- endif
-
- ifndef OBJ_SUFFIX
-@@ -939,15 +939,15 @@
- PW_LIBDIR = $(PWLIBDIR)/lib
-
- # set name of the PT library
--PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-+PTLIB_BASE = pt_$(OBJ_SUFFIX)
- PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
--PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
-+PT_OBJBASE = obj_$(OBJDIR_SUFFIX)
- PT_OBJDIR = $(PW_LIBDIR)/$(PT_OBJBASE)
-
- # set name of the PW library (may not be used)
--PWLIB_BASE = pw_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-+PWLIB_BASE = pw_$(GUI_TYPE)_$(OBJ_SUFFIX)
- PWLIB_FILE = lib$(PWLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
--PW_OBJBASE = obj_$(GUI_TYPE)_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
-+PW_OBJBASE = obj_$(GUI_TYPE)_$(OBJDIR_SUFFIX)
- PW_OBJDIR = $(PW_LIBDIR)/$(PW_OBJBASE)
-
- ###############################################################################
diff -urN pwlib.orig/pkg-plist pwlib/pkg-plist
--- pwlib.orig/pkg-plist 2008-10-16 16:09:27.000000000 +0800
+++ pwlib/pkg-plist 2008-10-16 16:10:16.000000000 +0800
@@ -1,14 +1,4 @@
bin/ptlib-config
-include/ptbuildopts.h
-include/ptclib/guid.h
-include/ptclib/podbc.h
-include/ptclib/pvfiledev.h
-include/ptclib/pwavfiledev.h
-include/ptclib/snmp.h
-include/ptclib/paec.h
-include/ptclib/psockbun.h
-include/ptclib/pvidfile.h
-include/ptclib/rfc1155.h
include/ptclib/asnber.h
include/ptclib/asner.h
include/ptclib/asnper.h
@@ -18,6 +8,7 @@
include/ptclib/dtmf.h
include/ptclib/enum.h
include/ptclib/ftp.h
+include/ptclib/guid.h
include/ptclib/html.h
include/ptclib/http.h
include/ptclib/httpform.h
@@ -28,24 +19,32 @@
include/ptclib/memfile.h
include/ptclib/mime.h
include/ptclib/modem.h
+include/ptclib/paec.h
include/ptclib/pasn.h
include/ptclib/pdns.h
include/ptclib/pils.h
include/ptclib/pldap.h
include/ptclib/pnat.h
+include/ptclib/podbc.h
include/ptclib/psasl.h
include/ptclib/psnmp.h
include/ptclib/psoap.h
+include/ptclib/psockbun.h
include/ptclib/pssl.h
include/ptclib/pstun.h
include/ptclib/ptts.h
+include/ptclib/pvfiledev.h
+include/ptclib/pvidfile.h
include/ptclib/pwavfile.h
+include/ptclib/pwavfiledev.h
include/ptclib/pxml.h
include/ptclib/pxmlrpc.h
include/ptclib/pxmlrpcs.h
include/ptclib/qchannel.h
include/ptclib/random.h
+include/ptclib/rfc1155.h
include/ptclib/shttpsvc.h
+include/ptclib/snmp.h
include/ptclib/sockagg.h
include/ptclib/socks.h
include/ptclib/telnet.h
@@ -57,7 +56,48 @@
include/ptclib/xmpp_muc.h
include/ptclib/xmpp_roster.h
@dirrm include/ptclib
-include/ptlib.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/shmvideo.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
+ at dirrm include/ptlib/unix/ptlib
+ at dirrm include/ptlib/unix
include/ptlib/MacMainIf.h
include/ptlib/args.h
include/ptlib/array.h
@@ -116,73 +156,23 @@
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/shmvideo.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
- at dirrm include/ptlib/unix/ptlib
- at 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_r.so
-lib/libpt_r.so.1
-lib/pwlib/devices/sound/oss_pwplugin.so
-%%ESD%%lib/pwlib/devices/sound/esd_pwplugin.so
-%%AVC1394%%lib/pwlib/devices/videoinput/avc_pwplugin.so
-%%BSDVIDEO%%lib/pwlib/devices/videoinput/bsdvideo_pwplugin.so
-%%DC1394%%lib/pwlib/devices/videoinput/dc_pwplugin.so
-%%V4L%%lib/pwlib/devices/videoinput/v4l_pwplugin.so
- at dirrm lib/pwlib/devices/sound
- at dirrm lib/pwlib/devices/videoinput
- at dirrm lib/pwlib/devices
- at dirrmtry lib/pwlib
-%%DATADIR%%/make/common.mak
-%%DATADIR%%/make/lib.mak
-%%DATADIR%%/make/plugins.mak
-%%DATADIR%%/make/ptbuildopts.mak
-%%DATADIR%%/make/ptlib-config
-%%DATADIR%%/make/ptlib.mak
-%%DATADIR%%/make/unix.mak
-%%DATADIR%%/version.h
- at dirrm %%DATADIR%%/make
- at dirrm %%DATADIR%%
+include/ptlib.h
+share/ptlib/make/common.mak
+share/ptlib/make/lib.mak
+share/ptlib/make/plugins.mak
+share/ptlib/make/ptbuildopts.mak
+share/ptlib/make/ptlib-config
+share/ptlib/make/ptlib.mak
+share/ptlib/make/unix.mak
+ at dirrm share/ptlib/make
+ at dirrm share/ptlib
+lib/libpt.so.2.4.1
+lib/libpt.so.2.4
+lib/libpt.so.2
+lib/libpt_s.a
+libdata/pkgconfig/ptlib.pc
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list