Fix for NetBSD:

 - don't build/install the texinfo that comes with teTeX
 - display comment to run texconfig also when installing pachage
   (via INSTALL file)

5 files changed, 46 insertions, 44 deletions

diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index fbad357e630..86a1f411e03 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -3,11 +3,12 @@
 # Date created:		5 December 1996
 # Whom:			Bernd Rosauer <br@schiele-ct.de>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/23 16:20:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1997/11/23 16:28:14 hubertf Exp $
+# FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
 DISTNAME=	teTeX-src-0.4
-PKGNAME=	teTeX-0.4
+PKGNAME=	teTeX-0.4pl8
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	systems/unix/teTeX/distrib/sources
@@ -15,6 +16,9 @@ DISTFILES=	${TETEX_SRC} ${TETEX_LIB}
 
 MAINTAINER=	br@schiele-ct.de
 
+BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
+RUN_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
+
 DIST_SUBDIR=	teTeX
 PATCH_DIST_STRIP=	-p1
 NO_CONFIGURE=	yes
@@ -34,7 +38,7 @@ MAN1=		afm2tfm.1 allcm.1 alldc.1 allneeded.1 amslatex.1 \
 TETEX_SRC=	teTeX-src-0.4pl7.tar.gz
 TETEX_LIB=	teTeX-lib-0.4pl8.tar.gz
 WRKLIB=		${WRKDIR}/teTeX
-INSTALL_INFO=	/usr/bin/install-info
+INSTALL_INFO=	${PREFIX}/bin/install-info
 
 pre-install:
 	@${RM} -f ${PREFIX}/share/texmf/ls-R
@@ -51,6 +55,8 @@ post-install:
 	${INSTALL_INFO} ${PREFIX}/info/kpathsea.info ${PREFIX}/info/dir
 	${INSTALL_INFO} ${PREFIX}/info/dvips.info ${PREFIX}/info/dir
 	${INSTALL_INFO} ${PREFIX}/info/fontname.info ${PREFIX}/info/dir
-	@${SETENV} PREFIX=${PREFIX} ${SH} files/install-note
+	@find ${PREFIX}/share/texmf/fonts/{pk,tfm} -type d -print | \
+		xargs chmod 1777
+	@${SETENV} PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL
 
 .include <bsd.port.mk>
diff --git a/print/teTeX/files/install-note b/print/teTeX/files/install-note
deleted file mode 100755
index 9a2ff0e893b..00000000000
--- a/print/teTeX/files/install-note
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-TEXMF=$PREFIX/share/texmf
-
-cat <<EOT
---------------------------------------------------------
-Final touch:
-
-1. Run $PREFIX/bin/texconfig
-   to adjust for your local environment.
-2. Chmod 1777 $TEXMF/fonts/{pk,tfm}
-   and all subdirectories if you did not configure
-   font generation to use a temporary directory.
-3. For further information have a look at
-   $TEXMF/doc/tetex/.
---------------------------------------------------------
-
-EOT
-
-exit 0
diff --git a/print/teTeX/patches/patch-aa b/print/teTeX/patches/patch-aa
index 0ad2c11f6a1..80779955374 100644
--- a/print/teTeX/patches/patch-aa
+++ b/print/teTeX/patches/patch-aa
@@ -1,5 +1,5 @@
 --- Makefile.orig	Fri Feb 14 11:58:11 1997
-+++ Makefile	Thu May  1 10:27:20 1997
++++ Makefile	Sun Nov 23 13:48:36 1997
 @@ -8,10 +8,10 @@
  #=========================================================================
  VERSION = 0.4
@@ -51,7 +51,7 @@
  
  # change the true/false definition of FOIL, if you get an error with wchar_t
  FOIL		= false
-@@ -111,9 +111,9 @@
+@@ -111,17 +111,17 @@
  platform	= $(shell ./config.guess | sed 's/-.*-/-/')
  CWD		:= $(shell pwd)
  INSTALL		= $(CWD)/$(KPSEDIR)/bin/install -c
@@ -63,7 +63,18 @@
 +override TEXMF	= $(PREFIX)/share/texmf
  override PATH	:= $(bindir):$(CWD)/bin-extra:$(CWD)/$(KPSEDIR)/bin:$(PATH)
  
- CONFDIRS   = $(KPSEDIR) $(TEXIDIR)
+-CONFDIRS   = $(KPSEDIR) $(TEXIDIR)
++CONFDIRS   = $(KPSEDIR)
+ ifeq ($(USE_DIALOG),true)
+-SUBDIRS    = $(TEXIDIR) $(MKINDEXDIR) $(KPSEDIR) $(DIALOGDIR) bin-extra
++SUBDIRS    = $(MKINDEXDIR) $(KPSEDIR) $(DIALOGDIR) bin-extra
+ CONFDIRS   += $(DIALOGDIR)
+ else
+-SUBDIRS    = $(TEXIDIR) $(MKINDEXDIR) $(KPSEDIR) bin-extra
++SUBDIRS    = $(MKINDEXDIR) $(KPSEDIR) bin-extra
+ override USE_NCURSES = no
+ endif
+ 
 @@ -205,7 +205,6 @@
  	for i in $(SUBDIRS); do \
  	  (set -x; cd $$i; $(MAKE) $(PASSENV) $@ || exit 1); \
diff --git a/print/teTeX/pkg/INSTALL b/print/teTeX/pkg/INSTALL
new file mode 100755
index 00000000000..e1ba10e613f
--- /dev/null
+++ b/print/teTeX/pkg/INSTALL
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+if [ "$PREFIX" = "" ]
+then
+	PREFIX=/usr/pkg
+fi
+
+TEXMF=$PREFIX/share/texmf
+
+
+cat <<EOT
+---------------------------------------------------------------------------
+You may consider running $PREFIX/bin/texconfig to adjust for your
+local environment, e.g. configure font generation to use a temporary
+directory.
+
+For further information have a look at $TEXMF/doc/tetex/.
+---------------------------------------------------------------------------
+
+EOT
+
+exit 0
diff --git a/print/teTeX/pkg/PLIST b/print/teTeX/pkg/PLIST
index 2df202fbff6..84c7902c9a3 100644
--- a/print/teTeX/pkg/PLIST
+++ b/print/teTeX/pkg/PLIST
@@ -1,8 +1,5 @@
 bin/MakeTeXMF
-bin/makeinfo
-bin/texindex
 bin/pslatex
-bin/install-info
 bin/makeindex.bin
 bin/kpsetool
 bin/makeindex
@@ -50,7 +47,6 @@ bin/tangle
 bin/weave
 bin/pooltype
 bin/xdvi
-bin/texi2dvi
 bin/texhash
 bin/texconfig
 bin/ps2frag
@@ -91,27 +87,14 @@ info/kpathsea.info-3
 info/kpathsea.info
 info/latex-1
 info/makeinfo.info
-info/texinfo-10
-info/texinfo-2
-info/texinfo-3
-info/texinfo-4
-info/texinfo-5
-info/texinfo-6
-info/texinfo-7
-info/texinfo-8
-info/texinfo-9
-info/texinfo
 info/latex-3
 info/latex
-info/texinfo-1
-info/texinfo-11
 info/fontname.info-5
 info/fontname.info
 info/latex-2
 info/dvips.info-1
 info/fontname.info-4
 info/kpathsea.info-1
-info/texinfo-12
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/latex %D/info/dir
 @exec install-info %D/info/kpathsea.info %D/info/dir