3 files changed, 21 insertions, 151 deletions

diff --git a/mail/libpst/Makefile b/mail/libpst/Makefile
index c05582420b5e..44e1beaeb2fa 100644
--- a/mail/libpst/Makefile
+++ b/mail/libpst/Makefile
@@ -1,18 +1,17 @@
-# New ports collection makefile for:   libpst
-# Date created:        28 June 2002
-# Whom:                Nate Underwood <natey@natey.com>
-#
+# Created by: Nate Underwood <natey@natey.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libpst
-PORTVERSION=	0.6.53
+PORTVERSION=	0.6.55
 CATEGORIES=	mail converters
-MASTER_SITES=	http://www.five-ten-sg.com/libpst/packages/
+MASTER_SITES=	http://www.five-ten-sg.com/libpst/packages/ \
+		http://fossies.org/unix/privat/
 
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	A tool for converting Outlook .pst files to mbox and other formats
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
@@ -20,18 +19,23 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 CONFIGURE_ARGS+=	--disable-python
 
-OPTIONS=	PST2DII "allow Summation Document Image Information output" off
-
 MAN1=	lspst.1 pst2dii.1 pst2ldif.1 readpst.1
 MAN5=	outlook.pst.5
 
+OPTIONS_DEFINE=	DOCS PST2DII
+PST2DII_DESC=	"allow Summation Document Image Information output"
+
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PST2DII)
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	*
+.endif
+
+.if ${PORT_OPTIONS:MPST2DII}
 CONFIGURE_ARGS+=	--enable-dii=yes
 BUILD_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
-LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
 PLIST_SUB+=	PST2DII=""
 .else
 CONFIGURE_ARGS+=	--enable-dii=no
@@ -43,7 +47,10 @@ post-patch:
 		-e 's/malloc.h/stdlib.h/g'
 	${REINPLACE_CMD} -e 's;doc\/@PACKAGE@-@VERSION@;doc\/@PACKAGE@;g' \
 		${WRKSRC}/Makefile.in ${WRKSRC}/html/Makefile.in
-.ifdef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+	${REINPLACE_CMD} -e '/html_DATA =/s/COPYING //' \
+		${WRKSRC}/Makefile.in
+.else
 	${REINPLACE_CMD} -e '/SUBDIRS =/s/=.*/= src man/' -e '/html_DATA =/d' \
 		${WRKSRC}/Makefile.in
 .endif
diff --git a/mail/libpst/distinfo b/mail/libpst/distinfo
index 44b665d780eb..5679b2683514 100644
--- a/mail/libpst/distinfo
+++ b/mail/libpst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpst-0.6.53.tar.gz) = 55a5f0c34a678ee79dc286b4c436afb734b30d66573c81dc49092f03d55f80e5
-SIZE (libpst-0.6.53.tar.gz) = 2012991
+SHA256 (libpst-0.6.55.tar.gz) = ef69d87ae5e28175c2abeb8ae5e714eae218a0c950a5071a16fefb851e2912c5
+SIZE (libpst-0.6.55.tar.gz) = 13444072
diff --git a/mail/libpst/pkg-plist b/mail/libpst/pkg-plist
index 6936169df46d..78705ec2711c 100644
--- a/mail/libpst/pkg-plist
+++ b/mail/libpst/pkg-plist
@@ -3,140 +3,3 @@ bin/nick2ldif
 bin/pst2ldif
 bin/readpst
 %%PST2DII%%bin/pst2dii
-%%PORTDOCS%%%%DOCSDIR%%/devel/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/common_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/common_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/common_8h__dep__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/common_8h__dep__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/common_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/common_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/common_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/common_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/dir_000000.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/dirs.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/devel/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/files.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2blank.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2doc.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2folderclosed.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2folderopen.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2lastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2link.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2mlastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2mnode.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2node.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2plastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2pnode.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/ftv2vertline.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/globals_defs.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/globals_type.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/graph_legend.dot
-%%PORTDOCS%%%%DOCSDIR%%/devel/graph_legend.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/graph_legend.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/index.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/libpst_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/libpst_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/libpst_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/libpst_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/libpst_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/libstrfunc_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/libstrfunc_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/libstrfunc_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/libstrfunc_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/libstrfunc_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/lzfu_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/lzfu_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/main.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structFILETIME.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__binary.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__block__recorder.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__block__recorder__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__block__recorder__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__block__recorder__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__desc__tree.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__desc__tree__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__desc__tree__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__desc__tree__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__entryid.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__file.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__file__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__file__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__file__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__id2__tree.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__id2__tree__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__id2__tree__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__id2__tree__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__index__ll.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__index__ll__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__index__ll__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__index__ll__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__appointment.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__appointment__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__appointment__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__appointment__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__attach.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__attach__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__attach__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__attach__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__contact.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__contact__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__contact__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__contact__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__email.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__email__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__email__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__email__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__extra__field.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__extra__field__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__extra__field__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__extra__field__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__folder.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__journal.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__journal__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__journal__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__journal__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__message__store.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__message__store__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__message__store__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__item__message__store__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__recurrence.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__string.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__varbuf.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__x__attrib__ll.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__x__attrib__ll__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__x__attrib__ll__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/structpst__x__attrib__ll__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/timeconv_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/timeconv_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/timeconv_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/timeconv_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/timeconv_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/devel/tree.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/vbuf_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/vbuf_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/devel/vbuf_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/devel/vbuf_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/devel/vbuf_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/rn01re01.html
-%%PORTDOCS%%%%DOCSDIR%%/rn01re02.html
-%%PORTDOCS%%%%DOCSDIR%%/rn01re03.html
-%%PORTDOCS%%%%DOCSDIR%%/rn01re04.html
-%%PORTDOCS%%%%DOCSDIR%%/rn01re05.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/devel
-@dirrm %%DOCSDIR%%