A number of changes to this port:

* Portlint and clean up some style bugs
* Replace a hand-rolled configure script with pre/post-configure and
  GNU_CONFIGURE (side-effect is to respect CC and CFLAGS in the build
  instead of using -O2)
* respect the value of INSTALL_SCRIPT so the installation doesn't bomb out
  when we pass in INSTALL_PROGRAM as well
* allow automatic packaging (the MANUAL_PACKAGE_BUILD) seems to be a hold-
  over from several years ago before package builds were done separately.

Approved by:	jmz (maintainer)

6 files changed, 84 insertions, 27 deletions

diff --git a/print/tex/Makefile b/print/tex/Makefile
index 3aac70b3539a..ab35364cc8d0 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -14,25 +14,32 @@ MASTER_SITE_SUBDIR=	systems/web2c
 DISTNAME=	web2c-7.2
 DISTFILES=	web2c-7.2b.tar.gz web-7.2a.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
 		mf_lib.tar.gz cm_mf.tar.gz modes.mf
+EXTRACT_ONLY=	web2c-7.2b.tar.gz web-7.2a.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
+		mf_lib.tar.gz cm_mf.tar.gz
 
 MAINTAINER=	jmz@FreeBSD.org
 
-MANUAL_PACKAGE_BUILD=	has to be built with latex port
-EXTRACT_ONLY=	web2c-7.2b.tar.gz web-7.2a.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
-		mf_lib.tar.gz cm_mf.tar.gz
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+
 MAN1=		access.1 amstex.1 bibtex.1 dmp.1 dvicopy.1 dvitype.1 eplain.1 \
 		etex.1 gftodvi.1 gftopk.1 gftype.1 kpsestat.1 kpsewhich.1 \
 		latex.1 makempx.1 mf.1 mft.1 mktexlsr.1 mktexmf.1 mktexpk.1 \
 		mktextfm.1 mpost.1 mpto.1 newer.1 omega.1 patgen.1 pdftex.1 \
 		pktogf.1 pktype.1 pltotf.1 pooltype.1 readlink.1 tangle.1 \
 		tex.1 tftopl.1 tie.1 vftovp.1 vptovf.1 weave.1
+MAKE_FLAGS=	fmts= all_mems=
 
-USE_GMAKE=	yes
+pre-configure:
+	cd ${WRKDIR} && find . -name \*.gz | xargs gunzip -f
 
-MAKE_FLAGS=	fmts= all_mems=
+post-configure:
+	@cd ${WRKSRC}/web2c; \
+	${LN} -s ../../tfm/*.tfm ../../base/*.tex ../../mf/*.mf ../../lib/*.mf .; \
+	${CP} ${DISTDIR}/modes.mf .
 
 do-build:
-	 @(cd ${WRKSRC}; unset `env|${GREP} ^TEX|${SED} -e s/=.*//`; \
+	@(cd ${WRKSRC}; unset `env|${GREP} ^TEX|${SED} -e s/=.*//`; \
 	    ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${ALL_TARGET})
 
 post-install:
diff --git a/print/tex/files/patch-aa b/print/tex/files/patch-aa
new file mode 100644
index 000000000000..1d6c5d2ec3dd
--- /dev/null
+++ b/print/tex/files/patch-aa
@@ -0,0 +1,11 @@
+--- make/common.make.orig	Tue Feb  3 13:41:55 1998
++++ make/common.make	Sun May 13 14:57:48 2001
+@@ -28,7 +28,7 @@
+ # Installation.
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-INSTALL_SCRIPT = $(INSTALL_PROGRAM)
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_LIBTOOL_LIBS = INSTALL_DATA='$(INSTALL_DATA)' $(LIBTOOL) install-lib
+ INSTALL_LIBTOOL_PROG = INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(LIBTOOL) install-prog
diff --git a/print/tex/files/patch-ab b/print/tex/files/patch-ab
new file mode 100644
index 000000000000..74c33fcb5d0d
--- /dev/null
+++ b/print/tex/files/patch-ab
@@ -0,0 +1,20 @@
+--- configure.orig	Sun May 13 15:01:20 2001
++++ configure	Sun May 13 15:02:43 2001
+@@ -990,8 +990,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-
+-
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ # Check whether --with-dtl or --without-dtl was given.
+ if test "${with_dtl+set}" = set; then
+@@ -1840,6 +1839,7 @@
+ s%@LN_S@%$LN_S%g
+ s%@TEX@%$TEX%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@MAINT@%$MAINT%g
+ s%@host@%$host%g
diff --git a/print/tex/files/patch-ac b/print/tex/files/patch-ac
new file mode 100644
index 000000000000..838c6ac0d537
--- /dev/null
+++ b/print/tex/files/patch-ac
@@ -0,0 +1,20 @@
+--- kpathsea/configure.orig	Sun Mar  8 22:23:38 1998
++++ kpathsea/configure	Sun May 13 15:06:00 2001
+@@ -1227,8 +1227,7 @@
+ fi
+ done
+ 
+-
+-
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+@@ -2031,6 +2030,7 @@
+ s%@KPSEVERSION@%$KPSEVERSION%g
+ s%@CC@%$CC%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@LN_S@%$LN_S%g
+ s%@SET_MAKE@%$SET_MAKE%g
diff --git a/print/tex/files/patch-ad b/print/tex/files/patch-ad
new file mode 100644
index 000000000000..63cd126e8a0f
--- /dev/null
+++ b/print/tex/files/patch-ad
@@ -0,0 +1,20 @@
+--- web2c/configure.orig	Sun Mar  8 22:23:40 1998
++++ web2c/configure	Sun May 13 15:06:52 2001
+@@ -1272,8 +1272,7 @@
+ fi
+ done
+ 
+-
+-
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+@@ -4236,6 +4235,7 @@
+ s%@WEB2CVERSION@%$WEB2CVERSION%g
+ s%@CC@%$CC%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@LN_S@%$LN_S%g
+ s%@SET_MAKE@%$SET_MAKE%g
diff --git a/print/tex/scripts/configure b/print/tex/scripts/configure
deleted file mode 100644
index de2f9d34baae..000000000000
--- a/print/tex/scripts/configure
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-cd $WRKDIR || exit 1
-
-find . -name \*.gz |xargs gunzip -f
-
-cd $WRKSRC || exit 1;
-cat >> Makefile <<'EOF'
-default all: do-kpathsea
-	cd web2c && $(MAKE) $(makeargs) $@
-EOF
-./configure --prefix=$PREFIX
-
-cd web2c
-for i in ../../tfm/*tfm; do ln -s $i; done
-for i in ../../base/*tex; do ln -s $i; done
-for i in ../../mf/*mf; do ln -s $i; done
-for i in ../../lib/*mf; do ln -s $i; done
-cp $DISTDIR/modes.mf . || exit 1;
-
-exit 0;