Update to 2.0 to reflect the dependency changes for the DocBook 5.0 tree:

- DocBook 4.5
- DocBook DSSSL
- (Open)Jade
- ISO8879 SGML character entities
- fixrtf
+ DocBook 5.0
+ Apache FOP (pdf only)
+ new fonts (pdf only)
+ optional: jing

Approved by:	doceng (self)

1 files changed, 33 insertions, 31 deletions

diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile
index 54ceb2c02939..6038416c8b6f 100644
--- a/textproc/docproj/Makefile
+++ b/textproc/docproj/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	docproj
-PORTVERSION=	1.17
-PORTREVISION=	13
+PORTVERSION=	2.0
 CATEGORIES=	textproc
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -18,34 +17,28 @@ USE_PERL5=	run
 # This dependency list should be kept in sync with the list of
 # required ports in src/release/Makefile.inc.docports.
 
-RUN_DEPENDS=	fixrtf:${PORTSDIR}/textproc/fixrtf \
-		links:${PORTSDIR}/www/links1 \
+RUN_DEPENDS=	links:${PORTSDIR}/www/links1 \
 		pngtopnm:${PORTSDIR}/graphics/netpbm \
 		scr2png:${PORTSDIR}/graphics/scr2png \
 		scr2txt:${PORTSDIR}/textproc/scr2txt \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		peps:${PORTSDIR}/graphics/peps \
-		${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textproc/dsssl-docbook-modular \
-		${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879 \
 		${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:${PORTSDIR}/textproc/xhtml \
-		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
+		${LOCALBASE}/share/xsl/docbook-ns/xhtml/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl-ns \
 		${LOCALBASE}/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl:${PORTSDIR}/textproc/iso-schematron-xslt \
-		${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450 \
+		${LOCALBASE}/share/xml/docbook/5.0/dtd/docbook.dtd:${PORTSDIR}/textproc/docbook-500 \
 		${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent \
 		p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser \
 		zip:${PORTSDIR}/archivers/zip
 
-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
+OPTIONS_DEFINE=		X11 CJK SVN IGOR FOP JING DBLATEX
 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=	X11 OPENJADE CJK SVN IGOR
-
-.if !defined(WITHOUT_JADETEX) || defined(PACKAGE_BUILDING)
-OPTIONS_DEFAULT+=	JADETEX
-.endif
+FOP_DESC=		FOP PDF renderer (requires Java)
+JING_DESC=		Jing for advanced RELAX NG validation (optional)
+DBLATEX_DESC=		dblatex PDF renderer (experimental, requires TeXLive)
+OPTIONS_DEFAULT=	X11 CJK SVN IGOR
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
@@ -58,20 +51,37 @@ RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 RUN_DEPENDS+=	igor:${PORTSDIR}/textproc/igor
 .endif
 
-.if ${PORT_OPTIONS:MJADETEX}
-USE_TEX=	jadetex dvipsk
 .if ${PORT_OPTIONS:MCJK}
-RUN_DEPENDS+=	cjktexsty:${PORTSDIR}/chinese/docproj
+RUN_DEPENDS+=	html2text:${PORTSDIR}/textproc/html2text
+.endif
+
+.if ${PORT_OPTIONS:MFOP}
+RUN_DEPENDS+=	fop:${PORTSDIR}/textproc/fop
+.endif
+
+.if ${PORT_OPTIONS:MJING}
+RUN_DEPENDS+=	jing:${PORTSDIR}/textproc/jing
 .endif
+
+.if ${PORT_OPTIONS:MDBLATEX}
+USE_TEX=	texlive xetex
+RUN_DEPENDS+=	dblatex:${PORTSDIR}/textproc/dblatex
 .endif
 
+.if ${PORT_OPTIONS:MFOP} || ${PORT_OPTIONS:MDBLATEX}
+ONLY_FOR_ARCHS=	amd64 i386
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu
 .if ${PORT_OPTIONS:MCJK}
-RUN_DEPENDS+=	html2text:${PORTSDIR}/textproc/html2text
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa
+.endif
 .endif
 
-NO_BUILD=		yes
 USE_GHOSTSCRIPT_RUN=	yes
-PLIST_FILES=		#empty
+NO_BUILD=		yes
 
 DEPENDS_ARGS+=	BATCH=yes
 
@@ -87,12 +97,4 @@ minimaldocports:
 
 do-install:	# empty
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MOPENJADE} || ${ARCH} != "i386"
-RUN_DEPENDS+=	openjade:${PORTSDIR}/textproc/openjade
-.else
-RUN_DEPENDS+=	jade:${PORTSDIR}/textproc/jade
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>