Change all makefiles in the print directory according to the new rules

for bsd.port.mk

7 files changed, 27 insertions, 46 deletions

diff --git a/print/afm/Makefile b/print/afm/Makefile
index e55e24af9343..daea0af74ff0 100644
--- a/print/afm/Makefile
+++ b/print/afm/Makefile
@@ -3,7 +3,7 @@
 # Date created:         23 November 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.3 1995/04/15 04:33:37 asami Exp $
+# $Id: Makefile,v 1.4 1995/04/17 20:31:10 asami Exp $
 #
 
 DISTNAME=	afm
@@ -13,8 +13,9 @@ MASTER_SITES=	ftp://sgi.com/sgi/fax/source/
 EXTRACT_SUFX=   -tar.Z
 
 pre-patch:
-	rm -rf ${WRKSRC}/RCS
+	@rm -rf ${WRKSRC}/RCS
 
-build: configure
+do-build:
+	@true
 
 .include <bsd.port.mk>
diff --git a/print/dvi2xx/Makefile b/print/dvi2xx/Makefile
index da1771e55250..1d1260e0251e 100644
--- a/print/dvi2xx/Makefile
+++ b/print/dvi2xx/Makefile
@@ -3,7 +3,7 @@
 # Date created:         14 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.5 1995/04/15 04:33:39 asami Exp $
+# $Id: Makefile,v 1.6 1995/04/18 14:02:57 jmz Exp $
 #
 
 DISTNAME=	dvi2xx
@@ -11,8 +11,10 @@ PKGNAME=	dvi2xx-0.51a9
 DISTFILES=	dvi2xx.tar.gz
 CATEGORIES+=	printing
 
-#other equivalent sites: ftp.shsu.edu dtp.dante.de
-CTAN=		ftp.tex.ac.uk
+MAINTAINER=	jmz@FreeBSD.ORG
+
+#other equivalent sites: ftp.shsu.edu ftp.dante.de
+CTAN?=		ftp.tex.ac.uk
 FTPGET=		${FILESDIR}/ftpget
 
 
diff --git a/print/latex/Makefile b/print/latex/Makefile
index 3e0f106d5ec9..23b74963383c 100644
--- a/print/latex/Makefile
+++ b/print/latex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.13 1995/04/17 20:31:23 asami Exp $
+# $Id: Makefile,v 1.14 1995/04/17 22:11:19 jmz Exp $
 #
 
 DISTNAME=	latex
@@ -16,13 +16,10 @@ MAINTAINER=	jmz@FreeBSD.org
 
 EXEC_DEPENDS=	tex:${PORTSDIR}/print/tex
 
-WRKDIR=		${.CURDIR}/work
-
 FTPGET=		${FILESDIR}/ftpget
-BUILD_COOKIE=	${WRKDIR}/.build_done
 
 #other equivalent sites: ftp.shsu.edu ftp.dante.de
-CTAN=		ftp.tex.ac.uk
+CTAN?=		ftp.tex.ac.uk
 
 
 latex_base.tar.gz:
@@ -34,21 +31,15 @@ latex_tfm.tar.gz:
 latex_tools.tar.gz:
 	@${FTPGET} ${CTAN} /tex-archive/macros latex/packages/tools.tar.gz ${DISTDIR}/$@
 
-
-build: configure ${BUILD_COOKIE}
-
-${BUILD_COOKIE}:
-	@echo "===>  Building for ${DISTNAME}"
+do-build:
 	@(cd ${WRKSRC}/base; yes | initex unpack.ins)
 	@(cd ${WRKSRC}/base; TEXFONTS=${WRKSRC}/tfm:; export TEXFONTS; \
 		yes | initex latex.ltx)
 	@(cd ${WRKSRC}/packages/tools; TEXFORMATS=${WRKSRC}/base:; \
 		TEXINPUTS=${WRKSRC}/base: export TEXFORMATS TEXINPUTS;\
 		 ln -sf /usr/local/bin/virtex latex; yes | ./latex tools.ins)
