- add a no_x11 flavour

- MAINTAINER is now both espie@ and avsm@
- use CONFIGURE_STYLE and remove deprecated GNU_CONFIGURE
- remove redundant FAKE=yes
- up the default limits for tex considerably.  This may be too
  much according to espie@, but we will down them later
- bump NEED_VERSION 1.218 -> 1.330
- add HOMEPAGE

ok'ed by espie@

print/teTeX/base/Makefile

@@ -1,40 +1,48 @@
 # Whom:			Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.7 2000/06/25 22:23:39 marc Exp $
+# $OpenBSD: Makefile,v 1.8 2000/09/13 14:22:08 avsm Exp $
 
 PKGNAME=	teTeX_base-1.0.7
 CATEGORIES=	print/teTeX
-NEED_VERSION=	 1.230
+NEED_VERSION= 	1.330
 DIST_SUBDIR=	teTeX
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	systems/unix/teTeX/1.0/distrib/sources
 DISTFILES=	${TETEX_SRC} 
-WRKDIST=${WRKDIR}/teTeX-1.0
+WRKDIST=	${WRKDIR}/teTeX-1.0
+
+HOMEPAGE=	http://tug.cs.umb.edu/tetex/
+MAINTAINER=	espie@openbsd.org avsm@openbsd.org
 
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
+FLAVORS= no_x11
+FLAVOR?= 
+
 TETEX_SRC=teTeX-src-1.0.7.tar.gz
 
 RUN_DEPENDS=${PREFIX}/share/texmf/ls-R::print/teTeX/texmf
-
 BUILD_DEPENDS=${PREFIX}/share/texmf/ls-R::print/teTeX/texmf
-
-LIB_DEPENDS=png.1::graphics/png \
-	Xaw3d.6.1::x11/Xaw3d
+LIB_DEPENDS= png.1::graphics/png 
 
 PNGDIR=${PREFIX}
 
-GNU_CONFIGURE=Yes
-FAKE=	Yes
-
-CONFIGURE_ARGS+=--disable-multiplatform --without-texinfo \
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS= --disable-multiplatform --without-texinfo \
 	--with-system-ncurses --with-system-zlib --with-system-pnglib \
 	--with-pnglib-libdir=${PNGDIR}/lib --with-pnglib-include=${PNGDIR}/include
 CONFIGURE_ENV=YACC=yacc
 
+.if ${FLAVOR:L:Mno_x11}
+CONFIGURE_ARGS+= --without-x11
+.else
+LIB_DEPENDS+= Xaw3d.6.1::x11/Xaw3d
+USE_X11= Yes
+.endif
+
 # TeTeX configure resists having --prefix=${DESTDIR}/usr/local, so do the
 # change after the fact.
 post-configure:
@@ -51,7 +59,7 @@ pre-fake:
 	rm ${PREFIX}/share/texmf/ls-R
 	cp ${TRUEPREFIX}/share/texmf/ls-R ${PREFIX}/share/texmf/ls-R
 
-INSTALL_INFO=	/usr/bin/install-info
+INSTALL_INFO=/usr/bin/install-info
 SEPARATE_BUILD=concurrent
 
 .include <bsd.port.mk>

print/teTeX/base/patches/patch-texk_kpathsea_texmf-in

