svn commit: r317902 - head/textproc/docproj

[Hiroki Sato]

Author: hrs
Date: Sat May 11 18:38:53 2013
New Revision: 317902
URL: http://svnweb.freebsd.org/changeset/ports/317902

Log:
  Use USE_TEX.

Modified:
  head/textproc/docproj/Makefile

Modified: head/textproc/docproj/Makefile
==============================================================================
--- head/textproc/docproj/Makefile	Sat May 11 18:15:40 2013	(r317901)
+++ head/textproc/docproj/Makefile	Sat May 11 18:38:53 2013	(r317902)
@@ -37,13 +37,13 @@ RUN_DEPENDS=	fixrtf:${PORTSDIR}/textproc
 		${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent \
 		p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser
 
-OPTIONS_DEFINE=		JADETEX OPENJADE CJK SVN IGOR
+OPTIONS_DEFINE=		X11 JADETEX OPENJADE CJK SVN IGOR
 JADETEX_DESC=		Support building additional document formats (PDF)
 OPENJADE_DESC=		Install textproc/openjade instead of textproc/jade
 CJK_DESC=		CJK (Simplified Chinese Language) support
 SVN_DESC=		Subversion support (required to check out sources)
 IGOR_DESC=		Igor automated proofreader for documentation
-OPTIONS_DEFAULT=	OPENJADE CJK SVN IGOR
+OPTIONS_DEFAULT=	X11 OPENJADE CJK SVN IGOR
 
 .if !defined(WITHOUT_JADETEX) || defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	JADETEX
@@ -51,15 +51,6 @@ OPTIONS_DEFAULT+=	JADETEX
 
 .include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MOPENJADE} || ${ARCH} != "i386"
-RUN_DEPENDS+=	openjade:${PORTSDIR}/textproc/openjade \
-		onsgmls:${PORTSDIR}/textproc/opensp
-.else
-RUN_DEPENDS+=	jade:${PORTSDIR}/textproc/jade
-.endif
-
 .if ${PORT_OPTIONS:MSVN}
 RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 .endif
@@ -69,8 +60,7 @@ RUN_DEPENDS+=	igor:${PORTSDIR}/textproc/
 .endif
 
 .if ${PORT_OPTIONS:MJADETEX}
-RUN_DEPENDS+=	${LOCALBASE}/share/texmf/web2c/jadetex.fmt:${PORTSDIR}/print/jadetex
-RUN_DEPENDS+=	dvips:${PORTSDIR}/print/dvipsk-tetex
+USE_TEX=	jadetex dvipsk
 .if ${PORT_OPTIONS:MCJK}
 RUN_DEPENDS+=	cjktexsty:${PORTSDIR}/chinese/docproj
 .endif
@@ -80,17 +70,13 @@ RUN_DEPENDS+=	cjktexsty:${PORTSDIR}/chin
 RUN_DEPENDS+=	html2text:${PORTSDIR}/textproc/html2text
 .endif
 
-.if ${PERL_LEVEL} < 500804
-RUN_DEPENDS+=	p5-Digest-MD5>=2.51:${PORTSDIR}/security/p5-Digest-MD5
-.endif
-
 NO_BUILD=		yes
 USE_GHOSTSCRIPT_RUN=	yes
 PLIST_FILES=		#empty
 
 DEPENDS_ARGS+=	BATCH=yes
 
-.if defined(WITHOUT_X11)
+.if !${PORT_OPTIONS:MX11}
 DEPENDS_ARGS+=	WITHOUT_X11=${WITHOUT_X11}
 .endif
 
@@ -102,4 +88,17 @@ minimaldocports:
 
 do-install:	# empty
 
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MOPENJADE} || ${ARCH} != "i386"
+RUN_DEPENDS+=	openjade:${PORTSDIR}/textproc/openjade \
+		onsgmls:${PORTSDIR}/textproc/opensp
+.else
+RUN_DEPENDS+=	jade:${PORTSDIR}/textproc/jade
+.endif
+
+.if ${PERL_LEVEL} < 500804
+RUN_DEPENDS+=	p5-Digest-MD5>=2.51:${PORTSDIR}/security/p5-Digest-MD5
+.endif
+
 .include <bsd.port.post.mk>