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).
NetBSD · Dec 24, 2003 · eeee7fa · eeee7fa
1 parent 3409558
commit eeee7fa
Show file tree

Hide file tree

Showing 27 changed files with 85 additions and 72 deletions.
diff --git a/benchmarks/skampi/Makefile b/benchmarks/skampi/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/11/08 22:19:37 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/24 13:02:00 jmmv Exp $
 #
 
 DISTNAME=	skampi4
 PKGNAME=	skampi-4.0.1
+PKGREVISION=	1
 CATEGORIES=	benchmarks parallel
 MASTER_SITES=	http://liinwww.ira.uka.de/~skampi/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}_userman.ps.gz
@@ -14,7 +15,7 @@ COMMENT=	MPI (Message Passing Interface) benchmarks
 
 DEPENDS=	mpich>=1.2.1:../../parallel/mpi-ch
 DEPENDS+=	gnuplot>=3.7.1:../../graphics/gnuplot
-DEPENDS+=	teTeX{,2}>=1.0.7:../../print/teTeX2
+DEPENDS+=	teTeX>=1.0.7:../../print/teTeX
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 

diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:30:11 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/12/24 13:02:00 jmmv Exp $
 #
 # XXX This package needs to be installed with the same PREFIX as teTeX
 #
 
 DISTNAME=		cweb-3.64
+PKGREVISION=		1
 WRKSRC=			${WRKDIR}
 CATEGORIES=		devel lang
 MASTER_SITES=		${MASTER_SITE_TEX_CTAN:=web/cweb/}
@@ -12,7 +13,9 @@ MAINTAINER=		[email protected]
 HOMEPAGE=		http://www-cs-faculty.stanford.edu/~knuth/cweb.html
 COMMENT=		CWEB System of Structured Documentation
 
-DEPENDS+= 		teTeX-[0-9]*:../../print/teTeX
+CONFLICTS+=		teTeX-bin>=2.0
+
+DEPENDS+= 		teTeX-[0-9]*:../../print/teTeX1
 
 post-patch:
 	${MV} ${WRKSRC}/cweb.1 ${WRKSRC}/cweb.1.dist

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/12/23 21:10:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2003/12/24 13:02:00 jmmv Exp $
 
 DISTNAME=		doxygen-1.3.5.src
 PKGNAME=		doxygen-1.3.5
-PKGREVISION=		1
+PKGREVISION=		2
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.stack.nl/pub/users/dimitri/
@@ -11,7 +11,7 @@ MAINTAINER=		[email protected]
 HOMEPAGE=		http://www.doxygen.org/
 COMMENT=		Documentation system for C++, Java, IDL and C
 
-DEPENDS+=		{teTeX-[0-9]*,teTeX2-[0-9]*}:../../print/teTeX2
+DEPENDS+=		teTeX-[0-9]*:../../print/teTeX
 
 USE_GMAKE=		yes
 USE_PERL5=		yes

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.18 2003/10/08 20:58:05 reed Exp $
+# $NetBSD: Makefile,v 1.19 2003/12/24 13:02:00 jmmv Exp $
 
 DISTNAME=	TeXmacs-1.0.1-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.texmacs.org/pub/TeXmacs/targz/
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://www.texmacs.org
 COMMENT=	GNU TeXmacs (free scientific text editor)
 
-DEPENDS+=	teTeX{,2}>=1.0:../../print/teTeX
+DEPENDS+=	teTeX>=1.0:../../print/teTeX
 
 ALL_TARGET=	TEXMACS
 

diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2003/12/23 21:10:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/24 13:02:00 jmmv Exp $
 #
 
 .include "./Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-qt-/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT+=	(QT version)
 

diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2003/12/23 21:10:22 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.10 2003/12/24 13:02:00 jmmv Exp $
 #
 
 DISTNAME=		lyx-1.3.3
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.lyx.org/
 COMMENT=		Graphical frontend for LaTeX
 
 CONFLICTS=		lyx-[0-9]*
-DEPENDS+=		{teTeX-[0-9]*,teTeX2-[0-9]*}:../../print/teTeX2
+DEPENDS+=		teTeX-[0-9]*:../../print/teTeX
 
 DESCR_SRC=		${.CURDIR}/../../editors/lyx-qt/DESCR
 DISTINFO_FILE=		${.CURDIR}/../../editors/lyx-qt/distinfo

diff --git a/editors/lyx-xforms/Makefile b/editors/lyx-xforms/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/12/23 21:10:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/24 13:02:00 jmmv Exp $
 #
 
 .include "../lyx-qt/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-xforms-/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT+=	(xforms version)
 

diff --git a/graphics/xdvipresent/Makefile b/graphics/xdvipresent/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:43:07 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/24 13:02:00 jmmv Exp $
 #
 
 DISTNAME=	xdvipresent-0.6p14
 PKGNAME=	xdvipresent-0.6.1.14
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/xdvipresent
 CATEGORIES=	graphics textproc print x11
 MASTER_SITES=	http://clip.dia.fi.upm.es/Software/

diff --git a/math/octave/Makefile b/math/octave/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2003/12/23 10:39:30 sketch Exp $
+# $NetBSD: Makefile,v 1.41 2003/12/24 13:02:00 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
 
 DISTNAME=	octave-2.0.17
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/ \
 		ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/ \
@@ -14,7 +15,7 @@ MAINTAINER=	[email protected]
 HOMEPAGE=	http://www.che.wisc.edu/octave/
 COMMENT=	High-level language, primarily intended for numerical computations
 
-BUILD_DEPENDS+=	teTeX{,2}>=1.0.7:../../print/teTeX
+BUILD_DEPENDS+=	teTeX>=1.0.7:../../print/teTeX
 DEPENDS+=	gnuplot{,-nox11}>=3.7:../../graphics/gnuplot
 
 CONFLICTS+=	octave-2.1.*

diff --git a/print/advi/Makefile b/print/advi/Makefile
@@ -1,14 +1,15 @@
-# $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/
 
 MAINTAINER=		[email protected]
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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=	[email protected]
 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
@@ -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"