svn commit: r366231 - head/mail/libpst

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Tue Aug 26 17:22:12 2014
New Revision: 366231
URL: http://svnweb.freebsd.org/changeset/ports/366231
QAT: https://qat.redports.org/buildarchive/r366231/

Log:
  - Convert to new options helper
  - Cleanup Makefile
  - Sort PLIST
  - Take maintainership

Modified:
  head/mail/libpst/Makefile
  head/mail/libpst/pkg-plist

Modified: head/mail/libpst/Makefile
==============================================================================
--- head/mail/libpst/Makefile	Tue Aug 26 17:22:07 2014	(r366230)
+++ head/mail/libpst/Makefile	Tue Aug 26 17:22:12 2014	(r366231)
@@ -8,49 +8,38 @@ CATEGORIES=	mail converters
 MASTER_SITES=	http://www.five-ten-sg.com/libpst/packages/ \
 		http://fossies.org/unix/privat/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	Tool for converting Outlook .pst files to mbox and other formats
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgsf-1.so:${PORTSDIR}/devel/libgsf
 
-GNU_CONFIGURE=	yes
-USES=		iconv libtool pathfix gmake pkgconfig
+OPTIONS_DEFINE=	DOCS PST2DII
+OPTIONS_SUB=	yes
+PST2DII_DESC=	Allow Summation Document Image Information output
+
+CONFIGURE_ARGS=	--disable-python --enable-libpst-shared
 CPPFLAGS+=	-I${LOCALBASE}/include
+GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
-CONFIGURE_ARGS+=	--disable-python --enable-libpst-shared
 USE_LDCONFIG=	yes
+USES=		gmake iconv libtool pathfix pkgconfig
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS PST2DII
-PST2DII_DESC=	Allow Summation Document Image Information output
-
-.include <bsd.port.options.mk>
-
-.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+=	libgd.so:${PORTSDIR}/graphics/gd
-PLIST_SUB+=	PST2DII=""
-.else
-CONFIGURE_ARGS+=	--enable-dii=no
-PLIST_SUB+=	PST2DII="@comment "
-.endif
+PST2DII_BUILD_DEPENDS=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
+PST2DII_CONFIGURE_OFF=	--enable-dii=no
+PST2DII_CONFIGURE_ON=	--enable-dii=yes
+PST2DII_LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+PST2DII_RUN_DEPENDS=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
 
 post-patch:
-	${FIND} -X ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
-		-e 's/malloc.h/stdlib.h/g'
-	${REINPLACE_CMD} -e 's;doc\/@PACKAGE at -@VERSION@;doc\/@PACKAGE@;g' \
-		${WRKSRC}/Makefile.in ${WRKSRC}/html/Makefile.in
-.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
+	@${GREP} -lr malloc.h ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g'
+	@${REINPLACE_CMD} -e 's|doc\/@PACKAGE at -@VERSION@|doc\/@PACKAGE@|g' ${WRKSRC}/Makefile.in ${WRKSRC}/html/Makefile.in
+	@${REINPLACE_CMD} -e '/html_DATA =/ s|COPYING ||' ${WRKSRC}/Makefile.in
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpst.so.4.1.10
 
 .include <bsd.port.mk>

Modified: head/mail/libpst/pkg-plist
==============================================================================
--- head/mail/libpst/pkg-plist	Tue Aug 26 17:22:07 2014	(r366230)
+++ head/mail/libpst/pkg-plist	Tue Aug 26 17:22:12 2014	(r366231)
@@ -1,8 +1,8 @@
 bin/lspst
 bin/nick2ldif
+%%PST2DII%%bin/pst2dii
 bin/pst2ldif
 bin/readpst
-%%PST2DII%%bin/pst2dii
 include/libpst-4/libpst/common.h
 include/libpst-4/libpst/libpst.h
 include/libpst-4/libpst/libstrfunc.h