Use texlive/module.mk to simplify dependencies of tex-xmltex.

Bump PKGREVISION.

4 files changed, 30 insertions, 84 deletions

diff --git a/textproc/tex-xmltex/DESCR b/textproc/tex-xmltex/DESCR
index 211d6b8718a..b28253c9d67 100644
--- a/textproc/tex-xmltex/DESCR
+++ b/textproc/tex-xmltex/DESCR
@@ -1,9 +1,7 @@
-xmltex implements a non-validating parser for documents matching the
-W3C XML Namespaces Recommendation.  The system may just be used to
-parse the file (expanding entity references and normalising namespace
-declarations) in which case it records a trace of the parse on the
-terminal.  Normally however the information from the parse is used to
-trigger TeX typesetting code.  Declarations (in TeX syntax) are
-provided as part of xmltex to associate TeX code with the start and
-end of each XML element, attributes, processing instructions, and with
-unicode character data.
+This package provides an implementation of a parser for documents
+matching the XML 1.0 and XML Namespace Recommendations.  In addition
+to parsing commands are provided to attatch TeX typesetting
+instructions to the various markup elemenets as they are encounted.
+Sample files for typesetting a subset of TEI, MathML, are included.
+Element and Attribute names, as well as character data, may use any
+characters allowed in XML, using UTF-8 or a suitable 8-bit encoding.
diff --git a/textproc/tex-xmltex/Makefile b/textproc/tex-xmltex/Makefile
index 86fb68cc729..fcf3009412c 100644
--- a/textproc/tex-xmltex/Makefile
+++ b/textproc/tex-xmltex/Makefile
@@ -1,46 +1,13 @@
-# $NetBSD: Makefile,v 1.8 2008/06/22 02:55:53 reed Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/16 20:41:12 minskim Exp $
+# TeX Live Revision 11896
 
