Update ptlib snapshot to 20080912

5 files changed, 21 insertions, 22 deletions

diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index 4386192928a..6be8818494d 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2008/09/13 18:09:06 jmcneill Exp $
 
-DISTNAME=	ptlib-snapshot-20080907
-PKGNAME=	ptlib-2.3.0.20080907
+DISTNAME=	ptlib-snapshot-20080912
+PKGNAME=	ptlib-2.3.0.20080912
 CATEGORIES=	devel
 MASTER_SITES=	http://snapshots.ekiga.net/snapshots/sources/archives/
 
@@ -14,7 +14,7 @@ CONFLICTS+=	pwlib-[0-9]*
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 WRKSRC=			${WRKDIR}/ptlib
-USE_TOOLS+=		gmake tar
+USE_TOOLS+=		gmake tar pkg-config
 BUILD_TARGET=		optshared
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
@@ -23,6 +23,9 @@ CONFIGURE_ARGS+=	--enable-plugins
 CONFIGURE_ARGS+=	--enable-oss
 CONFIGURE_ARGS+=	--enable-v4l2
 CONFIGURE_ARGS+=	--enable-opal
+CONFIGURE_ARGS+=	--enable-openldap
+#CONFIGURE_ARGS+=	--enable-openssl
+CONFIGURE_ARGS+=	--enable-expat
 #CONFIGURE_ARGS+=	--enable-samples
 CONFIGURE_ARGS+=	--disable-bsdvideo
 CONFIGURE_ARGS+=	--disable-sunaudio
@@ -34,8 +37,11 @@ PTHREAD_OPTS+=		require
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/share/ptlib
 
+.include "../../databases/openldap-client/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/libv4l/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ptlib/PLIST b/devel/ptlib/PLIST
index 3ed2d32f080..3349db51d8e 100644
--- a/devel/ptlib/PLIST
+++ b/devel/ptlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/09/13 18:09:06 jmcneill Exp $
 bin/ptlib-config
 include/ptbuildopts.h
 include/ptclib/asnber.h
@@ -168,7 +168,6 @@ lib/libpt_s.a
 lib/pkgconfig/ptlib.pc
 lib/ptlib-2.3.1/devices/sound/oss_pwplugin.so
 lib/ptlib-2.3.1/devices/videoinput/v4l2_pwplugin.so
-share/ptlib/version.h
 share/ptlib/make/common.mak
 share/ptlib/make/lib.mak
 share/ptlib/make/plugins.mak
@@ -176,6 +175,7 @@ share/ptlib/make/ptbuildopts.mak
 share/ptlib/make/ptlib-config
 share/ptlib/make/ptlib.mak
 share/ptlib/make/unix.mak
+share/ptlib/version.h
 @dirrm share/ptlib/make
 @dirrm share/ptlib
 @dirrm lib/ptlib-2.3.1/devices/videoinput
diff --git a/devel/ptlib/buildlink3.mk b/devel/ptlib/buildlink3.mk
index 62f8f6bf488..109a1f286f1 100644
--- a/devel/ptlib/buildlink3.mk
+++ b/devel/ptlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/09/13 18:09:06 jmcneill Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PTLIB_BUILDLINK3_MK:=	${PTLIB_BUILDLINK3_MK}+
@@ -17,7 +17,9 @@ BUILDLINK_ABI_DEPENDS.ptlib?=	ptlib>=2.3.0
 BUILDLINK_PKGSRCDIR.ptlib?=	../../devel/ptlib
 .endif	# PTLIB_BUILDLINK3_MK
 
+.include "../../devel/SDL/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/ptlib/distinfo b/devel/ptlib/distinfo
index 57bf49c1ca7..b4668fe1468 100644
--- a/devel/ptlib/distinfo
+++ b/devel/ptlib/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.2 2008/09/12 20:46:29 sborrill Exp $
+$NetBSD: distinfo,v 1.3 2008/09/13 18:09:06 jmcneill Exp $
 
-SHA1 (ptlib-snapshot-20080907.tar.gz) = 60f398886de64efba3d85054bab2e63342265e0e
-RMD160 (ptlib-snapshot-20080907.tar.gz) = eac6fde099180239d497c3736fdd169b06efd4dd
-Size (ptlib-snapshot-20080907.tar.gz) = 9630016 bytes
+SHA1 (ptlib-snapshot-20080912.tar.gz) = cf77a1b7f3c3e25ae092e381d01cbb4b9275ccc3
+RMD160 (ptlib-snapshot-20080912.tar.gz) = 3b8b2dfdf87a6978f2590bebde8bbd0e0c7e2a1c
+Size (ptlib-snapshot-20080912.tar.gz) = 9630039 bytes
 SHA1 (patch-aa) = 9fb1f106554314eb5e27a961bc1318945afe6318
 SHA1 (patch-ab) = 379e578421a6d302a700bddd02f6cbb588c425e1
 SHA1 (patch-ac) = b0cb79c86fb0cf3182d08a33ad48a3f9becc9c20
 SHA1 (patch-ad) = 04504e7549709f4936dc2c791b0fbcc425781c08
 SHA1 (patch-ae) = 92d140bd9536837186a03a3d3230bbb207df0ae4
-SHA1 (patch-af) = 468d365c6deeca71a985533fbe6855861551e662
+SHA1 (patch-af) = 837cf090245e924397118132bd9529bfc394e0b3
 SHA1 (patch-ag) = 1590773a7cf8448e4e3f5dde1e9853195de75163
 SHA1 (patch-ah) = e2612c09f253af3fe9a66d0624a7524e95f7e2d9
 SHA1 (patch-ai) = 47a7d53e52f5a28b0f25baaf1782a4152e6c6927
diff --git a/devel/ptlib/patches/patch-af b/devel/ptlib/patches/patch-af
index 3419c32da71..07a6709c188 100644
--- a/devel/ptlib/patches/patch-af
+++ b/devel/ptlib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $
+$NetBSD: patch-af,v 1.2 2008/09/13 18:09:06 jmcneill Exp $
 
 --- make/unix.mak.orig	2008-09-07 17:00:16.000000000 -0400
 +++ make/unix.mak	2008-09-08 15:40:22.000000000 -0400
@@ -40,12 +40,3 @@ $NetBSD: patch-af,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $
  endif
  
  ifndef INSTALLBIN_DIR
-@@ -670,7 +678,7 @@
-   ifeq ($(OSTYPE),solaris)
-     OPTCCFLAGS	+= -O3 
-   else
--    OPTCCFLAGS	+= -Os 
-+    OPTCCFLAGS	+=
-   endif
- else
-   OPTCCFLAGS	+= -O2