Updated to version 1.7.1.

Created patches since the authors don't know how to make shared libraries,
or to use pthreads on FBSD.

7 files changed, 225 insertions, 82 deletions

diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile
index 9c352ce5d395..3d375f7ed70e 100644
--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@@ -7,29 +7,34 @@
 #
 
 PORTNAME=	ptypes
-PORTVERSION=	1.5.3
+PORTVERSION=	1.7.1
 PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.melikyan.com/ptypes/ \
-		http://ptypes.sourceforge.net/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@geeksrus.net
 
+CFLAGS+=	${PTHREAD_CFLAGS} -fPIC
 USE_REINPLACE=	yes
-
-post-patch:
-.for dir in src wshare
-	@${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" ${WRKSRC}/${dir}/Makefile.FreeBSD
-.endfor
-
+SHLIB_VER=	1
+INSTALLS_SHLIB=	yes
+MAKE_ARGS+=	SHLIB_VER=${SHLIB_VER} CFLAGS="${CFLAGS}" \
+		PTHREAD_LIBS=${PTHREAD_LIBS}
 do-install:
-	@${MKDIR} ${PREFIX}/include/ptypes
+	${MKDIR} ${PREFIX}/include/ptypes
 	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/ptypes
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/libptypes.a ${PREFIX}/lib
+	${MKDIR} ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/so/libptypes.so.${SHLIB_VER} \
+		${PREFIX}/lib
+	cd ${PREFIX}/lib; ${LN} -s libptypes.so.${SHLIB_VER} libptypes.so
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/lib
+	${MKDIR} ${EXAMPLESDIR}/wshare
+	-${RM} -f ${WRKSRC}/wshare/*.o ${WRKSRC}/wshare/*.orig
+	${INSTALL_DATA} ${WRKSRC}/wshare/*.* ${EXAMPLESDIR}/wshare
+	${INSTALL_PROGRAM} ${WRKSRC}/wshare/wshare ${EXAMPLESDIR}/wshare
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/doc
+	${MKDIR} ${DOCSDIR}/doc
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/index.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/doc
 .endif
diff --git a/devel/ptypes/distinfo b/devel/ptypes/distinfo
index 453061ea41a9..c7a8bcae6b51 100644
--- a/devel/ptypes/distinfo
+++ b/devel/ptypes/distinfo
@@ -1 +1 @@
-MD5 (ptypes-1.5.3.tar.gz) = a0d3a5cde3ec6d1012cdcbc403660c33
+MD5 (ptypes-1.7.1.tar.gz) = bd630ba1e72623ef2fca22952345e04f
diff --git a/devel/ptypes/files/patch-src-Makefile.FreeBSD b/devel/ptypes/files/patch-src-Makefile.FreeBSD
new file mode 100644
index 000000000000..e37f6ab9b6c0
--- /dev/null
+++ b/devel/ptypes/files/patch-src-Makefile.FreeBSD
@@ -0,0 +1,14 @@
+--- src/Makefile.FreeBSD.orig	Fri Oct 18 09:01:34 2002
++++ src/Makefile.FreeBSD	Tue Oct 22 07:33:42 2002
+@@ -15,9 +15,9 @@
+ 
+ CXX = g++
+ 
+-CXXOPTS = -pthread
++CXXOPTS = 
+ 
+-RANLIB = test
++RANLIB = ranlib
+ 
+ SOEXT = so
+ 
diff --git a/devel/ptypes/files/patch-src-Makefile.common b/devel/ptypes/files/patch-src-Makefile.common
new file mode 100644
index 000000000000..3ae78cf4a1e0
--- /dev/null
+++ b/devel/ptypes/files/patch-src-Makefile.common
@@ -0,0 +1,42 @@
+--- src/Makefile.common.orig	Fri Oct 18 09:01:34 2002
++++ src/Makefile.common	Tue Oct 22 07:31:47 2002
+@@ -18,17 +18,17 @@
+ 
+ AR		= ar
+ 
+-CXXDEFS         = -DDEBUG
++CXXDEFS         = 
+ 
+ INCDIR		= ../include
+ 
+-CXXFLAGS	= $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -Wall -O2
++CXXFLAGS	= $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -Wall $(CFLAGS)
+ 
+ LIBNAME		= libptypes.a
+ LIBDEST		= ../lib
+ 
+ SONAME		= libptypes.$(SOEXT)
+-SOVER		= 1
++SOVER		= $(SHLIB_VER)
+ SOREALNAME	= $(SONAME).$(SOVER)
+ SODEST		= ../so
+ 
+@@ -72,7 +72,7 @@
+ 	cp $@ $(LIBDEST)/
+ 
+ $(SOREALNAME): $(LIBOBJS)
+-	$(LIBTOOL) $(LIBOBJS) $(LDLIBS) -o $@
++	$(LIBTOOL) $(LIBOBJS) $(LDLIBS) -o $@ ${PTHREAD_LIBS} -lc_r
+ 	rm -f $(SONAME) ; ln -s $@ $(SONAME)
+ 	cp $@ $(SODEST)/
+ 	cd $(SODEST) ; rm -f $(SONAME) ; ln -s $@ $(SONAME) ; $(SOSTRIP) $@
+@@ -184,7 +184,8 @@
+ ptypes_test.o: ptypes_test.cxx $(HALL)
+ 
+ ptypes_test: ptypes_test.o $(LIBNAME)
+-	$(CXX) $(CXXFLAGS) $@.o -L./ $(LDLIBS) libptypes.a -o $@
++	$(CXX) $(CXXFLAGS) $@.o -L./ $(LDLIBS) libptypes.a -o $@ \
++		$(PTHREAD_LIBS) -lc_r
+ 
+ clean: clean-src
+ 	rm -f $(LIBDEST)/$(LIBNAME)
diff --git a/devel/ptypes/files/patch-wshare-Makefile.FreeBSD b/devel/ptypes/files/patch-wshare-Makefile.FreeBSD
new file mode 100644
index 000000000000..9a5b2123b994
--- /dev/null
+++ b/devel/ptypes/files/patch-wshare-Makefile.FreeBSD
@@ -0,0 +1,11 @@
+--- wshare/Makefile.FreeBSD.orig	Fri Oct 18 09:01:35 2002
++++ wshare/Makefile.FreeBSD	Tue Oct 22 07:37:07 2002
+@@ -15,7 +15,7 @@
+ 
+ CXX = g++
+ 
+-CXXOPTS = -pthread
++CXXOPTS =
+ 
+ include Makefile.common
+ 
diff --git a/devel/ptypes/files/patch-wshare-Makefile.common b/devel/ptypes/files/patch-wshare-Makefile.common
new file mode 100644
index 000000000000..83ac3df62e9d
--- /dev/null
+++ b/devel/ptypes/files/patch-wshare-Makefile.common
@@ -0,0 +1,26 @@
+--- wshare/Makefile.common.orig	Fri Oct 18 09:01:35 2002
++++ wshare/Makefile.common	Tue Oct 22 07:36:40 2002
+@@ -16,11 +16,11 @@
+ 
+ .SUFFIXES:	.cxx .o
+ 
+-CXXDEFS     = -DDEBUG
++CXXDEFS     =
+ 
+ INCDIR      = ../include
+ 
+-CXXFLAGS    = $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -Wall -O2
++CXXFLAGS    = $(CXXOPTS) $(CXXDEFS) -I$(INCDIR) -Wall $(CFLAGS)
+ 
+ BINDEST     = ../bin
+ 
+@@ -36,7 +36,8 @@
+ 
+ 
+ wshare: $(OBJS) ../lib/libptypes.a
+-	$(CXX) $(CXXFLAGS) $(OBJS) $(LDLIBS) ../lib/libptypes.a -o $@
++	$(CXX) $(CXXFLAGS) $(OBJS) $(LDLIBS) ../lib/libptypes.a -o $@ \
++		${PTHREAD_LIBS} -lc_r
+ 	cp $@ $(BINDEST)/
+ 	strip $(BINDEST)/$@
+ 
diff --git a/devel/ptypes/pkg-plist b/devel/ptypes/pkg-plist
index 0e78656b1fc8..1735bf98d7fe 100644
--- a/devel/ptypes/pkg-plist
+++ b/devel/ptypes/pkg-plist
@@ -4,72 +4,117 @@ include/ptypes/pport.h
 include/ptypes/pstreams.h
 include/ptypes/ptime.h
 include/ptypes/ptypes.h
-@dirrm include/ptypes
 lib/libptypes.a
-%%PORTDOCS%%share/doc/ptypes/LICENSE
-%%PORTDOCS%%share/doc/ptypes/index.html
-%%PORTDOCS%%share/doc/ptypes/doc/async.examples.html
-%%PORTDOCS%%share/doc/ptypes/doc/async.html
-%%PORTDOCS%%share/doc/ptypes/doc/async.message.html
-%%PORTDOCS%%share/doc/ptypes/doc/async.msgqueue.html
-%%PORTDOCS%%share/doc/ptypes/doc/async.mutex.html
-%%PORTDOCS%%share/doc/ptypes/doc/async.semaphore.html
-%%PORTDOCS%%share/doc/ptypes/doc/async.thread.html
-%%PORTDOCS%%share/doc/ptypes/doc/async.utils.html
-%%PORTDOCS%%share/doc/ptypes/doc/basic.html
-%%PORTDOCS%%share/doc/ptypes/doc/changes.html
-%%PORTDOCS%%share/doc/ptypes/doc/compiling.html
-%%PORTDOCS%%share/doc/ptypes/doc/criterrors.html
-%%PORTDOCS%%share/doc/ptypes/doc/cset.constructors.html
-%%PORTDOCS%%share/doc/ptypes/doc/cset.html
-%%PORTDOCS%%share/doc/ptypes/doc/cset.manipulation.html
-%%PORTDOCS%%share/doc/ptypes/doc/cset.operators.html
-%%PORTDOCS%%share/doc/ptypes/doc/freshmeat-logo.gif
-%%PORTDOCS%%share/doc/ptypes/doc/index.html
-%%PORTDOCS%%share/doc/ptypes/doc/inet.examples.html
-%%PORTDOCS%%share/doc/ptypes/doc/inet.html
-%%PORTDOCS%%share/doc/ptypes/doc/inet.ipserver.html
-%%PORTDOCS%%share/doc/ptypes/doc/inet.ipsocket.html
-%%PORTDOCS%%share/doc/ptypes/doc/inet.utils.html
-%%PORTDOCS%%share/doc/ptypes/doc/intro.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.objlist.constructors.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.objlist.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.objlist.manipulation.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.strlist.constructors.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.strlist.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.strlist.manipulation.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.strlist.search.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.strmap.constructors.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.strmap.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.strmap.manipulation.html
-%%PORTDOCS%%share/doc/ptypes/doc/lists.strmap.search.html
-%%PORTDOCS%%share/doc/ptypes/doc/portability.html
-%%PORTDOCS%%share/doc/ptypes/doc/ref.html
-%%PORTDOCS%%share/doc/ptypes/doc/ref.tmpl.html
-%%PORTDOCS%%share/doc/ptypes/doc/source-forge-logo.gif
-%%PORTDOCS%%share/doc/ptypes/doc/streams.errors.html
-%%PORTDOCS%%share/doc/ptypes/doc/streams.examples.html
-%%PORTDOCS%%share/doc/ptypes/doc/streams.html
-%%PORTDOCS%%share/doc/ptypes/doc/streams.infile.html
-%%PORTDOCS%%share/doc/ptypes/doc/streams.instm.html
-%%PORTDOCS%%share/doc/ptypes/doc/streams.iobase.html
-%%PORTDOCS%%share/doc/ptypes/doc/streams.md5.html
-%%PORTDOCS%%share/doc/ptypes/doc/streams.outfile.html
-%%PORTDOCS%%share/doc/ptypes/doc/streams.outstm.html
-%%PORTDOCS%%share/doc/ptypes/doc/streams.stdio.html
-%%PORTDOCS%%share/doc/ptypes/doc/string.constructors.html
-%%PORTDOCS%%share/doc/ptypes/doc/string.html
-%%PORTDOCS%%share/doc/ptypes/doc/string.manipulation.html
-%%PORTDOCS%%share/doc/ptypes/doc/string.operators.html
-%%PORTDOCS%%share/doc/ptypes/doc/string.typecasts.html
-%%PORTDOCS%%share/doc/ptypes/doc/styles.css
-%%PORTDOCS%%share/doc/ptypes/doc/time.calendar.html
-%%PORTDOCS%%share/doc/ptypes/doc/time.datetime.html
-%%PORTDOCS%%share/doc/ptypes/doc/time.html
-%%PORTDOCS%%share/doc/ptypes/doc/time.time.html
-%%PORTDOCS%%share/doc/ptypes/doc/title.gif
-%%PORTDOCS%%share/doc/ptypes/doc/unknown.html
-%%PORTDOCS%%share/doc/ptypes/doc/wshare.html
-%%PORTDOCS%%@dirrm share/doc/ptypes/doc
-%%PORTDOCS%%@dirrm share/doc/ptypes
+lib/libptypes.so
+lib/libptypes.so.1
+share/doc/ptypes/LICENSE
+share/doc/ptypes/doc/async.examples.html
+share/doc/ptypes/doc/async.html
+share/doc/ptypes/doc/async.message.html
+share/doc/ptypes/doc/async.msgqueue.html
+share/doc/ptypes/doc/async.mutex.html
+share/doc/ptypes/doc/async.rwlock.html
+share/doc/ptypes/doc/async.semaphore.html
+share/doc/ptypes/doc/async.thread.html
+share/doc/ptypes/doc/async.trigger.html
+share/doc/ptypes/doc/async.utils.html
+share/doc/ptypes/doc/basic.html
+share/doc/ptypes/doc/changes.html
+share/doc/ptypes/doc/compiling.html
+share/doc/ptypes/doc/criterrors.html
+share/doc/ptypes/doc/cset.constructors.html
+share/doc/ptypes/doc/cset.html
+share/doc/ptypes/doc/cset.manipulation.html
+share/doc/ptypes/doc/cset.operators.html
+share/doc/ptypes/doc/deploying.html
+share/doc/ptypes/doc/freshmeat-logo.gif
+share/doc/ptypes/doc/index.html
+share/doc/ptypes/doc/inet.examples.html
+share/doc/ptypes/doc/inet.html
+share/doc/ptypes/doc/inet.ipmessage.html
+share/doc/ptypes/doc/inet.ipmsgserver.html
+share/doc/ptypes/doc/inet.ipstmserver.html
+share/doc/ptypes/doc/inet.ipstream.html
+share/doc/ptypes/doc/inet.utils.html
+share/doc/ptypes/doc/intro.html
+share/doc/ptypes/doc/lists.html
+share/doc/ptypes/doc/lists.objlist.constructors.html
+share/doc/ptypes/doc/lists.objlist.html
+share/doc/ptypes/doc/lists.objlist.manipulation.html
+share/doc/ptypes/doc/lists.strlist.constructors.html
+share/doc/ptypes/doc/lists.strlist.html
+share/doc/ptypes/doc/lists.strlist.manipulation.html
+share/doc/ptypes/doc/lists.strlist.search.html
+share/doc/ptypes/doc/lists.strmap.constructors.html
+share/doc/ptypes/doc/lists.strmap.html
+share/doc/ptypes/doc/lists.strmap.manipulation.html
+share/doc/ptypes/doc/lists.strmap.search.html
+share/doc/ptypes/doc/portability.html
+share/doc/ptypes/doc/ref.html
+share/doc/ptypes/doc/ref.tmpl.html
+share/doc/ptypes/doc/source-forge-logo.gif
+share/doc/ptypes/doc/streams.errors.html
+share/doc/ptypes/doc/streams.examples.html
+share/doc/ptypes/doc/streams.html
+share/doc/ptypes/doc/streams.infile.html
+share/doc/ptypes/doc/streams.inmem.html
+share/doc/ptypes/doc/streams.instm.html
+share/doc/ptypes/doc/streams.iobase.html
+share/doc/ptypes/doc/streams.md5.html
+share/doc/ptypes/doc/streams.namedpipe.html
+share/doc/ptypes/doc/streams.npserver.html
+share/doc/ptypes/doc/streams.outfile.html
+share/doc/ptypes/doc/streams.outmem.html
+share/doc/ptypes/doc/streams.outstm.html
+share/doc/ptypes/doc/streams.stdio.html
+share/doc/ptypes/doc/string.constructors.html
+share/doc/ptypes/doc/string.html
+share/doc/ptypes/doc/string.manipulation.html
+share/doc/ptypes/doc/string.operators.html
+share/doc/ptypes/doc/string.typecasts.html
+share/doc/ptypes/doc/styles.css
+share/doc/ptypes/doc/time.calendar.html
+share/doc/ptypes/doc/time.datetime.html
+share/doc/ptypes/doc/time.html
+share/doc/ptypes/doc/time.time.html
+share/doc/ptypes/doc/title-1.7.gif
+share/doc/ptypes/doc/unknown.html
+share/doc/ptypes/doc/variant.arrays.html
+share/doc/ptypes/doc/variant.html
+share/doc/ptypes/doc/variant.objrefs.html
+share/doc/ptypes/doc/variant.typecasts.html
+share/doc/ptypes/doc/variant.utils.html
+share/doc/ptypes/doc/wshare.html
+share/doc/ptypes/index.html
+share/examples/ptypes/wshare/Makefile.Darwin
+share/examples/ptypes/wshare/Makefile.FreeBSD
+share/examples/ptypes/wshare/Makefile.Linux
+share/examples/ptypes/wshare/Makefile.SunOS
+share/examples/ptypes/wshare/Makefile.common
+share/examples/ptypes/wshare/clients.cxx
+share/examples/ptypes/wshare/clients.h
+share/examples/ptypes/wshare/config.cxx
+share/examples/ptypes/wshare/config.h
+share/examples/ptypes/wshare/log.cxx
+share/examples/ptypes/wshare/log.h
+share/examples/ptypes/wshare/mimetable.awk
+share/examples/ptypes/wshare/mimetable.cxx
+share/examples/ptypes/wshare/mod_about.cxx
+share/examples/ptypes/wshare/modules.cxx
+share/examples/ptypes/wshare/modules.h
+share/examples/ptypes/wshare/request.cxx
+share/examples/ptypes/wshare/request.h
+share/examples/ptypes/wshare/sysutils.cxx
+share/examples/ptypes/wshare/sysutils.h
+share/examples/ptypes/wshare/urlutils.cxx
+share/examples/ptypes/wshare/urlutils.h
+share/examples/ptypes/wshare/utils.cxx
+share/examples/ptypes/wshare/utils.h
+share/examples/ptypes/wshare/wshare
+share/examples/ptypes/wshare/wshare.cxx
+share/examples/ptypes/wshare/wshare.mak
+@dirrm share/examples/ptypes/wshare
+@dirrm share/examples/ptypes
+@dirrm share/doc/ptypes/doc
+@dirrm share/doc/ptypes
+@dirrm include/ptypes