- Update to 2.1.1

10 files changed, 39 insertions, 88 deletions

diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile
index 1a9bedc93d51..1a79b11b9a52 100644
--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ptypes
-PORTVERSION=	2.0.3
+PORTVERSION=	2.1.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	C++ Portable Types Library
 
-SHLIB_VER=	20
+SHLIB_VER=	21
 
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
diff --git a/devel/ptypes/distinfo b/devel/ptypes/distinfo
index 8d58aebb9cb2..2afa45f74331 100644
--- a/devel/ptypes/distinfo
+++ b/devel/ptypes/distinfo
@@ -1,3 +1,3 @@
-MD5 (ptypes-2.0.3.tar.gz) = bc18f1cf60488f42697c5599fbf706ed
-SHA256 (ptypes-2.0.3.tar.gz) = 83c6e623a73cc12df761ef15a77a0e7d493f06de7be58dc2c5bd0819e5042f96
-SIZE (ptypes-2.0.3.tar.gz) = 224024
+MD5 (ptypes-2.1.1.tar.gz) = f7ed34b09d5b764294e93382f18a0ed3
+SHA256 (ptypes-2.1.1.tar.gz) = 64478db6e6a214db8ba25b041d1b1d4486ec8b2790f180d00c8fff3d2db76624
+SIZE (ptypes-2.1.1.tar.gz) = 222769
diff --git a/devel/ptypes/files/patch-include-pstreams.h b/devel/ptypes/files/patch-include-pstreams.h
deleted file mode 100644
index 12e2419baabc..000000000000
--- a/devel/ptypes/files/patch-include-pstreams.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- include/pstreams.h.orig	Sat Dec 16 19:39:35 2006
-+++ include/pstreams.h	Sat Dec 16 19:44:05 2006
-@@ -266,6 +266,8 @@
- // internal class used in fdxstm
- //
- 
-+class fdxstm;
-+
- class ptpublic fdxoutstm: public outstm
- {
-     friend class fdxstm;
-@@ -740,6 +742,8 @@
- #  pragma warning (disable: 4251)
- #endif
- 
-+
-+class unit_thread;
- 
- class ptpublic unit: public component
- {
diff --git a/devel/ptypes/files/patch-include-ptypes.h b/devel/ptypes/files/patch-include-ptypes.h
deleted file mode 100644
index 90d698a0565c..000000000000
--- a/devel/ptypes/files/patch-include-ptypes.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- include/ptypes.h.orig	Sun Jan 28 16:02:10 2007
-+++ include/ptypes.h	Sun Jan 28 16:45:21 2007
-@@ -71,6 +71,7 @@
- 
- ptpublic extern char* emptystr;
- 
-+class variant;
- 
- class ptpublic string 
- {
-@@ -871,6 +872,7 @@
-     VAR_COMPOUND = VAR_STRING
- };
- 
-+class _varray;
- 
- class ptpublic variant
- {
diff --git a/devel/ptypes/files/patch-src-Makefile.FreeBSD b/devel/ptypes/files/patch-src-Makefile.FreeBSD
index ce9028c20ece..b4965bc9a614 100644
--- a/devel/ptypes/files/patch-src-Makefile.FreeBSD
+++ b/devel/ptypes/files/patch-src-Makefile.FreeBSD
@@ -1,24 +1,25 @@
---- src/Makefile.FreeBSD.orig	Mon May 17 13:37:27 2004
-+++ src/Makefile.FreeBSD	Sat Dec 16 19:29:36 2006
-@@ -12,12 +12,10 @@
+--- src/Makefile.FreeBSD.orig	2007-06-27 17:05:49.000000000 +0400
++++ src/Makefile.FreeBSD	2007-12-14 18:43:29.000000000 +0300
+@@ -12,20 +12,20 @@
  # Makefile for FreeBSD, called from ../Makefile
  #
  
 -CXX = g++
-+OS_CXXOPTS = -fPIC $(PTHREAD_CFLAGS)
++#CXX = g++
+ 
+ OS_CXXOPTS_ST = -Wall
+-OS_CXXOPTS = $(OS_CXXOPTS_ST) -pthread -fPIC
++OS_CXXOPTS = $(OS_CXXOPTS_ST) $(PTHREAD_CFLAGS) -fPIC
+ 
+-# OS_LDLIBS = -lc_r
 +OS_LDLIBS = $(PTHREAD_LIBS)
  
--OS_CXXOPTS = -pthread -fPIC
--OS_LDLIBS = -lc_r
--
 -LIBTOOL = $(CXX) -shared -pthread
 +LIBTOOL = $(CXX) -shared $(PTHREAD_LIBS)
  SOSTRIP = strip
  
  SOEXT = so
-@@ -25,7 +23,7 @@
- SOINSTOPT = -h
- SOINSTNAME = $(SOREALNAME)
+ SOINSTOPT = -h $(SOREALNAME)
  
 -PREFIX = /usr/local
 +PREFIX = $(PREFIX)
diff --git a/devel/ptypes/files/patch-src-Makefile.common b/devel/ptypes/files/patch-src-Makefile.common
index 95f074c75125..af5e05753fd0 100644
--- a/devel/ptypes/files/patch-src-Makefile.common
+++ b/devel/ptypes/files/patch-src-Makefile.common
@@ -1,18 +1,18 @@
---- src/Makefile.common.orig	Mon May 17 13:37:27 2004
-+++ src/Makefile.common	Thu May 20 20:27:59 2004
+--- src/Makefile.common.orig	2007-06-27 17:05:49.000000000 +0400
++++ src/Makefile.common	2007-12-14 18:36:40.000000000 +0300
 @@ -18,12 +18,12 @@
  AR              = ar cru
  RANLIB          = ranlib
  
--DDEBUG          = -DDEBUG -g
+-DDEBUG          = -DDEBUG
 +DDEBUG          = $(DEBUG_FLAGS)
  INCDIR          = ../include
--CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall -O2
-+CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall $(CFLAGS)
+-CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -O2
++CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) $(CFLAGS)
  LDLIBS          = $(OS_LDLIBS)
  
--CXXOPTS_ST      = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) -Wall -O2
-+CXXOPTS_ST      = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) -Wall $(CFLAGS) $(PTHREAD_CFLAGS)
+-CXXOPTS_ST      = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) -O2
++CXXOPTS_ST      = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) $(CFLAGS)
  LDLIBS_ST       = $(OS_LDLIBS_ST)
  
  LIBNAME         = libptypes.a
