5 files changed, 17 insertions, 25 deletions

diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile
index b2c5691841ec..14a83aedb793 100644
--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ptypes
-PORTVERSION=	1.8.3
+PORTVERSION=	1.9.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	sem@ciam.ru
 COMMENT=	C++ Portable Types Library
 
-SHLIB_VER=	1
+SHLIB_VER=	19
 INSTALLS_SHLIB=	yes
-MAKE_ARGS+=	SHLIB_VER=${SHLIB_VER} PTHREAD_LIBS=${PTHREAD_LIBS} \
-		PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
+MAKE_ARGS+=	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
+PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 
 do-install:
 	${MKDIR} ${PREFIX}/include/ptypes
diff --git a/devel/ptypes/distinfo b/devel/ptypes/distinfo
index f2fd1f2170f2..23ee592f527d 100644
--- a/devel/ptypes/distinfo
+++ b/devel/ptypes/distinfo
@@ -1 +1,2 @@
-MD5 (ptypes-1.8.3.tar.gz) = 7914a7d598ce1c7c1b5c61340fd73ed6
+MD5 (ptypes-1.9.0.tar.gz) = ec7edd4471a3cd9a5b25fc078498a594
+SIZE (ptypes-1.9.0.tar.gz) = 214858
diff --git a/devel/ptypes/files/patch-src-Makefile.FreeBSD b/devel/ptypes/files/patch-src-Makefile.FreeBSD
index 9f6a35264fd1..fb173585b46d 100644
--- a/devel/ptypes/files/patch-src-Makefile.FreeBSD
+++ b/devel/ptypes/files/patch-src-Makefile.FreeBSD
@@ -1,6 +1,6 @@
---- Makefile.FreeBSD.orig	Tue Jun 24 13:49:22 2003
-+++ src/Makefile.FreeBSD	Wed Jun 25 02:36:53 2003
-@@ -15,11 +15,11 @@
+--- 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 @@
  
  CXX = g++
  
@@ -9,9 +9,8 @@
 +OS_CXXOPTS = $(PTHREAD_CFLAGS)
 +OS_LDLIBS = $(PTHREAD_LIBS)
  
- SOEXT = so
 -LIBTOOL = $(CXX) -shared -pthread
-+LIBTOOL = $(CXX) -shared $(PTHREAD_CFLAGS)
++LIBTOOL = $(CXX) -shared $(PTHREAD_LIBS)
  SOSTRIP = strip
  
- include Makefile.common
+ SOEXT = so
diff --git a/devel/ptypes/files/patch-src-Makefile.common b/devel/ptypes/files/patch-src-Makefile.common
index f50480fc6d20..9e4e42efc6a7 100644
--- a/devel/ptypes/files/patch-src-Makefile.common
+++ b/devel/ptypes/files/patch-src-Makefile.common
@@ -1,11 +1,11 @@
---- src/Makefile.common.orig	Tue Jun 24 13:49:22 2003
-+++ src/Makefile.common	Wed Jun 25 03:56:22 2003
+--- 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 @@
  AR              = ar
  RANLIB          = ranlib
  
 -DDEBUG          = -DDEBUG
-+DDEBUG          =
++DDEBUG          = 
  INCDIR          = ../include
 -CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -fPIC -Wall -O2
 +CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -fPIC -Wall $(CFLAGS)
@@ -16,12 +16,3 @@
  LDLIBS_ST       = $(OS_LDLIBS_ST)
  
  LIBNAME         = libptypes.a
-@@ -32,7 +32,7 @@
- LIBDEST         = ../lib
- 
- SONAME          = libptypes.$(SOEXT)
--SOVER           = 1
-+SOVER           = $(SHLIB_VER)
- SOREALNAME      = $(SONAME).$(SOVER)
- SODEST          = ../so
- 
diff --git a/devel/ptypes/pkg-plist b/devel/ptypes/pkg-plist
index aaa0f64d7eed..ee3e476dcb1b 100644
--- a/devel/ptypes/pkg-plist
+++ b/devel/ptypes/pkg-plist
@@ -6,10 +6,11 @@ include/ptypes/ptime.h
 include/ptypes/ptypes.h
 lib/libptypes.a
 lib/libptypes.so
-lib/libptypes.so.1
+lib/libptypes.so.%%SHLIB_VER%%
 lib/libptypesn.a
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/doc/async.examples.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/async.jobqueue.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/async.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/async.message.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/async.msgqueue.html
@@ -87,7 +88,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.8.png
+%%PORTDOCS%%%%DOCSDIR%%/doc/title-1.9.png
 %%PORTDOCS%%%%DOCSDIR%%/doc/unit.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/unknown.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/variant.arrays.html