diff options
| author | adamw <adamw@FreeBSD.org> | 2016-03-16 02:45:40 +0800 |
|---|---|---|
| committer | adamw <adamw@FreeBSD.org> | 2016-03-16 02:45:40 +0800 |
| commit | b8f07c7e1c9bfb84e12f9affa9095955ff4461f1 (patch) | |
| tree | 0895585499c67b23566798c06560279be6f7545a /mail | |
| parent | be7bde187f2bf2e3466a5fbb666515febf9a2c23 (diff) | |
| download | freebsd-ports-gnome-b8f07c7e1c9bfb84e12f9affa9095955ff4461f1.tar.gz freebsd-ports-gnome-b8f07c7e1c9bfb84e12f9affa9095955ff4461f1.tar.zst freebsd-ports-gnome-b8f07c7e1c9bfb84e12f9affa9095955ff4461f1.zip | |
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.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/metamail/Makefile | 16 | ||||
| -rw-r--r-- | mail/metamail/pkg-plist | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile index c9640a745bd7..fd417da0818e 100644 --- a/mail/metamail/Makefile +++ b/mail/metamail/Makefile @@ -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}/x11/xloadimage \ 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> diff --git a/mail/metamail/pkg-plist b/mail/metamail/pkg-plist index cc6e63d8cea0..abeebead1c9e 100644 --- a/mail/metamail/pkg-plist +++ b/mail/metamail/pkg-plist @@ -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 |