-	@touch -f ${BUILD_COOKIE}
 
-install: build
-	@echo "===>  Installing for ${DISTNAME}"
+do-install: 
 	@(/usr/bin/install -c -m 644 ${WRKSRC}/base/latex.fmt \
 				${PREFIX}/lib/texmf/ini/)
 	@(cd ${WRKSRC}/tfm; install -c -m 644 *.tfm ${PREFIX}/lib/texmf/fonts/tfm)
@@ -67,7 +58,6 @@ install: build
 	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/lib/texmf/documentation; fi; done)
 	@(cd ${WRKSRC}/packages/tools; for f in *.dtx; do \
 	    if [ -f $$f ]; then install -c -m 644  $$f ${PREFIX}/lib/texmf/documentation; fi; done)
-	@touch ${WRKDIR}/.install_done
 
 .include "Makefile.inc"
 
diff --git a/print/makeindex/Makefile b/print/makeindex/Makefile
index 4c870965fbd5..a8cb1226b6fc 100644
--- a/print/makeindex/Makefile
+++ b/print/makeindex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         12 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.5 1995/04/17 20:31:29 asami Exp $
+# $Id: Makefile,v 1.6 1995/04/19 19:42:24 jmz Exp $
 #
 
 DISTNAME=	makeindex
@@ -14,13 +14,11 @@ DISTFILES=	makeindex-3.0.8.tar.Z
 
 MAINTAINER=	jmz@FreeBSD.org
 
-build: configure pre-build
-	@echo "===>  Building for ${DISTNAME}"
+do-build: 
 	@(cd ${WRKSRC}/src-3.0/regexp; make)
 	@(cd ${WRKSRC}/src-3.0; make)
 
-install: build
-	@echo "===>  Installing for ${DISTNAME}"
+do-install: 
 	@mkdir -p ${PREFIX}/lib/texmf/makeindx
 	@mkdir -p ${PREFIX}/bin
 	@mkdir -p ${PREFIX}/man/man1
diff --git a/print/tex/Makefile b/print/tex/Makefile
index 34d1d8fa5c9a..ef1a4fd6f751 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.14 1995/04/17 00:16:14 jmz Exp $
+# $Id: Makefile,v 1.15 1995/04/17 20:31:35 asami Exp $
 #
 
 DISTNAME=	web2c-6.1
@@ -16,11 +16,11 @@ MAINTAINER=	jmz@FreeBSD.org
 
 EXTRACT_ONLY=	web2c.tar.gz web.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
 		mf_lib.tar.gz cm_mf.tar.gz
-WRKDIR=		${.CURDIR}/work
+
 FTPGET=		${FILESDIR}/ftpget
 
 #other equivalent sites: ftp.shsu.edu ftp.dante.de
-CTAN=		ftp.tex.ac.uk
+CTAN?=		ftp.tex.ac.uk
 
 
 BASES=		mf.base cmmf.base 
@@ -28,7 +28,6 @@ FORMATS=	tex.fmt
 
 CFLAGS=		-O2 -L${X11BASE}/lib
 
-BUILD_COOKIE=		${WRKDIR}/.build_done
 
 web2c.tar.gz: 
 	@${FTPGET} ${CTAN} /tex-archive/systems/web2c web2c.tar.gz ${DISTDIR}/$@
@@ -45,10 +44,7 @@ modes.mf:
 tex_base.tar.gz:
 	@${FTPGET} ${CTAN} /tex-archive/macros plain/base.tar.gz ${DISTDIR}/$@
 
-build: configure ${BUILD_COOKIE}
-
-${BUILD_COOKIE}:
-	@echo "===>  Building for ${DISTNAME}"
+do-build: 
 	@(cd ${WRKSRC}/web2c; make triptrap)
 	@(cd ${WRKSRC}/web2c; make run-triptrap)
 	@(cd ${WRKSRC}/web2c; make clean-triptrap)
