- update to 0.6.45

 - use OPTIONS framework to properly handle pst2dii
 - simplify NOPORTDOCS
 - continue a couple of long lines

PR:		ports/146629
Submitted by:	bf <bf1783@gmail.com>
Approved by:	maintainer

3 files changed, 22 insertions, 19 deletions

diff --git a/mail/libpst/Makefile b/mail/libpst/Makefile
index 4490c5b9b602..1d2064231837 100644
--- a/mail/libpst/Makefile
+++ b/mail/libpst/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libpst
-PORTVERSION=	0.6.37
+PORTVERSION=	0.6.45
 CATEGORIES=	mail converters
 MASTER_SITES=	http://www.five-ten-sg.com/libpst/packages/
 
@@ -19,29 +19,34 @@ USE_ICONV=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS+=	--disable-python
 
-.if exists(${LOCALBASE}/bin/convert) || defined(WITH_PST2DII)
+OPTIONS=	PST2DII "allow Summation Document Image Information output" off
+
+MAN1=	lspst.1 pst2dii.1 pst2ldif.1 readpst.1
+MAN5=	outlook.pst.5
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_PST2DII)
+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
 PLIST_SUB+=	PST2DII=""
 .else
+CONFIGURE_ARGS+=	--enable-dii=no
 PLIST_SUB+=	PST2DII="@comment "
 .endif
 
-MAN1=	lspst.1 pst2dii.1 pst2ldif.1 readpst.1 readpstlog.1
-MAN5=	outlook.pst.5
-
 post-patch:
-	${FIND} -X ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i "" -e 's/malloc.h/stdlib.h/g'
-	${REINPLACE_CMD} -e 's;doc\/@PACKAGE@-@VERSION@;doc\/@PACKAGE@;g' ${WRKSRC}/Makefile.in \
-	${WRKSRC}/html/Makefile.in
-
+	${FIND} -X ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i "" \
+		-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)
-INSTALL_TARGET=	install-exec
-
-post-install:
-	@(cd ${WRKSRC}/man && ${GMAKE} ${MAKE_ARGS} install)
+	${REINPLACE_CMD} -e '/SUBDIRS =/s/=.*/= src man/' -e '/html_DATA =/d' \
+		${WRKSRC}/Makefile.in
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/libpst/distinfo b/mail/libpst/distinfo
index e03f341741e5..908f34b52120 100644
--- a/mail/libpst/distinfo
+++ b/mail/libpst/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpst-0.6.37.tar.gz) = bb53b2b379709ddf12e86670879e17e0
-SHA256 (libpst-0.6.37.tar.gz) = 349826f3d68d01ca60dca386af8e493e8a5e94c6a23efcec03fdfb294e8a2f57
-SIZE (libpst-0.6.37.tar.gz) = 2209013
+MD5 (libpst-0.6.45.tar.gz) = c77174cd4566f4701a12948cbc7777a3
+SHA256 (libpst-0.6.45.tar.gz) = b1e7713b9f09d7ee7178373c1d5dc03749119fd1ae2f9ffa28088b657c6aae89
+SIZE (libpst-0.6.45.tar.gz) = 1938405
diff --git a/mail/libpst/pkg-plist b/mail/libpst/pkg-plist
index da7858f8a4b4..191893975f64 100644
--- a/mail/libpst/pkg-plist
+++ b/mail/libpst/pkg-plist
@@ -1,7 +1,6 @@
 bin/lspst
 bin/pst2ldif
 bin/readpst
-bin/readpstlog
 %%PST2DII%%bin/pst2dii
 %%PORTDOCS%%%%DOCSDIR%%/devel/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/devel/classes.html
@@ -109,6 +108,7 @@ bin/readpstlog
 %%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
@@ -132,12 +132,10 @@ bin/readpstlog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/libpst.pdf
 %%PORTDOCS%%%%DOCSDIR%%/rn01re01.html
 %%PORTDOCS%%%%DOCSDIR%%/rn01re02.html
 %%PORTDOCS%%%%DOCSDIR%%/rn01re03.html
 %%PORTDOCS%%%%DOCSDIR%%/rn01re04.html
 %%PORTDOCS%%%%DOCSDIR%%/rn01re05.html
-%%PORTDOCS%%%%DOCSDIR%%/rn01re06.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/devel
 %%PORTDOCS%%@dirrm %%DOCSDIR%%