2 files changed, 66 insertions, 61 deletions

diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile
index b86183dc1fc1..f333a3f0fca3 100644
--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ptypes
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.melikyan.com/ptypes/ \
 		http://ptypes.sourceforge.net/ \
@@ -28,8 +29,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/ptypes
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libptypes.a ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/doc
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/index.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/doc
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ptypes/pkg-plist b/devel/ptypes/pkg-plist
index 530c519ff4cf..03e8311aeeb4 100644
--- a/devel/ptypes/pkg-plist
+++ b/devel/ptypes/pkg-plist
@@ -6,64 +6,67 @@ include/ptypes/ptime.h
 include/ptypes/ptypes.h
 @dirrm include/ptypes
 lib/libptypes.a
-%%PORTDOCS%%share/doc/ptypes/async.examples.html
-%%PORTDOCS%%share/doc/ptypes/async.html
-%%PORTDOCS%%share/doc/ptypes/async.message.html
-%%PORTDOCS%%share/doc/ptypes/async.msgqueue.html
-%%PORTDOCS%%share/doc/ptypes/async.mutex.html
-%%PORTDOCS%%share/doc/ptypes/async.semaphore.html
-%%PORTDOCS%%share/doc/ptypes/async.thread.html
-%%PORTDOCS%%share/doc/ptypes/async.utils.html
-%%PORTDOCS%%share/doc/ptypes/basic.html
-%%PORTDOCS%%share/doc/ptypes/changes.html
-%%PORTDOCS%%share/doc/ptypes/compiling.html
-%%PORTDOCS%%share/doc/ptypes/criterrors.html
-%%PORTDOCS%%share/doc/ptypes/cset.constructors.html
-%%PORTDOCS%%share/doc/ptypes/cset.html
-%%PORTDOCS%%share/doc/ptypes/cset.manipulation.html
-%%PORTDOCS%%share/doc/ptypes/cset.operators.html
-%%PORTDOCS%%share/doc/ptypes/default.css
-%%PORTDOCS%%share/doc/ptypes/freshmeat-logo.gif
+%%PORTDOCS%%share/doc/ptypes/LICENSE
 %%PORTDOCS%%share/doc/ptypes/index.html
-%%PORTDOCS%%share/doc/ptypes/inet.examples.html
-%%PORTDOCS%%share/doc/ptypes/inet.html
-%%PORTDOCS%%share/doc/ptypes/inet.ipserver.html
-%%PORTDOCS%%share/doc/ptypes/inet.ipsocket.html
-%%PORTDOCS%%share/doc/ptypes/inet.utils.html
-%%PORTDOCS%%share/doc/ptypes/intro.html
-%%PORTDOCS%%share/doc/ptypes/lists.html
-%%PORTDOCS%%share/doc/ptypes/lists.objlist.constructors.html
-%%PORTDOCS%%share/doc/ptypes/lists.objlist.html
-%%PORTDOCS%%share/doc/ptypes/lists.objlist.manipulation.html
-%%PORTDOCS%%share/doc/ptypes/lists.strlist.constructors.html
-%%PORTDOCS%%share/doc/ptypes/lists.strlist.html
-%%PORTDOCS%%share/doc/ptypes/lists.strlist.manipulation.html
-%%PORTDOCS%%share/doc/ptypes/lists.strlist.search.html
-%%PORTDOCS%%share/doc/ptypes/lists.strmap.constructors.html
-%%PORTDOCS%%share/doc/ptypes/lists.strmap.html
-%%PORTDOCS%%share/doc/ptypes/lists.strmap.manipulation.html
-%%PORTDOCS%%share/doc/ptypes/lists.strmap.search.html
-%%PORTDOCS%%share/doc/ptypes/source-forge-logo.gif
-%%PORTDOCS%%share/doc/ptypes/streams.errors.html
-%%PORTDOCS%%share/doc/ptypes/streams.examples.html
-%%PORTDOCS%%share/doc/ptypes/streams.html
-%%PORTDOCS%%share/doc/ptypes/streams.infile.html
-%%PORTDOCS%%share/doc/ptypes/streams.instm.html
-%%PORTDOCS%%share/doc/ptypes/streams.iobase.html
-%%PORTDOCS%%share/doc/ptypes/streams.md5.html
-%%PORTDOCS%%share/doc/ptypes/streams.outfile.html
-%%PORTDOCS%%share/doc/ptypes/streams.outstm.html
-%%PORTDOCS%%share/doc/ptypes/streams.stdio.html
-%%PORTDOCS%%share/doc/ptypes/string.constructors.html
-%%PORTDOCS%%share/doc/ptypes/string.html
-%%PORTDOCS%%share/doc/ptypes/string.manipulation.html
-%%PORTDOCS%%share/doc/ptypes/string.operators.html
-%%PORTDOCS%%share/doc/ptypes/string.typecasts.html
-%%PORTDOCS%%share/doc/ptypes/time.calendar.html
-%%PORTDOCS%%share/doc/ptypes/time.datetime.html
-%%PORTDOCS%%share/doc/ptypes/time.html
-%%PORTDOCS%%share/doc/ptypes/time.time.html
-%%PORTDOCS%%share/doc/ptypes/title.gif
-%%PORTDOCS%%share/doc/ptypes/unknown.html
-%%PORTDOCS%%share/doc/ptypes/wshare.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/default.css
+%%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/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/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