svn commit: r40871 - projects/xml-tools/share/mk

Gabor Kovesdan gabor at FreeBSD.org
Sat Feb 2 14:52:17 UTC 2013


Author: gabor
Date: Sat Feb  2 14:52:15 2013
New Revision: 40871
URL: http://svnweb.freebsd.org/changeset/doc/40871

Log:
  - Remove doc.html.mk, which is not used any more
  - Factor out command macros for better readability and consistency
    and less duplication
  - Make some macros more consistent with the rest

Added:
  projects/xml-tools/share/mk/doc.commands.mk   (contents, props changed)
Deleted:
  projects/xml-tools/share/mk/doc.html.mk
Modified:
  projects/xml-tools/share/mk/doc.common.mk
  projects/xml-tools/share/mk/doc.docbook.mk
  projects/xml-tools/share/mk/doc.images.mk
  projects/xml-tools/share/mk/doc.project.mk
  projects/xml-tools/share/mk/web.site.mk

Added: projects/xml-tools/share/mk/doc.commands.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/share/mk/doc.commands.mk	Sat Feb  2 14:52:15 2013	(r40871)
@@ -0,0 +1,149 @@
+#
+# $FreeBSD$
+#
+
+CP?=		/bin/cp
+CAT?=		/bin/cat
+ECHO_CMD?=	echo
+LN?=		/bin/ln
+MKDIR?=		/bin/mkdir
+RM?=		/bin/rm
+MV?=		/bin/mv
+HTML2TXT?=	${PREFIX}/bin/w3m
+HTML2TXTOPTS?=	-dump ${HTML2TXTFLAGS}
+ISPELL?=	ispell
+ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
+.if exists(/usr/bin/perl)
+PERL?=		/usr/bin/perl
+.elif exists(/usr/local/bin/perl)
+PERL?=		/usr/local/bin/perl
+.else
+PERL?=		perl
+.endif
+REALPATH?=	/bin/realpath
+SETENV?=	/usr/bin/env
+XSLTPROC?=	${PREFIX}/bin/xsltproc
+XMLLINT?=	${PREFIX}/bin/xmllint
+
+BUNZIP2?=	/usr/bin/bunzip2
+FETCH?=		/usr/bin/fetch
+FIND?=		/usr/bin/find
+LN?=		/bin/ln
+SH?=		/bin/sh
+SORT?=		/usr/bin/sort
+TRUE?=		/usr/bin/true
+
+AWK?=		/usr/bin/awk
+GREP?=		/usr/bin/grep
+SED?=		/usr/bin/sed
+
+PKG_CREATE?=	/usr/sbin/pkg_create
+TAR?=		/usr/bin/tar
+TOUCH?=		/usr/bin/touch
+XARGS?=		/usr/bin/xargs
+
+BZIP2?=		bzip2
+BZIPOPTS?=	-qf9
+GZIP?=		gzip
+GZIPOPTS?=	-qf9
+ZIP?=		${PREFIX}/bin/zip
+ZIPOPTS?=	-j9
+
+.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
+JADE?=		${PREFIX}/bin/jade
+.else
+JADE?=		${PREFIX}/bin/openjade
+JADEFLAGS+=	-V openjade
+.endif
+
+FOP?=		${PREFIX}/bin/fop
+FOPOPTS?=
+
+GROFF?=		groff
+HTML2PDB?=	${PREFIX}/bin/iSiloBSD
+HTML2PDBOPTS?=	-y -d0 -Idef ${HTML2PDBFLAGS}
+DVIPS?=		${PREFIX}/bin/dvips
+.if defined(PAPERSIZE)
+DVIPSOPTS?=	-t ${PAPERSIZE:L}
+.endif
+DVIPSOPTS+=	${DVIPSFLAGS}
+
+#
+# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
+# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore
+# due to incompatibility of the format file.  Since the teTeX 3.0
+# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf,"
+# it is checked here to determine which TeX engine should be used.
+.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf)
+TEX_CMD?=	${PREFIX}/bin/etex
+PDFTEX_CMD?=	${PREFIX}/bin/pdfetex
+.else
+TEX_CMD?=	${PREFIX}/bin/tex
+PDFTEX_CMD?=	${PREFIX}/bin/pdftex
+.endif
+LATEX_CMD?=	${PREFIX}/bin/latex
+JADETEX_CMD?=	${TEX_CMD} "&jadetex"
+JADETEX_PREPROCESS?=	/bin/cat
+PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
+PDFJADETEX_PREPROCESS?= /bin/cat
+PS2PDF?=	${PREFIX}/bin/ps2pdf
+FOP_CMD?=	${PREFIX}/share/fop/fop.sh
+XEP_CMD?=	sh ${HOME}/XEP/xep.sh
+JAVA_CMD?=	${PREFIX}/bin/javavm
+SAXON_CMD?=	${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
+
+#
+# Currently, we have to use the FixRTF utility available as textproc/fixrtf
+# to apply several RTF fixups:
+#
+# 1. Embed PNGs into RTF. (Option: -p)
+# 2. Embed FreeBSD-specific information into RTF, such as organization name,
+#    building time. But unfortunately, so far only Microsoft Word can read
+#    them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read
+#    this kind of information from RTF created by Microsoft Word and
+#    OpenOffice. (Option: -i)
+# 3. Do some locale-specific fixing. (Option: -e <encoding>)
+#
+# This is a transitional solution before Jade/OpenJade provides these features.
+#
+FIXRTF?=	${PREFIX}/bin/fixrtf
+FIXRTFOPTS?=	-i -p
+.if defined(SP_ENCODING)
+FIXRTFOPTS+=	-e ${SP_ENCODING}
+.endif
+
+SCR2PNG?=	${PREFIX}/bin/scr2png
+SCR2PNGOPTS?=	${SCR2PNGFLAGS}
+SCR2TXT?=	${PREFIX}/bin/scr2txt
+SCR2TXTOPTS?=	-l ${SCR2TXTFLAGS}
+EPS2PNM?=	${PREFIX}/bin/gs
+EPS2PNMOPTS?=	-q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \
+		-dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \
+		-dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=-
+#
+# epsgeom is a perl script for 1) extracting geometry information
+# from a .eps file and 2) arrange it for ghostscript's pnm driver.
+#
+EPSGEOM?=	${PERL} ${DOC_PREFIX}/share/misc/epsgeom
+EPSGEOMOPTS?=	${EPS2PNM_RES} ${EPS2PNM_RES}
+PNMTOPNG?=	${PREFIX}/bin/pnmtopng
+PNMTOPNGOPTS?=	${PNGTOPNGFLAGS}
+PNGTOPNM?=	${PREFIX}/bin/pngtopnm
+PNGTOPNMOPTS?=	${PNGTOPNMFLAGS}
+PPMTOPGM?=	${PREFIX}/bin/ppmtopgm
+PPMTOPGMOPTS?=	${PPMTOPGMFLAGS}
+PNMTOPS?=	${PREFIX}/bin/pnmtops
+PNMTOPSOPTS?=	-noturn ${PNMTOPSFLAGS}
+EPSTOPDF?=	${PREFIX}/bin/epstopdf
+EPSTOPDFOPTS?=	${EPSTOPDFFLAGS}
+#
+PIC2PS?=	${GROFF} -p -S -Wall -mtty-char -man
+#
+PS2EPS?=	${PREFIX}/bin/gs
+PS2EPSOPTS?=	-q -dNOPAUSE -dSAFER -dDELAYSAFER \
+		-sPAPERSIZE=letter -r72 -sDEVICE=bit \
+		-sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
+PS2BBOX?=	${PREFIX}/bin/gs
+PS2BBOXOPTS?=	-q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
+		-sPAPERSIZE=letter -r72 -sDEVICE=bbox \
+		-sOutputFile=/dev/null ${PS2BBOXFLAGS}

Modified: projects/xml-tools/share/mk/doc.common.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.common.mk	Sat Feb  2 13:00:07 2013	(r40870)
+++ projects/xml-tools/share/mk/doc.common.mk	Sat Feb  2 14:52:15 2013	(r40871)
@@ -5,14 +5,6 @@
 # documents commonly used in doc/ and www/ tree.
 #
 
-AWK?=		/usr/bin/awk
-GREP?=		/usr/bin/grep
-REALPATH?=	/bin/realpath
-SED?=		/usr/bin/sed
-# a hack to keep tidy from converting tabs to spaces
-# replace them with 	 before calling tidy
-REINPLACE_TABS_CMD?=	${SED} -i "" -e 's/	/\&\#09;/g'
-
 # ------------------------------------------------------------------------
 #
 # Work out the language and encoding used for this document.

Modified: projects/xml-tools/share/mk/doc.docbook.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.docbook.mk	Sat Feb  2 13:00:07 2013	(r40870)
+++ projects/xml-tools/share/mk/doc.docbook.mk	Sat Feb  2 14:52:15 2013	(r40871)
@@ -81,21 +81,8 @@ RENDERENGINE?=	jade
 DSLHTML?= ${DOC_PREFIX}/share/xml/spellcheck.dsl
 .endif
 
-XMLLINT?=	/usr/local/bin/xmllint
 XMLDECL?=	/usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
 
-.if exists(${PREFIX}/bin/jade) && !defined(OPENJADE)
-JADE?=		${PREFIX}/bin/jade
-.else
-JADE?=		${PREFIX}/bin/openjade
-JADEFLAGS+=	-V openjade
-.endif
-
-JADE_CMD=	${SETENV} ${JADE_ENV} ${JADE}
-
-FOP?=		${PREFIX}/bin/fop
-FOPOPTS?=
-
 DSLHTML?=	${DOC_PREFIX}/share/xml/default.dsl
 DSLPRINT?=	${DOC_PREFIX}/share/xml/default.dsl
 DSLPGP?=	${DOC_PREFIX}/share/xml/pgp.dsl
@@ -142,51 +129,6 @@ HTMLFLAGS+=	-V %show-all-trademark-symbo
 PRINTFLAGS+=	-V %show-all-trademark-symbols%
 .endif
 
-PERL?=		/usr/bin/perl
-PKG_CREATE?=	/usr/sbin/pkg_create
-SORT?=		/usr/bin/sort
-TAR?=		/usr/bin/tar
-TOUCH?=		/usr/bin/touch
-XARGS?=		/usr/bin/xargs
-
-GROFF?=		groff
-HTML2TXT?=	${PREFIX}/bin/links
-HTML2TXTOPTS?=	-dump -width 72 ${HTML2TXTFLAGS}
-HTML2PDB?=	${PREFIX}/bin/iSiloBSD
-HTML2PDBOPTS?=	-y -d0 -Idef ${HTML2PDBFLAGS}
-DVIPS?=		${PREFIX}/bin/dvips
-.if defined(PAPERSIZE)
-DVIPSOPTS?=	-t ${PAPERSIZE:L}
-.endif
-DVIPSOPTS+=	${DVIPSFLAGS}
-
-#
-# Currently, we have to use the FixRTF utility available as textproc/fixrtf
-# to apply several RTF fixups:
-#
-# 1. Embed PNGs into RTF. (Option: -p)
-# 2. Embed FreeBSD-specific information into RTF, such as organization name,
-#    building time. But unfortunately, so far only Microsoft Word can read
-#    them. In contrast, Microsoft Word Viewer and OpenOffice even cannot read
-#    this kind of information from RTF created by Microsoft Word and
-#    OpenOffice. (Option: -i)
-# 3. Do some locale-specific fixing. (Option: -e <encoding>)
-# 
-# This is a transitional solution before Jade/OpenJade provides these features.
-#
-FIXRTF?=	${PREFIX}/bin/fixrtf
-FIXRTFOPTS?=	-i -p
-.if defined(SP_ENCODING)
-FIXRTFOPTS+=	-e ${SP_ENCODING}
-.endif
-
-GZIP?=	-9
-GZIP_CMD?=	gzip -qf ${GZIP}
-BZIP2?=	-9
-BZIP2_CMD?=	bzip2 -qf ${BZIP2}
-ZIP?=	-9
-ZIP_CMD?=	${PREFIX}/bin/zip -j ${ZIP}
-
 #
 # Instruction for bsd.subdir.mk to not to process SUBDIR directive.
 # It is not necessary since doc.docbook.mk do it too.
@@ -456,7 +398,7 @@ ${.CURDIR:T}.pdb.${_curcomp}: ${DOC}.pdb
 .if !defined(NO_RTF)
 ${DOC}.rtf: ${DOC}.parsed.xml ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
 		${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_PNG}
-	${JADE_CMD} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \
+	${JADE} -V rtf-backend ${PRINTOPTS} -ioutput.rtf.images \
 		${JADEOPTS} -t rtf -o ${.TARGET}-nopng ${XMLDECL} \
 		${DOC}.parsed.xml
 	${FIXRTF} ${FIXRTFOPTS} < ${.TARGET}-nopng > ${.TARGET}
@@ -480,7 +422,7 @@ ${DOC}.rtf:
 ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
 		${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
 		${DOC}.parsed.xml
-	${JADE_CMD} -V tex-backend ${PRINTOPTS} \
+	${JADE} -V tex-backend ${PRINTOPTS} \
 		${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
 
 ${DOC}.tex-ps: ${DOC}.tex
@@ -491,7 +433,7 @@ ${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${
 		${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml
 	${RM} -f ${.TARGET}
 	${CAT} ${PDFTEX_DEF} > ${.TARGET}
-	${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
+	${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \
 		${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${DOC}.parsed.xml >> ${.TARGET}
 .endif
 
@@ -612,13 +554,13 @@ KNOWN_COMPRESS=	gz bz2 zip
 #
 
 _PROG_COMPRESS_gz: .USE
-	${GZIP_CMD} < ${.ALLSRC} > ${.TARGET}
+	${GZIP} ${GZIPOPTS} < ${.ALLSRC} > ${.TARGET}
 
 _PROG_COMPRESS_bz2: .USE
-	${BZIP2_CMD} < ${.ALLSRC} > ${.TARGET}
+	${BZIP2} ${BZIP2OPTS} < ${.ALLSRC} > ${.TARGET}
 
 _PROG_COMPRESS_zip: .USE
-	${ZIP_CMD} ${.TARGET} ${.ALLSRC}
+	${ZIP} ${ZIPOPTS} ${.TARGET} ${.ALLSRC}
 
 #
 # Build a list of targets for each compression scheme and output format.

Modified: projects/xml-tools/share/mk/doc.images.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.images.mk	Sat Feb  2 13:00:07 2013	(r40870)
+++ projects/xml-tools/share/mk/doc.images.mk	Sat Feb  2 14:52:15 2013	(r40871)
@@ -109,42 +109,6 @@ EPS2PNM_RES?=	100
 # shared image directory.
 IMAGES_PDF= ${IMAGES_GEN_PDF} ${_IMAGES_PNG}
 
-SCR2PNG?=	${PREFIX}/bin/scr2png
-SCR2PNGOPTS?=	${SCR2PNGFLAGS}
-SCR2TXT?=	${PREFIX}/bin/scr2txt
-SCR2TXTOPTS?=	-l ${SCR2TXTFLAGS}
-SED?=		/usr/bin/sed
-EPS2PNM?=	${PREFIX}/bin/gs
-EPS2PNMOPTS?=	-q -dBATCH -dGraphicsAlphaBits=4 -dTextAlphaBits=4 \
-		-dEPSCrop -r${EPS2PNM_RES}x${EPS2PNM_RES} \
-		-dNOPAUSE -dSAFER -sDEVICE=pnm -sOutputFile=-
-#
-# epsgeom is a perl script for 1) extracting geometry information
-# from a .eps file and 2) arrange it for ghostscript's pnm driver.
-#
-EPSGEOM?=	${PERL} ${DOC_PREFIX}/share/misc/epsgeom
-EPSGEOMOPTS?=	${EPS2PNM_RES} ${EPS2PNM_RES}
-PNMTOPNG?=	${PREFIX}/bin/pnmtopng
-PNMTOPNGOPTS?=	${PNGTOPNGFLAGS}
-PNGTOPNM?=	${PREFIX}/bin/pngtopnm
-PNGTOPNMOPTS?=	${PNGTOPNMFLAGS}
-PPMTOPGM?=	${PREFIX}/bin/ppmtopgm
-PPMTOPGMOPTS?=	${PPMTOPGMFLAGS}
-PNMTOPS?=	${PREFIX}/bin/pnmtops
-PNMTOPSOPTS?=	-noturn ${PNMTOPSFLAGS}
-EPSTOPDF?=	${PREFIX}/bin/epstopdf
-EPSTOPDFOPTS?=	${EPSTOPDFFLAGS}
-#
-PIC2PS?=	${GROFF} -p -S -Wall -mtty-char -man
-#
-PS2EPS?=	${PREFIX}/bin/gs
-PS2EPSOPTS?=	-q -dNOPAUSE -dSAFER -dDELAYSAFER \
-		-sPAPERSIZE=letter -r72 -sDEVICE=bit \
-		-sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
-PS2BBOX?=	${PREFIX}/bin/gs
-PS2BBOXOPTS?=	-q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
-		-sPAPERSIZE=letter -r72 -sDEVICE=bbox \
-		-sOutputFile=/dev/null ${PS2BBOXFLAGS}
 #
 # Use suffix rules to convert .scr files to other formats
 .SUFFIXES:	.scr .pic .png .ps .eps .txt

Modified: projects/xml-tools/share/mk/doc.project.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.project.mk	Sat Feb  2 13:00:07 2013	(r40870)
+++ projects/xml-tools/share/mk/doc.project.mk	Sat Feb  2 14:52:15 2013	(r40871)
@@ -66,57 +66,13 @@ MAINTAINER?=	doc at FreeBSD.org
 # formats
 ALL_FORMATS=	html html.tar html-split html-split.tar txt rtf ps pdf tex dvi tar pdb
 
+.include "doc.commands.mk"
+
 # User-modifiable
 LOCALBASE?=	/usr/local
 PREFIX?=	${LOCALBASE}
 PRI_LANG?=	en_US.ISO8859-1
 
-CP?=		/bin/cp
-CAT?=		/bin/cat
-ECHO_CMD?=	echo
-LN?=		/bin/ln
-MKDIR?=		/bin/mkdir
-RM?=		/bin/rm
-MV?=		/bin/mv
-HTML2TXT?=	${PREFIX}/bin/links
-HTML2TXTOPTS?=	-dump -width 72 ${HTML2TXTFLAGS}
-ISPELL?=	ispell
-ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
-.if exists(/usr/bin/perl)
-PERL?=		/usr/bin/perl
-.elif exists(/usr/local/bin/perl)
-PERL?=		/usr/local/bin/perl
-.else
-PERL?=		perl
-.endif
-REALPATH?=	/bin/realpath
-SETENV?=	/usr/bin/env
-XSLTPROC?=	${PREFIX}/bin/xsltproc
-XMLLINT?=	${PREFIX}/bin/xmllint
-#
-# In teTeX 3.0 and later, pdfetex(1) is used as the default TeX
-# engine for JadeTeX and tex(1) cannot be used as ${TEX_CMD} anymore
-# due to incompatibility of the format file.  Since the teTeX 3.0
-# distribution has "${PREFIX}/share/texmf-dist/LICENSE.texmf,"
-# it is checked here to determine which TeX engine should be used.
-.if exists(${PREFIX}/share/texmf-dist/LICENSE.texmf)
-TEX_CMD?=	${PREFIX}/bin/etex
-PDFTEX_CMD?=	${PREFIX}/bin/pdfetex
-.else
-TEX_CMD?=	${PREFIX}/bin/tex
-PDFTEX_CMD?=	${PREFIX}/bin/pdftex
-.endif
-LATEX_CMD?=	${PREFIX}/bin/latex
-JADETEX_CMD?=	${TEX_CMD} "&jadetex"
-JADETEX_PREPROCESS?=	/bin/cat
-PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex"
-PDFJADETEX_PREPROCESS?=	/bin/cat
-PS2PDF?=	${PREFIX}/bin/ps2pdf
-FOP_CMD?=	${PREFIX}/share/fop/fop.sh
-XEP_CMD?=	sh ${HOME}/XEP/xep.sh
-JAVA_CMD?=	${PREFIX}/bin/javavm
-SAXON_CMD?=	${JAVA_CMD} -jar ${PREFIX}/share/java/classes/saxon.jar
-
 # Image processing (contains code used by the doc.<format>.mk files, so must
 # be listed first).
 .include "doc.images.mk"
@@ -144,9 +100,6 @@ DOC_LOCAL_MK=	${DOC_PREFIX}/${LANGCODE}/
 .if ${DOCFORMAT} == "slides"
 .include "doc.slides.mk"
 .endif
-.if ${DOCFORMAT} == "html"
-.include "doc.html.mk"
-.endif
 .endif
 
 # Subdirectory glue.

Modified: projects/xml-tools/share/mk/web.site.mk
==============================================================================
--- projects/xml-tools/share/mk/web.site.mk	Sat Feb  2 13:00:07 2013	(r40870)
+++ projects/xml-tools/share/mk/web.site.mk	Sat Feb  2 14:52:15 2013	(r40871)
@@ -38,52 +38,12 @@ CGIGRP?=	www
 .endif
 CGIMODE?=	775
 
-BUNZIP2?=	/usr/bin/bunzip2
-CP?=		/bin/cp
-CVS?=		/usr/bin/cvs
-ECHO_CMD?=	echo
-FETCH?=		/usr/bin/fetch
-FIND?=		/usr/bin/find
-SETENV?=	/usr/bin/env
-LN?=		/bin/ln
-MKDIR?=		/bin/mkdir
-MV?=		/bin/mv
-PERL?=		/usr/bin/perl5
-.if !exists(${PERL}) && exists(/usr/local/bin/perl5)
-PERL=		/usr/local/bin/perl5
-.endif
-RM?=		/bin/rm
-SED?=		/usr/bin/sed
-SH?=		/bin/sh
-SORT?=		/usr/bin/sort
-TOUCH?=		/usr/bin/touch
-TRUE?=		/usr/bin/true
-
 LOCALBASE?=	/usr/local
 PREFIX?=	${LOCALBASE}
 
-.if exists(${PREFIX}/bin/sgmlnorm) && !defined(OPENJADE)
-SGMLNORM?=	${PREFIX}/bin/sgmlnorm
-.else
-SGMLNORM?=	${PREFIX}/bin/osgmlnorm
-.endif
-SGMLNORMOPTS?=	-d ${SGMLNORMFLAGS} ${CATALOG:S,^,-c ,} -D ${.CURDIR}
-
-XSLTPROC?=	${PREFIX}/bin/xsltproc
 XSLTPROCOPTS?=	${XSLTPROCFLAGS}
-
-XMLLINT?=	${PREFIX}/bin/xmllint
 XMLLINTOPTS?=	${XMLLINTFLAGS}
 
-HTML2TXT?=	${PREFIX}/bin/w3m
-HTML2TXTOPTS?=	-dump ${HTML2TXTFLAGS}
-ISPELL?=	ispell
-ISPELLOPTS?=	-l -p /usr/share/dict/freebsd ${ISPELLFLAGS}
-
-.if defined(WWWFREEBSDORG)
-SGMLNORMOPTS+=	-i html.header.script.google
-.endif
-
 WEBCHECK?=	${PREFIX}/bin/webcheck
 WEBCHECKOPTS?=	-ab ${WEBCHECKFLAGS}
 WEBCHECKDIR?=	/webcheck


More information about the svn-doc-projects mailing list