Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Sep 2014 14:51:52 +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: r367441 - head/print/muttprint
Message-ID:  <201409061451.s86EpqoJ041071@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Sat Sep  6 14:51:52 2014
New Revision: 367441
URL: http://svnweb.freebsd.org/changeset/ports/367441
QAT: https://qat.redports.org/buildarchive/r367441/

Log:
  Fix build by changing USE_TEX=texlive to USE_TEX=texmf.
  
  While here, rearrage things so they are in a more predictable order.
  The chaos led to there being two USES= that clobbered each other.
  
  Also, remove an old fragment that was preventing bin/muttprint-langinfo
  from being installed.

Modified:
  head/print/muttprint/Makefile
  head/print/muttprint/pkg-plist

Modified: head/print/muttprint/Makefile
==============================================================================
--- head/print/muttprint/Makefile	Sat Sep  6 14:23:48 2014	(r367440)
+++ head/print/muttprint/Makefile	Sat Sep  6 14:51:52 2014	(r367441)
@@ -3,35 +3,32 @@
 
 PORTNAME?=	muttprint
 PORTVERSION=	0.72d
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES?=	print mail
 MASTER_SITES=	SF/muttprint/muttprint/muttprint-${PORTVERSION}
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	Utility to print mail for most any mail client
 
-USES=		perl5
-
-.if !defined(PAPERSIZE)
-PAPERSIZE=	letter
-.endif
-
-OPTIONS_DEFINE=	CUPS DOCS
-
 RUN_DEPENDS=	psnup:${PORTSDIR}/print/psutils \
 		uncompface:${PORTSDIR}/mail/faces \
 		convert:${PORTSDIR}/graphics/ImageMagick \
 		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
 		p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
-CUPS_RUN_DEPENDS+=	cupstestppd:${PORTSDIR}/print/cups-base \
-			espgs:${PORTSDIR}/print/cups-pstoraster
 
-NO_BUILD=	yes
-PLIST_SUB+=	LANGINFO="@comment "
+USES=		perl5 gmake
+USE_TEX=	texmf
 
+NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
-USES=		gmake
-USE_TEX=	texlive
+
+OPTIONS_DEFINE=	CUPS DOCS
+CUPS_RUN_DEPENDS=	cupstestppd:${PORTSDIR}/print/cups-base \
+			espgs:${PORTSDIR}/print/cups-pstoraster
+
+.if !defined(PAPERSIZE)
+PAPERSIZE=	letter
+.endif
 
 .include <bsd.port.options.mk>
 
@@ -48,7 +45,6 @@ INSTALL_TARGET=install-with-doc
 pre-everything::
 	@${ECHO}
 	@${ECHO} Set PAPERSIZE=a4 if you need that paper size.
-	@${ECHO} Set WITH_CUPS=yes if you want to use CUPS.
 	@${ECHO}
 
 post-patch:

Modified: head/print/muttprint/pkg-plist
==============================================================================
--- head/print/muttprint/pkg-plist	Sat Sep  6 14:23:48 2014	(r367440)
+++ head/print/muttprint/pkg-plist	Sat Sep  6 14:51:52 2014	(r367441)
@@ -1,6 +1,6 @@
 bin/muttprint
+bin/muttprint-langinfo
 man/man1/muttprint.1.gz
-%%LANGINFO%%bin/muttprint-langinfo
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409061451.s86EpqoJ041071>