7 files changed, 38 insertions, 35 deletions

diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile
index b1a3c414f5eb..2886b1d92b59 100644
--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ptypes
-PORTVERSION=	1.9.0
+PORTVERSION=	2.0.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sem@ciam.ru
 COMMENT=	C++ Portable Types Library
 
-SHLIB_VER=	19
+SHLIB_VER=	20
 
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
@@ -30,7 +30,7 @@ OPTIONS=	DEBUG "Build debug version" off \
 DEBUG_FLAGS=	-DDEBUG
 .endif
 .if defined(WITH_OPTIMIZED)
-PTYPES_CFLAGS+=	-O2
+PTHREAD_CFLAGS+=-O2
 .endif
 
 MAKE_ARGS+=	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
diff --git a/devel/ptypes/distinfo b/devel/ptypes/distinfo
index 23ee592f527d..6a09feb6f8ce 100644
--- a/devel/ptypes/distinfo
+++ b/devel/ptypes/distinfo
@@ -1,2 +1,2 @@
-MD5 (ptypes-1.9.0.tar.gz) = ec7edd4471a3cd9a5b25fc078498a594
-SIZE (ptypes-1.9.0.tar.gz) = 214858
+MD5 (ptypes-2.0.1.tar.gz) = 78338ef651975b535468cfc28f15fc37
+SIZE (ptypes-2.0.1.tar.gz) = 223549
diff --git a/devel/ptypes/files/patch-src-Makefile.FreeBSD b/devel/ptypes/files/patch-src-Makefile.FreeBSD
index fb173585b46d..c2ce12a3a0d0 100644
--- a/devel/ptypes/files/patch-src-Makefile.FreeBSD
+++ b/devel/ptypes/files/patch-src-Makefile.FreeBSD
@@ -1,12 +1,12 @@
---- src/Makefile.FreeBSD.orig	Sun Jan 25 20:37:18 2004
-+++ src/Makefile.FreeBSD	Thu Jan 29 19:46:39 2004
-@@ -15,10 +15,10 @@
+--- src/Makefile.FreeBSD.orig	Sat Mar 27 14:22:01 2004
++++ src/Makefile.FreeBSD	Wed Mar 31 23:26:46 2004
+@@ -14,10 +14,10 @@
  
  CXX = g++
  
--OS_CXXOPTS = -pthread
+-OS_CXXOPTS = -pthread -fPIC
 -OS_LDLIBS = -lc_r
-+OS_CXXOPTS = $(PTHREAD_CFLAGS)
++OS_CXXOPTS = -fPIC $(PTHREAD_CFLAGS)
 +OS_LDLIBS = $(PTHREAD_LIBS)
  
 -LIBTOOL = $(CXX) -shared -pthread
@@ -14,3 +14,12 @@
  SOSTRIP = strip
  
  SOEXT = so
+@@ -25,7 +25,7 @@
+ SOINSTOPT = -h
+ SOINSTNAME = $(SOREALNAME)
+ 
+-PREFIX = /usr/local
++PREFIX = $(PREFIX)
+ 
+ include Makefile.common
+ 
diff --git a/devel/ptypes/files/patch-src-Makefile.common b/devel/ptypes/files/patch-src-Makefile.common
index 753b54984e7f..ae14f8b3b7fb 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	Sun Jan 25 20:37:18 2004
-+++ src/Makefile.common	Thu Jan 29 19:50:41 2004
-@@ -19,12 +19,12 @@
+--- src/Makefile.common.orig	Sat Mar 27 14:22:01 2004
++++ src/Makefile.common	Wed Mar 31 23:44:05 2004
+@@ -18,12 +18,12 @@
  AR              = ar
  RANLIB          = ranlib
  
 -DDEBUG          = -DDEBUG
 +DDEBUG          = $(DEBUG_FLAGS)
  INCDIR          = ../include
--CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -fPIC -Wall -O2
-+CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -fPIC -Wall $(PTYPES_CFLAGS)
+-CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall -O2
++CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall $(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 $(PTYPES_CFLAGS)
++CXXOPTS_ST      = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) -Wall $(CFLAGS) $(PTHREAD_CFLAGS)
  LDLIBS_ST       = $(OS_LDLIBS_ST)
  
  LIBNAME         = libptypes.a
diff --git a/devel/ptypes/files/patch-wshare-Makefile.FreeBSD b/devel/ptypes/files/patch-wshare-Makefile.FreeBSD
index e2ca6b8833b1..b246eb2831c7 100644
--- a/devel/ptypes/files/patch-wshare-Makefile.FreeBSD
+++ b/devel/ptypes/files/patch-wshare-Makefile.FreeBSD
@@ -1,6 +1,6 @@
---- Makefile.FreeBSD.orig	Wed Jun 25 02:38:24 2003
-+++ wshare/Makefile.FreeBSD	Wed Jun 25 02:38:48 2003
-@@ -15,8 +15,8 @@
+--- 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 @@
  
  CXX = g++
  
diff --git a/devel/ptypes/files/patch-wshare-Makefile.common b/devel/ptypes/files/patch-wshare-Makefile.common
index fe93f23fa87d..6a72f5b959fc 100644
--- a/devel/ptypes/files/patch-wshare-Makefile.common
+++ b/devel/ptypes/files/patch-wshare-Makefile.common
@@ -1,6 +1,6 @@
---- Makefile.common.orig	Wed Jun 25 02:41:34 2003
-+++ wshare/Makefile.common	Wed Jun 25 02:42:10 2003
-@@ -16,9 +16,9 @@
+--- wshare/Makefile.common.orig	Sat Mar 27 14:22:02 2004
++++ wshare/Makefile.common	Wed Mar 31 23:33:57 2004
+@@ -15,9 +15,9 @@
  
  .SUFFIXES:	.cxx .o
  
@@ -8,7 +8,7 @@
 +DDEBUG      = $(DEBUG_FLAGS)
  INCDIR      = ../include
 -CXXOPTS     = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall -O2
-+CXXOPTS     = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall $(PTYPES_CFLAGS)
++CXXOPTS     = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall $(CFLAGS)
  LDLIBS      = $(OS_LDLIBS)
  
  BINDEST     = ../bin
diff --git a/devel/ptypes/pkg-plist b/devel/ptypes/pkg-plist
index ee3e476dcb1b..10e4368f6142 100644
--- a/devel/ptypes/pkg-plist
+++ b/devel/ptypes/pkg-plist
@@ -47,17 +47,10 @@ lib/libptypesn.a
 %%PORTDOCS%%%%DOCSDIR%%/doc/inet.utils.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/lists.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.objlist.constructors.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.objlist.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.objlist.manipulation.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.strlist.constructors.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.strlist.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.strlist.manipulation.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.strlist.search.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.strmap.constructors.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.strmap.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.strmap.manipulation.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/lists.strmap.search.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lists.textmap.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lists.tobjlist.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lists.tpodlist.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lists.tstrlist.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/portability.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/ref.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/ref.tmpl.html
@@ -88,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-1.9.png
+%%PORTDOCS%%%%DOCSDIR%%/doc/title-2.0.png
 %%PORTDOCS%%%%DOCSDIR%%/doc/unit.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/unknown.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/variant.arrays.html
@@ -99,6 +92,7 @@ lib/libptypesn.a
 %%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.Linux