Adjust dependancies and bump PKGREVISION due to:

- teTeX 1.0.x packages have been moved to teTeX1* directories.
- teTeX 2.0.x packages have been moved to teTeX* directories and their base
  name has been changed to teTeX (instead of teTeX2).

16 files changed, 54 insertions, 49 deletions

diff --git a/print/advi/Makefile b/print/advi/Makefile
index f6b4cde2d55..f2e57ae047c 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/08/31 01:43:23 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/24 13:02:00 jmmv Exp $
 
 DISTNAME=		advi-1.4.0
+PKGREVISION=		1
 CATEGORIES=		print
 MASTER_SITES=		ftp://ftp.inria.fr/INRIA/Projects/cristal/advi/
 
@@ -8,7 +9,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://pauillac.inria.fr/advi/
 COMMENT=		Active-DVI Presenter
 
-DEPENDS+=		{teTeX-[0-9]*,teTeX2-[0-9]*}:../../print/teTeX
+DEPENDS+=		teTeX-[0-9]*:../../print/teTeX
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/print/chktex/Makefile b/print/chktex/Makefile
index 51f8392cffd..06e62587599 100644
--- a/print/chktex/Makefile
+++ b/print/chktex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/09/14 18:13:50 recht Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/24 13:02:00 jmmv Exp $
 #
 
 DISTNAME=	chktex-1.6.1
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://savannah.nongnu.org/download/chktex/chktex.pkg/1.6.1/
 
@@ -18,5 +19,5 @@ GNU_CONFIGURE=	YES
 CFLAGS+=	-D__unix__
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-.include "../../print/teTeX2-bin/kpathsea.buildlink2.mk"
+.include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvipdfm/Makefile b/print/dvipdfm/Makefile
index f32de621ccc..48e520beb2f 100644
--- a/print/dvipdfm/Makefile
+++ b/print/dvipdfm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/11/07 23:24:12 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/24 13:02:00 jmmv Exp $
 
 DISTNAME=	dvipdfm-0.13.2c
-PKGREVISION=	1
+PKGREVISION=	2
 WRKSRC=		${WRKDIR}/dvipdfm
 CATEGORIES=	print converters
 MASTER_SITES=	ftp://ftp.kettering.edu/pub/outgoing/mwicks/dvipdfm/
@@ -12,7 +12,7 @@ COMMENT=	DVI to PDF translator
 
 CONFLICTS+=	dvipdfmx-[0-9]*
 CONFLICTS+=	ja-dvipdfm-[0-9]*
-CONFLICTS+=	teTeX2-bin-[2-9]*
+CONFLICTS+=	teTeX-bin>=2.0
 
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
@@ -34,6 +34,6 @@ post-install:
 	mktexlsr
 
 .include "../../graphics/png/buildlink2.mk"
-.include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
+.include "../../print/teTeX1-bin/kpathsea.buildlink2.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index d834bd34041..eaf78d5d032 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/11/12 03:39:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/24 13:02:01 jmmv Exp $
 
 DISTNAME=	dvipdfmx-20021230
 PKGNAME=	dvipdfmx-0.0.0.20021230
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print converters
 MASTER_SITES=	http://project.ktug.or.kr/dvipdfmx/snapshot/
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://project.ktug.or.kr/dvipdfmx/
 COMMENT=	Dvi to pdf converter with CID-keyed font support
 
 DEPENDS+=	adobe-cmaps-[0-9]*:../../fonts/adobe-cmaps
-DEPENDS+=	teTeX2-bin>=2.0.2:../../print/teTeX2-bin
+DEPENDS+=	teTeX-bin>=2.0.2:../../print/teTeX-bin
 
 CONFLICTS+=	dvipdfm-[0-9]*
 CONFLICTS+=	ja-dvipdfm-[0-9]*
@@ -29,7 +29,7 @@ post-patch:
 
 .include "../../security/openssl/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
-.include "../../print/teTeX2-bin/kpathsea.buildlink2.mk"
+.include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/dvipng/Makefile b/print/dvipng/Makefile
index 33598bfc7d7..3c71237cf50 100644
--- a/print/dvipng/Makefile
+++ b/print/dvipng/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/12/15 13:45:07 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/12/24 13:02:01 jmmv Exp $
 #
 
 DISTNAME=		dvipng-0.8
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		textproc converters
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=preview-latex/}
 
@@ -22,5 +22,5 @@ BUILDLINK_DEPENDS.freetype2?=	freetype2>=2.1.3
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/gd/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
-.include "../../print/teTeX2-bin/kpathsea.buildlink2.mk"
+.include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index 3976e5023bc..463ffff5728 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/10/08 10:08:00 taca Exp $
+# $NetBSD: Makefile,v 1.12 2003/12/24 13:02:01 jmmv Exp $
 #
 
 DISTNAME=	html2ps-1.0b1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.tdb.uu.se/~jan/
 