diff --git a/devel/ptypes/files/patch-src-pvariant.cxx b/devel/ptypes/files/patch-src-pvariant.cxx
deleted file mode 100644
index 270b89efdf7a..000000000000
--- a/devel/ptypes/files/patch-src-pvariant.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pvariant.cxx.orig	Sat Dec 16 19:38:33 2006
-+++ src/pvariant.cxx	Sat Dec 16 19:39:07 2006
-@@ -38,7 +38,7 @@
- protected:
-     int refcount;
- 
--    virtual int _varray::compare(const void* key, const void* item) const;
-+    virtual int compare(const void* key, const void* item) const;
- 
-     friend class variant;
- 
diff --git a/devel/ptypes/files/patch-wshare-Makefile.FreeBSD b/devel/ptypes/files/patch-wshare-Makefile.FreeBSD
index b246eb2831c7..3d3b859e633b 100644
--- a/devel/ptypes/files/patch-wshare-Makefile.FreeBSD
+++ b/devel/ptypes/files/patch-wshare-Makefile.FreeBSD
@@ -1,13 +1,14 @@
---- wshare/Makefile.FreeBSD.orig	Sat Mar 27 14:22:01 2004
-+++ wshare/Makefile.FreeBSD	Wed Mar 31 23:33:45 2004
-@@ -14,8 +14,8 @@
+--- wshare/Makefile.FreeBSD.orig	2007-06-27 17:05:51.000000000 +0400
++++ wshare/Makefile.FreeBSD	2007-12-14 18:39:17.000000000 +0300
+@@ -12,9 +12,9 @@
+ # Makefile for FreeBSD, called from ../Makefile
+ #
  
- CXX = g++
+-CXX = g++
++#CXX = g++
  
--OS_CXXOPTS = -pthread
--OS_LDLIBS = -lc_r
-+OS_CXXOPTS = $(PTHREAD_CFLAGS)
-+OS_LDLIBS = $(PTHREAD_LIBS)
+-OS_CXXOPTS = -Wall -pthread
++OS_CXXOPTS = -Wall $(PTHREAD_LIBS)
+ # OS_LDLIBS = -lc_r
  
  include Makefile.common
- 
diff --git a/devel/ptypes/files/patch-wshare-Makefile.common b/devel/ptypes/files/patch-wshare-Makefile.common
index 6a72f5b959fc..7c1233374d09 100644
--- a/devel/ptypes/files/patch-wshare-Makefile.common
+++ b/devel/ptypes/files/patch-wshare-Makefile.common
@@ -1,5 +1,5 @@
---- wshare/Makefile.common.orig	Sat Mar 27 14:22:02 2004
-+++ wshare/Makefile.common	Wed Mar 31 23:33:57 2004
+--- wshare/Makefile.common.orig	2007-12-14 18:41:28.000000000 +0300
++++ wshare/Makefile.common	2007-12-14 18:41:47.000000000 +0300
 @@ -15,9 +15,9 @@
  
  .SUFFIXES:	.cxx .o
@@ -7,8 +7,8 @@
 -DDEBUG      = -DDEBUG
 +DDEBUG      = $(DEBUG_FLAGS)
  INCDIR      = ../include
--CXXOPTS     = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall -O2
-+CXXOPTS     = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall $(CFLAGS)
+-CXXOPTS     = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -O2
++CXXOPTS     = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) $(CFLAGS)
  LDLIBS      = $(OS_LDLIBS)
  
  BINDEST     = ../bin
diff --git a/devel/ptypes/pkg-plist b/devel/ptypes/pkg-plist
index a48ad2dcab54..be6249b2065f 100644
--- a/devel/ptypes/pkg-plist
+++ b/devel/ptypes/pkg-plist
@@ -81,7 +81,7 @@ lib/libptypesn.a
 %%PORTDOCS%%%%DOCSDIR%%/doc/time.datetime.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/time.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/time.time.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/title-20.png
+%%PORTDOCS%%%%DOCSDIR%%/doc/title-21.png
 %%PORTDOCS%%%%DOCSDIR%%/doc/unit.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/unknown.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/variant.arrays.html
@@ -91,10 +91,9 @@ lib/libptypesn.a
 %%PORTDOCS%%%%DOCSDIR%%/doc/variant.utils.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/wshare.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.BSD_OS
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.CYGWIN_NT
 %%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.Darwin
 %%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.FreeBSD
+%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.HP-UX
 %%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.Linux
 %%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.SunOS
 %%PORTDOCS%%%%EXAMPLESDIR%%/wshare/Makefile.common
@@ -121,7 +120,6 @@ lib/libptypesn.a
 %%PORTDOCS%%%%EXAMPLESDIR%%/wshare/utils.h
 %%PORTDOCS%%%%EXAMPLESDIR%%/wshare/wshare
 %%PORTDOCS%%%%EXAMPLESDIR%%/wshare/wshare.cxx
-%%PORTDOCS%%%%EXAMPLESDIR%%/wshare/wshare.mak
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/wshare
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/doc/include