Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Apr 2014 15:42:16 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r350369 - in head/print/muttprint: . files
Message-ID:  <201404061542.s36FgGJl055634@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sun Apr  6 15:42:15 2014
New Revision: 350369
URL: http://svnweb.freebsd.org/changeset/ports/350369
QAT: https://qat.redports.org/buildarchive/r350369/

Log:
  Support stage
  Switch from latex to texlive

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

Modified: head/print/muttprint/Makefile
==============================================================================
--- head/print/muttprint/Makefile	Sun Apr  6 15:36:44 2014	(r350368)
+++ head/print/muttprint/Makefile	Sun Apr  6 15:42:15 2014	(r350369)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	muttprint
 PORTVERSION=	0.72d
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES?=	print mail
 MASTER_SITES=	SF/muttprint/muttprint/muttprint-${PORTVERSION}
 
@@ -16,37 +16,35 @@ USES=		perl5
 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
-.if defined(WITH_CUPS)
-RUN_DEPENDS+=	cupstestppd:${PORTSDIR}/print/cups-base \
-		espgs:${PORTSDIR}/print/cups-pstoraster
-.endif
+CUPS_RUN_DEPENDS+=	cupstestppd:${PORTSDIR}/print/cups-base \
+			espgs:${PORTSDIR}/print/cups-pstoraster
 
 NO_BUILD=	yes
 PLIST_SUB+=	LANGINFO="@comment "
 
 REINPLACE_ARGS=	-i ""
-USE_TEX=	latex
-USE_GMAKE=	yes
+USES=		gmake
+USE_TEX=	texlive
 
-MAN1=		muttprint.1
-MANCOMPRESSED=	yes
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CUPS)
+.if ${PORT_OPTIONS:MCUPS}
 PRINT_COMMAND=CUPS
 .else
 PRINT_COMMAND=lpr -P$$PRINTER
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=install-with-doc
 .endif
 
-NO_STAGE=	yes
 pre-everything::
 	@${ECHO}
 	@${ECHO} Set PAPERSIZE=a4 if you need that paper size.
@@ -74,7 +72,7 @@ post-patch:
 	@${REINPLACE_CMD} 's|%%PRINT_COMMAND%%|${PRINT_COMMAND}| ; \
 		s|%%PREFIX%%|${PREFIX}|' \
 		${WRKSRC}/muttprint
-.if defined(WITH_CUPS)
+.if ${PORT_OPTIONS:MCUPS}
 	@${REINPLACE_CMD} 's|lpr $$CUPS_OPTIONS|${PREFIX}/bin/lpr $$CUPS_OPTIONS|' ${WRKSRC}/muttprint
 .endif
 	@${GZIP_CMD} ${WRKSRC}/doc/manpages/*/muttprint.1

Modified: head/print/muttprint/files/patch-Makefile
==============================================================================
--- head/print/muttprint/files/patch-Makefile	Sun Apr  6 15:36:44 2014	(r350368)
+++ head/print/muttprint/files/patch-Makefile	Sun Apr  6 15:42:15 2014	(r350369)
@@ -10,12 +10,12 @@
  # Change this for some distributions (current setting
  # is OK for SuSE)
 -docdir = /usr/share/doc/packages
-+docdir = ${PREFIX}/share/doc
++docdir = $(DESTDIR)${PREFIX}/share/doc
  
  # Change this to $(prefix)/man for older distributions
  # (current setting is correct according to LSB)
 -mandir = $(prefix)/share/man
-+mandir = ${PREFIX}/man
++mandir = $(DESTDIR)${PREFIX}/man
  
  #
  # Muttprint needs GNU make. If you installed GNU make
@@ -29,10 +29,10 @@
 -libdir = $(prefix)/lib
 -bindir = $(prefix)/bin
 -sysconfdir = /etc
-+sharedir = ${PREFIX}/share
-+libdir = ${PREFIX}/lib
-+bindir = ${PREFIX}/bin
-+sysconfdir = ${PREFIX}/etc
++sharedir = $(DESTDIR)${PREFIX}/share
++libdir = $(DESTDIR)${PREFIX}/lib
++bindir = $(DESTDIR)${PREFIX}/bin
++sysconfdir = $(DESTDIR)${PREFIX}/etc
  docdirname = muttprint
  
  #####################################################

Modified: head/print/muttprint/pkg-plist
==============================================================================
--- head/print/muttprint/pkg-plist	Sun Apr  6 15:36:44 2014	(r350368)
+++ head/print/muttprint/pkg-plist	Sun Apr  6 15:42:15 2014	(r350369)
@@ -1,4 +1,5 @@
 bin/muttprint
+man/man1/muttprint.1.gz
 %%LANGINFO%%bin/muttprint-langinfo
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING



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