summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--devel/Makefile1
-rw-r--r--devel/pwlib152/Makefile43
-rw-r--r--devel/pwlib152/distinfo3
-rw-r--r--devel/pwlib152/files/patch-configurein26
-rw-r--r--devel/pwlib152/files/patch-include_ptclib_pldap.h7
-rw-r--r--devel/pwlib152/files/patch-make-common.mak19
-rw-r--r--devel/pwlib152/files/patch-make-ptbuildopts.mak.in14
-rw-r--r--devel/pwlib152/files/patch-makefile14
-rw-r--r--devel/pwlib152/files/patch-src-ptclib-ansper.cxx56
-rw-r--r--devel/pwlib152/files/patch-src_ptclib_pssl.cxx60
-rw-r--r--devel/pwlib152/files/patch-src_ptlib_common_getdate.y7
-rw-r--r--devel/pwlib152/files/patch-unix70
-rw-r--r--devel/pwlib152/files/patch-videoio26
-rw-r--r--devel/pwlib152/pkg-descr12
-rw-r--r--devel/pwlib152/pkg-plist1
16 files changed, 1 insertions, 359 deletions
diff --git a/MOVED b/MOVED
index fd690372caea..7b30cd1abc39 100644
--- a/MOVED
+++ b/MOVED
@@ -2480,3 +2480,4 @@ misc/pointless||2006-10-02|Has expired: No longer actively maintained
www/mediawiki14||2006-10-02|Has expired: No longer supported, please upgrade your wiki installation
comms/pstngw||2006-10-02|Has expired
net/openh323-112||2006-10-02|Has expired
+devel/pwlib152||2006-10-02|Has expired
diff --git a/devel/Makefile b/devel/Makefile
index c9bc287f2659..18951f163943 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1646,7 +1646,6 @@
SUBDIR += ptypes
SUBDIR += publib
SUBDIR += pwlib
- SUBDIR += pwlib152
SUBDIR += py-anonfunc
SUBDIR += py-asn1
SUBDIR += py-astng
diff --git a/devel/pwlib152/Makefile b/devel/pwlib152/Makefile
deleted file mode 100644
index 6fcddb1f750f..000000000000
--- a/devel/pwlib152/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# New ports collection makefile for: pwlib
-# Date created: Fri Aug 22 07:11:44 GMT 2003
-# Whom: Roger Hardiman <roger@freebsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= pwlib152
-PORTVERSION= 1.5.2
-CATEGORIES= devel
-MASTER_SITES= http://www.openh323.org/bin/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= fenner
-DISTNAME= ${NAME}_${PORTVERSION}
-
-MAINTAINER= db@db.net
-COMMENT= A cross platform C++ library, used by OpenH323
-
-LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
-
-WRKSRC= ${WRKDIR}/${NAME}
-
-NAME= pwlib
-USE_BISON= yes
-USE_GMAKE= yes
-USE_OPENLDAP= yes
-USE_AUTOTOOLS= autoconf:259 autoconf:253:env
-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}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 502101
-ONLY_FOR_ARCHS= i386
-.endif
-
-do-install:
-# ${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin
-
-.include <bsd.port.post.mk>
diff --git a/devel/pwlib152/distinfo b/devel/pwlib152/distinfo
deleted file mode 100644
index de6a60038a6b..000000000000
--- a/devel/pwlib152/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (pwlib_1.5.2.tar.gz) = 0fa33ba1b32b254abe0b731a52c0f2f9
-SHA256 (pwlib_1.5.2.tar.gz) = 62b254548ad7a9e71231a160275827d67ff39022ee8e2854a7c9d9fe9a688e65
-SIZE (pwlib_1.5.2.tar.gz) = 1085203
diff --git a/devel/pwlib152/files/patch-configurein b/devel/pwlib152/files/patch-configurein
deleted file mode 100644
index 80c8ec813e73..000000000000
--- a/devel/pwlib152/files/patch-configurein
+++ /dev/null
@@ -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 --git a/devel/pwlib152/files/patch-include_ptclib_pldap.h b/devel/pwlib152/files/patch-include_ptclib_pldap.h
deleted file mode 100644
index 29c64dff5166..000000000000
--- a/devel/pwlib152/files/patch-include_ptclib_pldap.h
+++ /dev/null
@@ -1,7 +0,0 @@
---- include/ptclib/pldap.h.orig Fri Jul 7 17:21:28 2006
-+++ include/ptclib/pldap.h Fri Jul 7 17:39:18 2006
-@@ -1,3 +1,4 @@
-+#define LDAP_DEPRECATED 1
- /*
- * pldap.h
- *
diff --git a/devel/pwlib152/files/patch-make-common.mak b/devel/pwlib152/files/patch-make-common.mak
deleted file mode 100644
index 44f8b75a64d4..000000000000
--- a/devel/pwlib152/files/patch-make-common.mak
+++ /dev/null
@@ -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 --git a/devel/pwlib152/files/patch-make-ptbuildopts.mak.in b/devel/pwlib152/files/patch-make-ptbuildopts.mak.in
deleted file mode 100644
index 0091a706d0c8..000000000000
--- a/devel/pwlib152/files/patch-make-ptbuildopts.mak.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- make/ptbuildopts.mak.in.orig Thu Jul 7 14:17:24 2005
-+++ make/ptbuildopts.mak.in Thu Jul 7 14:15:47 2005
-@@ -9,6 +9,11 @@
- OSTYPE = @OSTYPE@
- OSRELEASE = @OSRELEASE@
-
-+# This line makes this port of pwlib play well with others... otherwise
-+# /usr/local/include gets inserted first and causes the inclusion of
-+# files from different versions of pwlib
-+STDCCFLAGS += -I@PWLIBDIR@/include/ptlib/unix -I@PWLIBDIR@/include
-+
- STDCCFLAGS += @STDCCFLAGS@
- OPTSTDCCFLAGS += @OPTSTDCCFLAGS@
- LDFLAGS += @LDFLAGS@
diff --git a/devel/pwlib152/files/patch-makefile b/devel/pwlib152/files/patch-makefile
deleted file mode 100644
index 1f7ea0dfcc56..000000000000
--- a/devel/pwlib152/files/patch-makefile
+++ /dev/null
@@ -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 --git a/devel/pwlib152/files/patch-src-ptclib-ansper.cxx b/devel/pwlib152/files/patch-src-ptclib-ansper.cxx
deleted file mode 100644
index 27f09e7b8870..000000000000
--- a/devel/pwlib152/files/patch-src-ptclib-ansper.cxx
+++ /dev/null
@@ -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 --git a/devel/pwlib152/files/patch-src_ptclib_pssl.cxx b/devel/pwlib152/files/patch-src_ptclib_pssl.cxx
deleted file mode 100644
index 4d5d8d34e99e..000000000000
--- a/devel/pwlib152/files/patch-src_ptclib_pssl.cxx
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/ptclib/pssl.cxx.orig Wed Apr 16 04:00:19 2003
-+++ src/ptclib/pssl.cxx Wed Feb 22 09:24:08 2006
-@@ -285,14 +285,22 @@
-
- PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize)
- {
-+#if (OPENSSL_VERSION_NUMBER < 0x0090801f)
- key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize);
-+#else
-+ key = d2i_AutoPrivateKey(NULL, (const unsigned char **)&keyData, keySize);
-+#endif
- }
-
-
- PSSLPrivateKey::PSSLPrivateKey(const PBYTEArray & keyData)
- {
- const BYTE * keyPtr = keyData;
-+#if (OPENSSL_VERSION_NUMBER < 0x0090801f)
- key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize());
-+#else
-+ key = d2i_AutoPrivateKey(NULL, (const unsigned char **)&keyPtr, keyData.GetSize());
-+#endif
- }
-
-
-@@ -460,14 +468,22 @@
-
- PSSLCertificate::PSSLCertificate(const BYTE * certData, PINDEX certSize)
- {
-+#if (OPENSSL_VERSION_NUMBER < 0x0090801f)
- certificate = d2i_X509(NULL, (unsigned char **)&certData, certSize);
-+#else
-+ certificate = d2i_X509(NULL, (const unsigned char **)&certData, certSize);
-+#endif
- }
-
-
- PSSLCertificate::PSSLCertificate(const PBYTEArray & certData)
- {
- const BYTE * certPtr = certData;
-+#if (OPENSSL_VERSION_NUMBER < 0x0090801f)
- certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
-+#else
-+ certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
-+#endif
- }
-
-
-@@ -477,7 +493,11 @@
- PBase64::Decode(certStr, certData);
- if (certData.GetSize() > 0) {
- const BYTE * certPtr = certData;
-+#if (OPENSSL_VERSION_NUMBER < 0x0090801f)
- certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
-+#else
-+ certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
-+#endif
- }
- else
- certificate = NULL;
diff --git a/devel/pwlib152/files/patch-src_ptlib_common_getdate.y b/devel/pwlib152/files/patch-src_ptlib_common_getdate.y
deleted file mode 100644
index b4cd1ac38b9b..000000000000
--- a/devel/pwlib152/files/patch-src_ptlib_common_getdate.y
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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
-@@ -1,3 +1,4 @@
-+%pure-parser
- %{
- /*
- ** Originally written by Steven M. Bellovin <smb@research.att.com> while
diff --git a/devel/pwlib152/files/patch-unix b/devel/pwlib152/files/patch-unix
deleted file mode 100644
index 945ad223fb83..000000000000
--- a/devel/pwlib152/files/patch-unix
+++ /dev/null
@@ -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 --git a/devel/pwlib152/files/patch-videoio b/devel/pwlib152/files/patch-videoio
deleted file mode 100644
index 7e86b99f5bca..000000000000
--- a/devel/pwlib152/files/patch-videoio
+++ /dev/null
@@ -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 <linux/videodev.h> /* 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 <dev/bktr/ioctl_meteor.h>
-+#else
- #include <machine/ioctl_meteor.h>
- #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 --git a/devel/pwlib152/pkg-descr b/devel/pwlib152/pkg-descr
deleted file mode 100644
index df064540dc9a..000000000000
--- a/devel/pwlib152/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-PWLib is a multi-platform code library that can be used to write
-applications that will compile and run on the BSD Unixes, Windows, Linux
-and a few other Unix variants. It was developed by Equivalence Ltd Pty.
-
-It is used by the OpenH323 library.
-
-NOTE: This port does not install anything.
-The ports which use pwlib all look inside their local
-pwlib port directory for the library and header files
-and are compiled statically.
-
-WWW: http://www.openh323.org/
diff --git a/devel/pwlib152/pkg-plist b/devel/pwlib152/pkg-plist
deleted file mode 100644
index 549a621fec0c..000000000000
--- a/devel/pwlib152/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-@comment this plist intentionally left empty