From owner-svn-ports-all@freebsd.org Tue Mar 15 18:45:42 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2EF0CAD2868; Tue, 15 Mar 2016 18:45:42 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D6121819; Tue, 15 Mar 2016 18:45:41 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2FIjeoD036115; Tue, 15 Mar 2016 18:45:41 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2FIjeK3036113; Tue, 15 Mar 2016 18:45:40 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201603151845.u2FIjeK3036113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Tue, 15 Mar 2016 18:45:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411198 - head/mail/metamail 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.21 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, 15 Mar 2016 18:45:42 -0000 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 - -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 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