From bd6e58556c927fd59c3e777a11b2271144d22a5d Mon Sep 17 00:00:00 2001 From: pav Date: Fri, 10 Jun 2005 21:29:51 +0000 Subject: - Update to 1.5.2 PR: ports/82086 Submitted by: Steve Ames --- devel/pwlib/Makefile | 3 +- devel/pwlib/distinfo | 4 +- devel/pwlib/files/patch-make-common.mak | 19 ++++++++ devel/pwlib/files/patch-src-ptclib-ansper.cxx | 56 ++++++++++++++++++++++ devel/pwlib/files/patch-src::ptclib::asner.cxx | 58 ----------------------- devel/pwlib/files/patch-unix | 26 +++++----- devel/pwlib152/Makefile | 3 +- devel/pwlib152/distinfo | 4 +- devel/pwlib152/files/patch-make-common.mak | 19 ++++++++ devel/pwlib152/files/patch-src-ptclib-ansper.cxx | 56 ++++++++++++++++++++++ devel/pwlib152/files/patch-src::ptclib::asner.cxx | 58 ----------------------- devel/pwlib152/files/patch-unix | 26 +++++----- 12 files changed, 182 insertions(+), 150 deletions(-) create mode 100644 devel/pwlib/files/patch-make-common.mak create mode 100644 devel/pwlib/files/patch-src-ptclib-ansper.cxx delete mode 100644 devel/pwlib/files/patch-src::ptclib::asner.cxx create mode 100644 devel/pwlib152/files/patch-make-common.mak create mode 100644 devel/pwlib152/files/patch-src-ptclib-ansper.cxx delete mode 100644 devel/pwlib152/files/patch-src::ptclib::asner.cxx (limited to 'devel') diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index 4310b56..378dbac 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -6,8 +6,7 @@ # PORTNAME= pwlib -PORTVERSION= 1.5.0 -PORTREVISION= 5 +PORTVERSION= 1.5.2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://www.openh323.org/bin/ \ diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo index 4161cab..b8697d9 100644 --- a/devel/pwlib/distinfo +++ b/devel/pwlib/distinfo @@ -1,2 +1,2 @@ -MD5 (pwlib_1.5.0.tar.gz) = e6bcdd121a85687c040f4871f24b7352 -SIZE (pwlib_1.5.0.tar.gz) = 1074311 +MD5 (pwlib_1.5.2.tar.gz) = 0fa33ba1b32b254abe0b731a52c0f2f9 +SIZE (pwlib_1.5.2.tar.gz) = 1085203 diff --git a/devel/pwlib/files/patch-make-common.mak b/devel/pwlib/files/patch-make-common.mak new file mode 100644 index 0000000..44f8b75 --- /dev/null +++ b/devel/pwlib/files/patch-make-common.mak @@ -0,0 +1,19 @@ +*** 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/pwlib/files/patch-src-ptclib-ansper.cxx b/devel/pwlib/files/patch-src-ptclib-ansper.cxx new file mode 100644 index 0000000..27f09e7 --- /dev/null +++ b/devel/pwlib/files/patch-src-ptclib-ansper.cxx @@ -0,0 +1,56 @@ +--- 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/pwlib/files/patch-src::ptclib::asner.cxx b/devel/pwlib/files/patch-src::ptclib::asner.cxx deleted file mode 100644 index 4776c3c..0000000 --- a/devel/pwlib/files/patch-src::ptclib::asner.cxx +++ /dev/null @@ -1,58 +0,0 @@ - -$FreeBSD$ - ---- src/ptclib/asner.cxx 2004/06/03 14:44:43 1.1 -+++ src/ptclib/asner.cxx 2004/06/03 14:50:35 -@@ -4926,6 +4926,11 @@ - return -1; - - value += lower; -+ -+ // clamp value to upper limit -+ if (value > upper) -+ value = upper; -+ - return 0; - } - -@@ -4970,7 +4975,13 @@ - 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 -@@ -4981,13 +4992,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/pwlib/files/patch-unix b/devel/pwlib/files/patch-unix index 205bd87..945ad22 100644 --- a/devel/pwlib/files/patch-unix +++ b/devel/pwlib/files/patch-unix @@ -1,7 +1,7 @@ -*** make/unix.mak.orig Thu Aug 28 08:39:18 2003 ---- make/unix.mak Thu Aug 28 08:42:30 2003 -*************** endif # linux -*** 338,348 **** +*** 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) @@ -13,7 +13,7 @@ ifndef OSRELEASE OSRELEASE := $(shell sysctl -n kern.osreldate) ---- 338,348 ---- +--- 358,368 ---- ifeq ($(OSTYPE),FreeBSD) @@ -25,8 +25,8 @@ ifndef OSRELEASE OSRELEASE := $(shell sysctl -n kern.osreldate) -*************** SHELL := /bin/sh -*** 871,881 **** +*************** +*** 891,901 **** # Directories @@ -38,7 +38,7 @@ ifndef UNIX_SRC_DIR UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix ---- 871,881 ---- +--- 891,901 ---- # Directories @@ -50,20 +50,20 @@ ifndef UNIX_SRC_DIR UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix -*************** LDFLAGS += $(DEBLDFLAGS) -*** 912,918 **** +*************** +*** 932,938 **** else ifneq ($(OSTYPE),Darwin) -! OPTCCFLAGS += -O3 -DNDEBUG +! OPTCCFLAGS += -Os -DNDEBUG else OPTCCFLAGS += -O2 -DNDEBUG endif ---- 912,919 ---- +--- 932,939 ---- else ifneq ($(OSTYPE),Darwin) -! # OPTCCFLAGS += -O3 -DNDEBUG +! # OPTCCFLAGS += -Os -DNDEBUG ! OPTCCFLAGS += -DNDEBUG else OPTCCFLAGS += -O2 -DNDEBUG diff --git a/devel/pwlib152/Makefile b/devel/pwlib152/Makefile index 4310b56..378dbac 100644 --- a/devel/pwlib152/Makefile +++ b/devel/pwlib152/Makefile @@ -6,8 +6,7 @@ # PORTNAME= pwlib -PORTVERSION= 1.5.0 -PORTREVISION= 5 +PORTVERSION= 1.5.2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://www.openh323.org/bin/ \ diff --git a/devel/pwlib152/distinfo b/devel/pwlib152/distinfo index 4161cab..b8697d9 100644 --- a/devel/pwlib152/distinfo +++ b/devel/pwlib152/distinfo @@ -1,2 +1,2 @@ -MD5 (pwlib_1.5.0.tar.gz) = e6bcdd121a85687c040f4871f24b7352 -SIZE (pwlib_1.5.0.tar.gz) = 1074311 +MD5 (pwlib_1.5.2.tar.gz) = 0fa33ba1b32b254abe0b731a52c0f2f9 +SIZE (pwlib_1.5.2.tar.gz) = 1085203 diff --git a/devel/pwlib152/files/patch-make-common.mak b/devel/pwlib152/files/patch-make-common.mak new file mode 100644 index 0000000..44f8b75 --- /dev/null +++ b/devel/pwlib152/files/patch-make-common.mak @@ -0,0 +1,19 @@ +*** 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-src-ptclib-ansper.cxx b/devel/pwlib152/files/patch-src-ptclib-ansper.cxx new file mode 100644 index 0000000..27f09e7 --- /dev/null +++ b/devel/pwlib152/files/patch-src-ptclib-ansper.cxx @@ -0,0 +1,56 @@ +--- 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::asner.cxx b/devel/pwlib152/files/patch-src::ptclib::asner.cxx deleted file mode 100644 index 4776c3c..0000000 --- a/devel/pwlib152/files/patch-src::ptclib::asner.cxx +++ /dev/null @@ -1,58 +0,0 @@ - -$FreeBSD$ - ---- src/ptclib/asner.cxx 2004/06/03 14:44:43 1.1 -+++ src/ptclib/asner.cxx 2004/06/03 14:50:35 -@@ -4926,6 +4926,11 @@ - return -1; - - value += lower; -+ -+ // clamp value to upper limit -+ if (value > upper) -+ value = upper; -+ - return 0; - } - -@@ -4970,7 +4975,13 @@ - 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 -@@ -4981,13 +4992,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-unix b/devel/pwlib152/files/patch-unix index 205bd87..945ad22 100644 --- a/devel/pwlib152/files/patch-unix +++ b/devel/pwlib152/files/patch-unix @@ -1,7 +1,7 @@ -*** make/unix.mak.orig Thu Aug 28 08:39:18 2003 ---- make/unix.mak Thu Aug 28 08:42:30 2003 -*************** endif # linux -*** 338,348 **** +*** 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) @@ -13,7 +13,7 @@ ifndef OSRELEASE OSRELEASE := $(shell sysctl -n kern.osreldate) ---- 338,348 ---- +--- 358,368 ---- ifeq ($(OSTYPE),FreeBSD) @@ -25,8 +25,8 @@ ifndef OSRELEASE OSRELEASE := $(shell sysctl -n kern.osreldate) -*************** SHELL := /bin/sh -*** 871,881 **** +*************** +*** 891,901 **** # Directories @@ -38,7 +38,7 @@ ifndef UNIX_SRC_DIR UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix ---- 871,881 ---- +--- 891,901 ---- # Directories @@ -50,20 +50,20 @@ ifndef UNIX_SRC_DIR UNIX_SRC_DIR = $(PWLIBDIR)/src/ptlib/unix -*************** LDFLAGS += $(DEBLDFLAGS) -*** 912,918 **** +*************** +*** 932,938 **** else ifneq ($(OSTYPE),Darwin) -! OPTCCFLAGS += -O3 -DNDEBUG +! OPTCCFLAGS += -Os -DNDEBUG else OPTCCFLAGS += -O2 -DNDEBUG endif ---- 912,919 ---- +--- 932,939 ---- else ifneq ($(OSTYPE),Darwin) -! # OPTCCFLAGS += -O3 -DNDEBUG +! # OPTCCFLAGS += -Os -DNDEBUG ! OPTCCFLAGS += -DNDEBUG else OPTCCFLAGS += -O2 -DNDEBUG -- cgit v1.1