@@ -58,10 +54,8 @@ ${BUILD_COOKIE}:
 	@(cd ${WRKSRC}/web2c; TEXINPUTS=${WRKDIR}/lib:${WRKSRC}; export TEXINPUTS;\
 	  TEXFONTS=${WRKDIR}/cm/tfm:${WRKDIR}/latex/tfm; export TEXFONTS; \
 		make fmts="${FORMATS}" fmts)
-	@touch -f ${BUILD_COOKIE}
 
-install: build
-	@echo "===>  Installing for ${DISTNAME}"
+do-install: 
 	@(cd ${WRKSRC}/web2c; make install-exec INSTALL_PROGRAM="/usr/bin/install -c -s")
 	@(cd ${WRKSRC}/web2c; make install-manpages)
 	@(cd ${WRKSRC}/web2c; make install-data bases="${BASES}" fmts="${FORMATS}")
@@ -72,7 +66,7 @@ install: build
 	@mkdir -p ${PREFIX}/lib/texmf/tex
 	@(cd ${WRKDIR}/lib; install -c -m 644 *.tex ${PREFIX}/lib/texmf/tex)
 	@(cd ${WRKDIR}/plain/base; install -c -m 644 *.tex ${PREFIX}/lib/texmf/tex)
-	@(rm -f ${PREFIX}/bin/latex ${PREFIX}/bin/slitex)
+	@(rm -f ${PREFIX}/bin/latex)
 
 .include "Makefile.inc"
 
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index cf429b9d80cc..21957d0189fe 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -3,7 +3,7 @@
 # Date created:         2 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.4 1995/04/15 22:36:51 jmz Exp $
+# $Id: Makefile,v 1.5 1995/04/17 20:31:38 asami Exp $
 #
 
 DISTNAME=	texinfo
@@ -38,12 +38,10 @@ pre-configure:
 	@cp ${DISTDIR}/texinfo.tex ${DISTDIR}/lcircle10.tfm ${WRKDIR}
 	@chmod +w ${WRKDIR}/*
 
-build: configure
-	@echo "===>  Building for ${DISTNAME}"
+do-build: 
 	@(cd ${WRKDIR}; initex '&tex texinfo @dump')
 
-install: build
-	@echo "===>  Installing for ${DISTNAME}"
+do-install: 
 	@/usr/bin/install -c -m 644 ${WRKDIR}/texinfo.fmt \
 				${PREFIX}/lib/texmf/ini/
 	@if [ ! -f ${PREFIX}/lib/texmf/fonts/tfm/lcircle10.tfm ]; then \
diff --git a/print/xdvi/Makefile b/print/xdvi/Makefile
index 402286eff5d8..aacd19d238b1 100644
--- a/print/xdvi/Makefile
+++ b/print/xdvi/Makefile
@@ -3,7 +3,7 @@
 # Date created:         1 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.11 1995/04/17 20:31:43 asami Exp $
+# $Id: Makefile,v 1.12 1995/04/20 02:03:57 jmz Exp $
 #
 
 DISTNAME=	xdvi
@@ -20,8 +20,7 @@ IS_INTERACTIVE=	yes
 
 XMKMF=		xmkmf
 
-.if !defined(BATCH)
-install: build
+do-install: 
 	@echo "===>  Installing for ${DISTNAME}"
 	@mkdir -p ${PREFIX}/man/man1
 	@mkdir -p ${PREFIX}/bin
@@ -31,6 +30,5 @@ install: build
 	@(cd ${WRKSRC}; ${GMAKE} -f Makefile install BINDIR=${PREFIX}/bin)
 	@(cd ${WRKSRC}; install -c -m 755 -o bin MakeTeXPK ${PREFIX}/bin)
 	@if -f ${SCRIPTDIR}/install.tmp; then sh ${SCRIPTDIR}/install.tmp; fi
-.endif
 
 .include <bsd.port.mk>