Following a suggestion from Satoshi, and thanks to the work of Dave Cornejo,

tarballs are now available at ftp.cdrom.com in /pub/tex/package/.
Makefile are simpler, and  md5 checksum exist for all files.

4 files changed, 13 insertions, 46 deletions

diff --git a/print/latex/Makefile b/print/latex/Makefile
index 6a6f516d2d35..f97d7ea5fdc8 100644
--- a/print/latex/Makefile
+++ b/print/latex/Makefile
@@ -3,13 +3,14 @@
 # Date created:         29 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.31 1997/07/26 15:00:34 jmz Exp $
+# $Id: Makefile,v 1.32 1997/11/10 11:23:24 asami Exp $
 #
 
 VERSION=	97.06
 DISTNAME=	latex
 PKGNAME=	latex2e-${VERSION}
-CATEGORIES=	print
+CATEGORIES=     print
+MASTER_SITES=   ftp://ftp.cdrom.com/pub/tex/package/
 DISTFILES=	latex_mf-${VERSION}.tar.gz latex_tfm-${VERSION}.tar.gz \
 		latex_base-${VERSION}.tar.gz latex_tools-${VERSION}.tar.gz
 
@@ -19,20 +20,6 @@ BUILD_DEPENDS=	tex:${PORTSDIR}/print/tex
 RUN_DEPENDS=	tex:${PORTSDIR}/print/tex
 
 MANUAL_PACKAGE_BUILD=	has to be built with tex port
-IGNOREFILES=	${DISTFILES}
-
-#other equivalent sites: ftp.cdrom.com ftp.dante.de
-CTAN?=		ftp.tex.ac.uk
-
-
-latex_base-${VERSION}.tar.gz:
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/macros/latex/base.tar.gz 
-latex_mf-${VERSION}.tar.gz:
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/fonts/latex/mf.tar.gz 
-latex_tfm-${VERSION}.tar.gz:
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/fonts/latex/tfm.tar.gz 
-latex_tools-${VERSION}.tar.gz:
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/macros/latex/packages/tools.tar.gz 
 
 do-build:
 	(cd ${WRKSRC}/base; tex --ini unpack.ins)
@@ -64,6 +51,4 @@ do-install:
 	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/share/texmf/documentation; fi; done)
 	@(cd ${PREFIX}/bin; rm -f latex; ln -s tex latex)
 
-.include "Makefile.inc"
-
 .include <bsd.port.mk>
diff --git a/print/latex/distinfo b/print/latex/distinfo
index 5133a2b30b13..7a9cbdfc6d74 100644
--- a/print/latex/distinfo
+++ b/print/latex/distinfo
@@ -1,4 +1,4 @@
-MD5 (latex_mf-97.06.tar.gz) = IGNORE
-MD5 (latex_tfm-97.06.tar.gz) = IGNORE
-MD5 (latex_base-97.06.tar.gz) = IGNORE
-MD5 (latex_tools-97.06.tar.gz) = IGNORE
+MD5 (latex_mf-97.06.tar.gz) = 103c787d125cd0d441403b3ad38af814
+MD5 (latex_tfm-97.06.tar.gz) = d25506daff74e664c045956400744609
+MD5 (latex_base-97.06.tar.gz) = e14740da6fc10e6754679b21051f1307
+MD5 (latex_tools-97.06.tar.gz) = 6415874248bc825ef152103cc5eab3d4
diff --git a/print/tex/Makefile b/print/tex/Makefile
index afa67afe46fb..f364d90db8f8 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -3,19 +3,19 @@
 # Date created:         29 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.30 1997/11/10 11:23:41 asami Exp $
+# $Id: Makefile,v 1.31 1997/12/11 00:00:20 jmz Exp $
 #
 
 DISTNAME=	web2c-7.1
 PKGNAME=	tex-3.14159
 CATEGORIES=	print
+MASTER_SITES=   ftp://ftp.cdrom.com/pub/tex/package/
 DISTFILES=	web2c-7.1.tar.gz web-7.1.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
 		mf_lib.tar.gz cm_mf.tar.gz modes.mf 
 
 MAINTAINER=	jmz@FreeBSD.org
 
 MANUAL_PACKAGE_BUILD=	has to be built with latex port
-IGNOREFILES=	tex_base.tar.gz cm_tfm.tar.gz mf_lib.tar.gz cm_mf.tar.gz
 EXTRACT_ONLY=	web2c-7.1.tar.gz web-7.1.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
 		mf_lib.tar.gz cm_mf.tar.gz
 
@@ -23,22 +23,6 @@ USE_GMAKE=	yes
 
 MAKE_FLAGS=	fmts= all_mems= -f
 
-CTAN?=		ftp.tex.ac.uk
-
-web2c-7.1.tar.gz: 
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/systems/web2c/web2c-7.1.tar.gz 
-web-7.1.tar.gz: 
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/systems/web2c/web-7.1.tar.gz 
-cm_mf.tar.gz:
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/fonts/cm/mf.tar.gz 
-cm_tfm.tar.gz:
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/fonts/cm/tfm.tar.gz 
-mf_lib.tar.gz: 
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/systems/knuth/lib.tar.gz 
-modes.mf:
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/fonts/modes/modes.mf 
-tex_base.tar.gz:
-	@${FETCH_CMD} -o ${DISTDIR}/$@ ftp://${CTAN}/tex-archive/macros/plain/base.tar.gz 
 
 post-install:
 	@for i in kpsewhich dmp bibtex dvicopy dvitomp dvitype gftodvi gftopk \
@@ -54,6 +38,4 @@ post-install:
 	@(cd ${WRKDIR}/lib; ${INSTALL_DATA} *.tex ${PREFIX}/share/texmf/tex)
 	@(cd ${WRKDIR}/base; ${INSTALL_DATA} *.tex ${PREFIX}/share/texmf/tex)
 
-.include "Makefile.inc"
-
 .include <bsd.port.mk>
diff --git a/print/tex/distinfo b/print/tex/distinfo
index a88033e76f1a..2b8d77cce898 100644
--- a/print/tex/distinfo
+++ b/print/tex/distinfo
@@ -1,7 +1,7 @@
 MD5 (web2c-7.1.tar.gz) = 9337cb416cc367be7871c2f15bf91a5c
 MD5 (web-7.1.tar.gz) = d525679921a0db7e4289b53415494dae
+MD5 (tex_base.tar.gz) = 7d89c3a847b035d6e8a2f160837ce8c7
+MD5 (cm_tfm.tar.gz) = a2bf30d48f4b726996173396f99b830e
+MD5 (mf_lib.tar.gz) = a2491486902879cb854fffbbbccb1c6c
+MD5 (cm_mf.tar.gz) = 743231313957f40fef869690ff6589e2
 MD5 (modes.mf) = 1aa49889ea67eb213a4607da5a6e0687
-MD5 (tex_base.tar.gz) = IGNORE
-MD5 (cm_tfm.tar.gz) = IGNORE
-MD5 (mf_lib.tar.gz) = IGNORE
-MD5 (cm_mf.tar.gz) = IGNORE