@@ -0,0 +1,60 @@
+--- texk/kpathsea/texmf.in.orig	Sun Sep 10 23:09:28 2000
++++ texk/kpathsea/texmf.in	Sun Sep 10 23:12:54 2000
+@@ -375,8 +375,8 @@ MPXCOMMAND = makempx
+ % 
+ main_memory.context = 1100000
+ main_memory = 263000 % words of inimemory available; also applies to inimf&mp
+-extra_mem_top = 0    % extra high memory for chars, tokens, etc.
+-extra_mem_bot = 0    % extra low memory for boxes, glue, breakpoints, etc.
++extra_mem_top = 400000 % extra high memory for chars, tokens, etc.
++extra_mem_bot = 400000 % extra low memory for boxes, glue, breakpoints, etc.
+ 
+ % Words of font info for TeX (total size of all TFM files, approximately). 
+ font_mem_size = 400000
+@@ -387,22 +387,22 @@ font_max = 1000
+ % Extra space for the hash table of control sequences (which allows 10K
+ % names as distributed).
+ hash_extra.context = 25000
+-hash_extra = 0
++hash_extra = 20000
+ 
+ % Max number of characters in all strings, including all error messages,
+ % help texts, font names, control sequences.  These values apply to TeX and MP.
+ pool_size.context = 750000
+-pool_size = 125000		
++pool_size = 5000000		
+ % Minimum pool space after TeX/MP's own strings; must be at least
+ % 25000 less than pool_size, but doesn't need to be nearly that large.
+ string_vacancies.context = 45000
+-string_vacancies = 25000
++string_vacancies = 45000
+ % Maximum number of strings.
+ max_strings.context = 55000
+-max_strings = 15000
++max_strings = 55000
+ % min pool space left after loading .fmt
+ pool_free.context = 47500
+-pool_free = 5000
++pool_free = 47500
+ 
+ % Hyphenation trie. As distributed, the maximum is 65535; this should
+ % work unless `unsigned short' is not supported or is smaller than 16
+@@ -426,14 +426,14 @@ buf_size = 50000
+ 
+ hyph_size = 1000        % number of hyphenation exceptions, >610 and <32767.
+ nest_size.context = 500
+-nest_size = 100		% simultaneous semantic levels (e.g., groups)
++nest_size = 500		% simultaneous semantic levels (e.g., groups)
+ max_in_open = 15	% simultaneous input files and error insertions
+ param_size.context = 1500
+-param_size = 500	% simultaneous macro parameters
++param_size = 1500	% simultaneous macro parameters
+ save_size.context = 5000
+-save_size = 4000	% for saving values outside current group
++save_size = 5000	% for saving values outside current group
+ stack_size.context = 1500
+-stack_size = 300	% simultaneous input sources
++stack_size = 15000	% simultaneous input sources
+ 
+ % These are Omega-specific.
+ ocp_buf_size = 20000	% character buffers for ocp filters.

print/teTeX/base/pkg/PFRAG.no-no_x11

@@ -0,0 +1,6 @@
+@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2000/09/13 14:22:09 avsm Exp $
+bin/oxdvi
+bin/oxdvi.bin
+bin/xdvi
+bin/xdvi.bin
+man/man1/xdvi.1

print/teTeX/base/pkg/PLIST

@@ -76,8 +76,6 @@ bin/otp2ocp
 bin/outocp
 bin/ovf2ovp
 bin/ovp2ovf
-bin/oxdvi
-bin/oxdvi.bin
 bin/patgen
 bin/pdfeinitex
 bin/pdfelatex
@@ -122,8 +120,6 @@ bin/viromega
 bin/virtex
 bin/vptovf
 bin/weave
-bin/xdvi
-bin/xdvi.bin
 include/kpathsea/absolute.h
 include/kpathsea/c-auto.h
 include/kpathsea/c-ctype.h
@@ -269,7 +265,7 @@ man/man1/viromega.1
 man/man1/virtex.1
 man/man1/vptovf.1
 man/man1/weave.1
-man/man1/xdvi.1
+!%%no_x11%%
 @comment share/texmf/dvips/base/color.pro
 @comment share/texmf/dvips/base/crop.pro
 @comment share/texmf/dvips/base/finclude.pro

print/teTeX/texmf/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2000/06/16 23:06:10 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2000/09/13 14:22:09 avsm Exp $
 # Original from: Marc Espie
 
 PKGNAME=	teTeX_texmf-1.0.2
@@ -9,7 +9,10 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 
 CATEGORIES=	print/teTeX
-NEED_VERSION=	1.218
+NEED_VERSION=	1.330
+
+HOMEPAGE=	http://tug.cs.umb.edu/tetex/
+MAINTAINER=	espie@openbsd.org avsm@openbsd.org
 
 DIST_SUBDIR=	teTeX
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}