@@ -14,7 +14,7 @@ DEPENDS+=	ImageMagick>=5.3.9nb1:../../graphics/ImageMagick
 DEPENDS+=	jpeg>=6b:../../graphics/jpeg
 DEPENDS+=	p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+=	teTeX{,2}-bin>=1.0.6:../../print/teTeX-bin
+DEPENDS+=	teTeX-bin>=1.0.6:../../print/teTeX-bin
 DEPENDS+=	weblint-[0-9]*:../../www/weblint
 
 USE_PERL5=	yes
diff --git a/print/ja-dvipdfm/Makefile b/print/ja-dvipdfm/Makefile
index f8bc4090ac0..7de909e64df 100644
--- a/print/ja-dvipdfm/Makefile
+++ b/print/ja-dvipdfm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:52:31 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/12/24 13:02:01 jmmv Exp $
 
 DISTNAME=	dvipdfm-0.13.2c
 PKGNAME=        ja-${DISTNAME}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/dvipdfm
 CATEGORIES=	print converters
 MASTER_SITES=	ftp://ftp.kettering.edu/pub/outgoing/mwicks/dvipdfm/
@@ -16,6 +17,7 @@ COMMENT=	DVI to PDF translator with Japanese patch
 
 CONFLICTS+=	dvipdfm-[0-9]*
 CONFLICTS+=	dvipdfmx-[0-9]*
+CONFLICTS+=	teTeX-bin>=2.0
 
 USE_BUILDLINK2=	# defined
 GNU_CONFIGURE=	# defined
@@ -34,6 +36,6 @@ post-install:
 	${PREFIX}/bin/mktexlsr
 
 .include "../../graphics/png/buildlink2.mk"
-.include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
+.include "../../print/teTeX1-bin/kpathsea.buildlink2.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index d7acbcc6230..bd2b644bf9d 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/09/19 09:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/24 13:02:01 jmmv Exp $
 
 DISTNAME=	ptex-src-${PTEX_VERS}
 PKGNAME=	ja-ptex-bin-${PTEX_VERS}
@@ -27,7 +27,7 @@ DEPENDS+=	ja-ptex-share>=2.1:../../print/ja-ptex-share
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
-.include "../../print/teTeX2-bin/Makefile.common"
+.include "../../print/teTeX-bin/Makefile.common"
 
 PTEX_VERS=		3.1.2
 DVIPSK_PATCH_VERS=	p1.6
@@ -53,9 +53,9 @@ FILES_SUBST+=		PATCH=${PATCH}
 
 pre-extract:
 	if [ ! -e ${WRKSRC} ]; then \
-		cd ../../print/teTeX2-bin && ${MAKE} patch; \
+		cd ../../print/teTeX-bin && ${MAKE} patch; \
 	elif [ ! -e ${WRKSRC_PTEX} ]; then \
-		cd ../../print/teTeX2-bin && ${MAKE} clean; ${MAKE} patch; \
+		cd ../../print/teTeX-bin && ${MAKE} clean; ${MAKE} patch; \
 	fi;
 
 post-extract:
@@ -115,7 +115,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/texk/PSTricks.patch ${TEXMF}/dvips/pstricks
 
 pre-clean:
-	cd ../../print/teTeX2-bin && ${MAKE} clean
+	cd ../../print/teTeX-bin && ${MAKE} clean
 
-.include "../../print/teTeX2-bin/kpathsea.buildlink2.mk"
+.include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-ptex-share/Makefile b/print/ja-ptex-share/Makefile
index f81a2100d65..7e79e7ed4cd 100644
--- a/print/ja-ptex-share/Makefile
+++ b/print/ja-ptex-share/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:16:24 martti Exp $
+# $NetBSD: Makefile,v 1.6 2003/12/24 13:02:01 jmmv Exp $
 
 DISTNAME=	ptex-texmf-2.1
 PKGNAME=	ja-ptex-share-2.1
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}
 CATEGORIES=	print japanese
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
@@ -18,7 +19,7 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www.ascii.co.jp/pb/ptex/
 COMMENT=	Library files for pTeX
 
-DEPENDS+=	teTeX2>=2.0.1:../../print/teTeX2
+DEPENDS+=	teTeX>=2.0.1:../../print/teTeX
 
 DIST_SUBDIR=		teTeX
 NO_CONFIGURE=		YES
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index 26c54cd4a83..8c92504a74b 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/10/05 02:00:43 kei Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/24 13:02:01 jmmv Exp $
 
 DISTNAME=	xdvik-${XDVIK_ORIGINAL_VERS}
 PKGNAME=	ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xdvi/} # not xdvik
 
@@ -73,9 +73,9 @@ do-install:
 	cd ${XDVI_DIR} && ${MAKE_PROGRAM} install
 
 .if defined(USE_TEXFAMILY)
-.include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
+.include "../../print/teTeX1-bin/kpathsea.buildlink2.mk"
 .else
-.include "../../print/teTeX2-bin/kpathsea.buildlink2.mk"
+.include "../../print/teTeX-bin/kpathsea.buildlink2.mk"
 .endif
 .include "../../www/libwww/buildlink2.mk"
 .include "../../print/ja-vflib-lib/buildlink2.mk"
diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index 86faa171c30..4cebebe0c47 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 22:52:33 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/24 13:02:01 jmmv Exp $
 
 DISTNAME=	lgrind
 PKGNAME=	lgrind-3.5
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	jwise@NetBSD.org
 COMMENT=	Source pretty printer for LaTeX
 
-DEPENDS+=	teTeX-1.0.*:../../print/teTeX
+DEPENDS+=	teTeX-1.0.*:../../print/teTeX1
 
 USE_X11=	yes
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 081b7f8bc01..649af13a189 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/08/09 11:20:37 seb Exp $
+# $NetBSD: Makefile,v 1.19 2003/12/24 13:02:01 jmmv Exp $
 #
 
 DISTNAME=	lilypond-1.4.13
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/stable/
 
diff --git a/print/tex-eurosym/Makefile b/print/tex-eurosym/Makefile
index b1803efcdaf..b13109ab9a1 100644
--- a/print/tex-eurosym/Makefile
+++ b/print/tex-eurosym/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:52:42 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/24 13:02:01 jmmv Exp $
 #
 
 DISTNAME=	eurosym-1.0
 PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 WRKSRC=		${WRKDIR}/eurosym
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -13,7 +13,7 @@ HOMEPAGE=	ftp://ftp.univie.ac.at/packages/tex/fonts/eurosym/
 COMMENT=	Euro symbols for LaTeX
 
 # included in teTeX2
-DEPENDS+=	teTeX-bin-[0-9]*:../../print/teTeX-bin
+DEPENDS+=	teTeX-bin-1.0.*:../../print/teTeX1-bin
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/print/tex-hugelatex/Makefile b/print/tex-hugelatex/Makefile
index e8c934f2644..ee6c83bc954 100644
--- a/print/tex-hugelatex/Makefile
+++ b/print/tex-hugelatex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:52:42 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/24 13:02:01 jmmv Exp $
 #
 
 DISTNAME=	hugelatex-1.0
@@ -12,7 +12,7 @@ DISTFILES=	# nada
 MAINTAINER=	hubertf@NetBSD.org
 COMMENT=	LaTeX format files with large limits
 
-DEPENDS+=	teTeX-1.0*:../teTeX
+DEPENDS+=	teTeX-1.0*:../../print/teTeX1
 
 EXTRACT_ONLY=	# nothing
 NO_CHECKSUM=	yes
diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index 35b22f8e26a..547ef91aaea 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/04/27 17:16:15 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/24 13:02:01 jmmv Exp $
 #
 
 DISTNAME=	musixtex-109
@@ -13,7 +13,7 @@ MAINTAINER=	dgriffi@cs.csubak.edu
 HOMEPAGE=	http://icking-music-archive.sunsite.dk/
 COMMENT=	TeX macros to typeset music
 
-DEPENDS+=       teTeX-1.0*:../../print/teTeX
+DEPENDS+=       teTeX-1.0*:../../print/teTeX1
 
 NO_CONFIGURE=	yes
 
diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile
index 2204ac6fe1f..17ae8553cc7 100644
--- a/print/texfamily/Makefile
+++ b/print/texfamily/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:52:43 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/24 13:02:01 jmmv Exp $
 
 DISTNAME=	TeXfamily-1.2.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/ \
 		ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2.1/ \
@@ -31,7 +31,7 @@ DEPENDS+=	TeXfamily-share>=1.2.1nb3:../../print/texfamily-share
 DEPENDS+=	ja-vflib-lib-[0-9]*:../../print/ja-vflib-lib
 
 DIST_SUBDIR=	TeXfamily
-TETEX_DIR=	${_PKGSRCDIR}/print/teTeX-bin/${WRKDIR:T}/teTeX-1.0
+TETEX_DIR=	${_PKGSRCDIR}/print/teTeX1-bin/${WRKDIR:T}/teTeX-1.0
 WRKSRC=		${TETEX_DIR}
 EXTRACT_ONLY=	# none
 
@@ -83,9 +83,9 @@ TEXFAMILY_MENDEXVERSION=2.5
 
 pre-extract:
 	if [ ! -e ${WRKSRC} ]; then \
-		cd ../../print/teTeX-bin && ${MAKE} patch; \
+		cd ../../print/teTeX1-bin && ${MAKE} patch; \
 	elif [ ! -e ${WRKSRC}/texk/texfam.ac ]; then \
-		cd ../../print/teTeX-bin && ${MAKE} clean; ${MAKE} patch; \
+		cd ../../print/teTeX1-bin && ${MAKE} clean; ${MAKE} patch; \
 	fi
 
 post-extract:
@@ -165,6 +165,6 @@ post-install:
 	${LOCALBASE}/bin/mktexlsr ${LOCALBASE}/share/texmf.local
 
 pre-clean:
-	cd ../../print/teTeX-bin && ${MAKE} clean
+	cd ../../print/teTeX1-bin && ${MAKE} clean
 
 .include "../../mk/bsd.pkg.mk"