Date: Tue, 15 Mar 2016 18:45:40 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411198 - head/mail/metamail Message-ID: <201603151845.u2FIjeK3036113@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Mar 15 18:45:40 2016 New Revision: 411198 URL: https://svnweb.freebsd.org/changeset/ports/411198 Log: Use OPTIONS target helper instead of pulling n bsd.port.options.mk. Remove unnecessary command from post-patch. Install the mailcap file with @sample, as metamail recommends editing the file. PORTREVISION bump for this change. Move LICENSE above the USES block to satisfy portlint. Modified: head/mail/metamail/Makefile head/mail/metamail/pkg-plist Modified: head/mail/metamail/Makefile ============================================================================== --- head/mail/metamail/Makefile Tue Mar 15 17:34:08 2016 (r411197) +++ head/mail/metamail/Makefile Tue Mar 15 18:45:40 2016 (r411198) @@ -3,7 +3,7 @@ PORTNAME= metamail PORTVERSION= 2.7 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= mail MASTER_SITES= http://ftp.funet.fi/pub/unix/mail/metamail/ \ ftp://ftp.research.telcordia.com/pub/nsb/ @@ -12,10 +12,10 @@ DISTNAME= mm${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Implementation of MIME, the Multipurpose Internet Mail Extensions -USES= tar:Z - LICENSE= MIT +USES= tar:Z + WRKSRC= ${WRKDIR}/${DISTNAME}/src OPTIONS_DEFINE= X11 @@ -28,12 +28,10 @@ X11_RUN_DEPENDS= xloadimage:${PORTSDIR}/ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir X11_USE= XORG=x11 -.include <bsd.port.options.mk> - -post-patch: -.if ! ${PORT_OPTIONS:MX11} +post-patch-X11-off: @${REINPLACE_CMD} -e '/fonts/d' ${WRKSRC}/Makefile -.endif - @${RM} ${WRKSRC}/bin/*.orig + +post-install: + @${MV} ${STAGEDIR}${PREFIX}/etc/mailcap ${STAGEDIR}${PREFIX}/etc/mailcap.sample .include <bsd.port.mk> Modified: head/mail/metamail/pkg-plist ============================================================================== --- head/mail/metamail/pkg-plist Tue Mar 15 17:34:08 2016 (r411197) +++ head/mail/metamail/pkg-plist Tue Mar 15 18:45:40 2016 (r411198) @@ -29,7 +29,7 @@ bin/sun2mime %%X11%%lib/metamail/fonts/heb8x13B.pcf %%X11%%lib/metamail/fonts/fonts.dir %%X11%%lib/metamail/fonts/fonts.alias -etc/mailcap +@sample etc/mailcap.sample man/man1/audiocompose.1.gz man/man1/audiosend.1.gz man/man1/extcompose.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603151845.u2FIjeK3036113>