From owner-svn-ports-all@FreeBSD.ORG Tue Aug 26 17:22:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F13E647; Tue, 26 Aug 2014 17:22:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A6D33F1B; Tue, 26 Aug 2014 17:22:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7QHMDKx005964; Tue, 26 Aug 2014 17:22:13 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7QHMCvn005961; Tue, 26 Aug 2014 17:22:12 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201408261722.s7QHMCvn005961@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 26 Aug 2014 17:22:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366231 - head/mail/libpst X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Aug 2014 17:22:13 -0000 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@FreeBSD.org +MAINTAINER= sunpoet@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 - -.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@-@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@-@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 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