-DISTNAME=	base
-PKGNAME=	tex-xmltex-1.9
-PKGREVISION=	4
-WRKSRC=		${WRKDIR}/base
-CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/xmltex/}
-EXTRACT_SUFX=	.zip
+DISTNAME=	xmltex
+PKGNAME=	tex-${DISTNAME}-1.9
+PKGREVISION=	5
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.dcarlisle.demon.co.uk/xmltex/manual.html
 COMMENT=	Non-validating XML parser implemented in TeX
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
-INSTALLATION_DIRS=	 ${PKG_LOCALTEXMFPREFIX}/tex/xmltex
-NO_CONFIGURE=	yes
-USE_DIRS+=	texmf-1.0
-TEX_ACCEPTED=	teTeX3
-
-CLASS_FILES=	englishutf16.xml langtest.xmt tei.xmt	\
-		windows-1250.xmt englishutf8.xml mathml2.xmt testascii.cfg \
-		xmltex.cfg iso-8859-1.xmt pdfxmltex.ini testascii.tex \
-		xmltex.ini iso-8859-2.xmt portugeselatin1.xml testascii.xml \
-		xmltex.tex koi8-r.xmt russiankoi8.xml testsec.tex \
-		langtest.tex russianutf8.xml testsec.xml langtest.xml \
-		sec.xmt utf-16.xmt
-
-.include "../../print/teTeX/module.mk"
-
-do-build:
-	cd ${WRKSRC}; \
-	${TEX} -ini -progname=xmltex "&latex" xmltex.ini; \
-	${PDFTEX} -ini -progname=pdfxmltex "&pdflatex" pdfxmltex.ini
-
-do-install:
-	@cd ${WRKSRC}; \
-	${INSTALL_DATA} xmltex.fmt pdfxmltex.fmt ${PKG_LOCALTEXMFPREFIX}/web2c;
-.for f in ${CLASS_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PKG_LOCALTEXMFPREFIX}/tex/xmltex/
-.endfor
-	${RM} -f ${PREFIX}/bin/xmltex ${PREFIX}/bin/pdfxmltex
-	${LN} -s ${TEX} ${PREFIX}/bin/xmltex
-	${LN} -s ${PDFTEX} ${PREFIX}/bin/pdfxmltex
-
+.include "../../print/texlive/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/tex-xmltex/PLIST b/textproc/tex-xmltex/PLIST
index 8f060c31073..50302102d35 100644
--- a/textproc/tex-xmltex/PLIST
+++ b/textproc/tex-xmltex/PLIST
@@ -1,32 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2008/06/22 02:55:53 reed Exp $
-bin/pdfxmltex
-bin/xmltex
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/englishutf16.xml
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/englishutf8.xml
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/iso-8859-1.xmt
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/iso-8859-2.xmt
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/koi8-r.xmt
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/langtest.tex
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/langtest.xml
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/langtest.xmt
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/mathml2.xmt
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/pdfxmltex.ini
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/portugeselatin1.xml
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/russiankoi8.xml
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/russianutf8.xml
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/sec.xmt
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/tei.xmt
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/testascii.cfg
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/testascii.tex
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/testascii.xml
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/testsec.tex
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/testsec.xml
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/utf-16.xmt
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/windows-1250.xmt
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/xmltex.cfg
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/xmltex.ini
-${PKG_LOCALTEXMFPREFIX}/tex/xmltex/xmltex.tex
-${PKG_LOCALTEXMFPREFIX}/web2c/pdfxmltex.fmt
-${PKG_LOCALTEXMFPREFIX}/web2c/xmltex.fmt
-@comment In texmf-dirs: @dirrm ${PKG_LOCALTEXMFPREFIX}/web2c
-@dirrm ${PKG_LOCALTEXMFPREFIX}/tex/xmltex
+@comment $NetBSD: PLIST,v 1.4 2009/05/16 20:41:12 minskim Exp $
+share/texmf-dist/tex/xmltex/base/iso-8859-1.xmt
+share/texmf-dist/tex/xmltex/base/iso-8859-2.xmt
+share/texmf-dist/tex/xmltex/base/koi8-r.xmt
+share/texmf-dist/tex/xmltex/base/langtest.xmt
+share/texmf-dist/tex/xmltex/base/mathml2.xmt
+share/texmf-dist/tex/xmltex/base/sec.xmt
+share/texmf-dist/tex/xmltex/base/utf-16.xmt
+share/texmf-dist/tex/xmltex/base/windows-1250.xmt
+share/texmf-dist/tex/xmltex/base/xmltex.cfg
+share/texmf-dist/tex/xmltex/base/xmltex.tex
+share/texmf-dist/tex/xmltex/config/pdfxmltex.ini
+share/texmf-dist/tex/xmltex/config/xmltex.ini
diff --git a/textproc/tex-xmltex/distinfo b/textproc/tex-xmltex/distinfo
index 07c8ea15220..a18dc2343dd 100644
--- a/textproc/tex-xmltex/distinfo
+++ b/textproc/tex-xmltex/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/13 06:13:53 minskim Exp $
+$NetBSD: distinfo,v 1.2 2009/05/16 20:41:12 minskim Exp $
 
-SHA1 (tex-xmltex-1.9/base.zip) = d5f72c6d47d35006cbfbd72e501238404770e103
-RMD160 (tex-xmltex-1.9/base.zip) = 49415d9ad1c19b14ffd9901a00da236368e6a2d9
-Size (tex-xmltex-1.9/base.zip) = 51836 bytes
+SHA1 (tex-xmltex-1.9/xmltex.tar.lzma) = 3ec69be779e03c2c7d1ccaa9ee7700fc11b2bd70
+RMD160 (tex-xmltex-1.9/xmltex.tar.lzma) = 9429c1625c62e17fe31d12d94d9edc6759ca1015
+Size (tex-xmltex-1.9/xmltex.tar.lzma) = 18061 bytes