diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index 493249582052..288f01f80d6f 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -7,18 +7,24 @@
 
 PORTNAME=	teTeX
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/1.0/distrib/sources/ \
 		${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	systems/unix/teTeX/1.0/distrib/sources/
 DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF}
 
-MAINTAINER=	br@netland.inka.de
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww
 
+.if !defined(WITHOUT_X11)
 USE_XLIB=	yes
+PLIST_SUB+=	X11BITS=""
+.else
+PLIST_SUB+=	X11BITS="@comment "
+.endif
 DIST_SUBDIR=	teTeX
 WRKSRC=		${WRKDIR}/teTeX-1.0
 EXTRACT_ONLY=	${TETEX_SRC}
@@ -32,6 +38,9 @@ CONFIGURE_ARGS=	--disable-multiplatform \
 		--with-system-pnglib --with-pnglib-libdir=${LIBPNG_PREFIX}/lib \
 		--with-pnglib-include=${LIBPNG_PREFIX}/include
 CONFIGURE_ENV=	INSTALL_PROGRAM="${BSD_INSTALL_SCRIPT}"
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--without-x11 --without-oxdvik --without-xdvik
+.endif
 INSTALL_TARGET=	install strip
 NOMANCOMPRESS=	yes
 NOMAN1=		MakeTeXPK.1 access.1 afm2tfm.1 allcm.1 allec.1 allneeded.1 \
@@ -46,7 +55,11 @@ NOMAN1=		MakeTeXPK.1 access.1 afm2tfm.1 allcm.1 allec.1 allneeded.1 \
 		pktogf.1 pktype.1 pltotf.1 pooltype.1 ps2frag.1 ps2pk.1 \
 		readlink.1 tangle.1 tex.1 texconfig.1 texhash.1 texi2html.1 \
 		tftopl.1 tie.1 vftovp.1 virmf.1 virmpost.1 viromega.1 \
-		virtex.1 vptovf.1 weave.1 xdvi.1
+		virtex.1 vptovf.1 weave.1
+
+.if !defined(WITHOUT_X11)
+NOMAN1+=	xdvi.1
+.endif
 
 TETEX_SRC=	teTeX-src-1.0.7.tar.gz
 TETEX_TEXMF=	teTeX-texmf-1.0.2.tar.gz
diff --git a/print/teTeX-base/pkg-plist b/print/teTeX-base/pkg-plist
index 73af60dba4b1..9881f37a3235 100644
--- a/print/teTeX-base/pkg-plist
+++ b/print/teTeX-base/pkg-plist
@@ -71,8 +71,8 @@ bin/otp2ocp
 bin/outocp
 bin/ovf2ovp
 bin/ovp2ovf
-bin/oxdvi
-bin/oxdvi.bin
+%%X11BITS%%bin/oxdvi
+%%X11BITS%%bin/oxdvi.bin
 bin/patgen
 bin/pdfeinitex
 bin/pdfelatex
@@ -117,8 +117,8 @@ bin/viromega
 bin/virtex
 bin/vptovf
 bin/weave
-bin/xdvi
-bin/xdvi.bin
+%%X11BITS%%bin/xdvi
+%%X11BITS%%bin/xdvi.bin
 include/kpathsea/absolute.h
 include/kpathsea/c-auto.h
 include/kpathsea/c-ctype.h
@@ -271,7 +271,7 @@ man/man1/viromega.1
 man/man1/virtex.1
 man/man1/vptovf.1
 man/man1/weave.1
-man/man1/xdvi.1
+%%X11BITS%%man/man1/xdvi.1
 share/texmf/ChangeLog
 share/texmf/aliases
 share/texmf/bibtex/bib/README
@@ -1577,8 +1577,8 @@ share/texmf/doc/help/Catalogue/entries/wsuipa.html
 share/texmf/doc/help/Catalogue/entries/wtex95.html
 share/texmf/doc/help/Catalogue/entries/xarticle.html
 share/texmf/doc/help/Catalogue/entries/xcomment.html
-share/texmf/doc/help/Catalogue/entries/xdvi.html
-share/texmf/doc/help/Catalogue/entries/xdvik.html
+%%X11BITS%%share/texmf/doc/help/Catalogue/entries/xdvi.html
+%%X11BITS%%share/texmf/doc/help/Catalogue/entries/xdvik.html
 share/texmf/doc/help/Catalogue/entries/xfig.html
 share/texmf/doc/help/Catalogue/entries/xmltex.html
 share/texmf/doc/help/Catalogue/entries/xr.html
@@ -7706,7 +7706,7 @@ share/texmf/tex/generic/xypic/xytp-f.tex
 share/texmf/tex/generic/xypic/xytpic.tex
 share/texmf/tex/generic/xypic/xyv2.tex
 share/texmf/tex/generic/xypic/xyweb.tex
-share/texmf/tex/generic/xypic/xyxdvi.tex
+%%X11BITS%%share/texmf/tex/generic/xypic/xyxdvi.tex
 share/texmf/tex/latex/ae/ae.sty
 share/texmf/tex/latex/ae/aecompl.sty
 share/texmf/tex/latex/ae/omlaer.fd
@@ -8763,9 +8763,9 @@ share/texmf/web2c/tex.fmt
 share/texmf/web2c/tex.log
 share/texmf/web2c/tex.pool
 share/texmf/web2c/texmf.cnf
-share/texmf/xdvi/XDvi
+%%X11BITS%%share/texmf/xdvi/XDvi
 @exec mkdir %D/share/texmf/fonts/source/public/cs
-@dirrm share/texmf/xdvi
+%%X11BITS%%@dirrm share/texmf/xdvi
 @dirrm share/texmf/web2c
 @dirrm share/texmf/texconfig/x
 @dirrm share/texmf/texconfig/v
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 493249582052..288f01f80d6f 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -7,18 +7,24 @@
 
 PORTNAME=	teTeX
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/1.0/distrib/sources/ \
 		${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	systems/unix/teTeX/1.0/distrib/sources/
 DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF}
 
-MAINTAINER=	br@netland.inka.de
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww
 
+.if !defined(WITHOUT_X11)
 USE_XLIB=	yes
+PLIST_SUB+=	X11BITS=""
+.else
+PLIST_SUB+=	X11BITS="@comment "
+.endif
 DIST_SUBDIR=	teTeX
 WRKSRC=		${WRKDIR}/teTeX-1.0
 EXTRACT_ONLY=	${TETEX_SRC}
@@ -32,6 +38,9 @@ CONFIGURE_ARGS=	--disable-multiplatform \
 		--with-system-pnglib --with-pnglib-libdir=${LIBPNG_PREFIX}/lib \
 		--with-pnglib-include=${LIBPNG_PREFIX}/include
 CONFIGURE_ENV=	INSTALL_PROGRAM="${BSD_INSTALL_SCRIPT}"
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--without-x11 --without-oxdvik --without-xdvik
+.endif
 INSTALL_TARGET=	install strip
 NOMANCOMPRESS=	yes
 NOMAN1=		MakeTeXPK.1 access.1 afm2tfm.1 allcm.1 allec.1 allneeded.1 \
@@ -46,7 +55,11 @@ NOMAN1=		MakeTeXPK.1 access.1 afm2tfm.1 allcm.1 allec.1 allneeded.1 \
 		pktogf.1 pktype.1 pltotf.1 pooltype.1 ps2frag.1 ps2pk.1 \
 		readlink.1 tangle.1 tex.1 texconfig.1 texhash.1 texi2html.1 \
 		tftopl.1 tie.1 vftovp.1 virmf.1 virmpost.1 viromega.1 \
-		virtex.1 vptovf.1 weave.1 xdvi.1
+		virtex.1 vptovf.1 weave.1
+
+.if !defined(WITHOUT_X11)
+NOMAN1+=	xdvi.1
+.endif
 
 TETEX_SRC=	teTeX-src-1.0.7.tar.gz
 TETEX_TEXMF=	teTeX-texmf-1.0.2.tar.gz
diff --git a/print/teTeX/pkg-plist b/print/teTeX/pkg-plist
index 73af60dba4b1..9881f37a3235 100644
--- a/print/teTeX/pkg-plist
+++ b/print/teTeX/pkg-plist
@@ -71,8 +71,8 @@ bin/otp2ocp
 bin/outocp
 bin/ovf2ovp
 bin/ovp2ovf
-bin/oxdvi
-bin/oxdvi.bin
+%%X11BITS%%bin/oxdvi
+%%X11BITS%%bin/oxdvi.bin
 bin/patgen
 bin/pdfeinitex
 bin/pdfelatex
@@ -117,8 +117,8 @@ bin/viromega
 bin/virtex
 bin/vptovf
 bin/weave
-bin/xdvi
-bin/xdvi.bin
+%%X11BITS%%bin/xdvi
+%%X11BITS%%bin/xdvi.bin
 include/kpathsea/absolute.h
 include/kpathsea/c-auto.h
 include/kpathsea/c-ctype.h
@@ -271,7 +271,7 @@ man/man1/viromega.1
 man/man1/virtex.1
 man/man1/vptovf.1
 man/man1/weave.1
-man/man1/xdvi.1
+%%X11BITS%%man/man1/xdvi.1
 share/texmf/ChangeLog
 share/texmf/aliases
 share/texmf/bibtex/bib/README
@@ -1577,8 +1577,8 @@ share/texmf/doc/help/Catalogue/entries/wsuipa.html
 share/texmf/doc/help/Catalogue/entries/wtex95.html
 share/texmf/doc/help/Catalogue/entries/xarticle.html
 share/texmf/doc/help/Catalogue/entries/xcomment.html
-share/texmf/doc/help/Catalogue/entries/xdvi.html
-share/texmf/doc/help/Catalogue/entries/xdvik.html
+%%X11BITS%%share/texmf/doc/help/Catalogue/entries/xdvi.html
+%%X11BITS%%share/texmf/doc/help/Catalogue/entries/xdvik.html
 share/texmf/doc/help/Catalogue/entries/xfig.html
 share/texmf/doc/help/Catalogue/entries/xmltex.html
 share/texmf/doc/help/Catalogue/entries/xr.html
@@ -7706,7 +7706,7 @@ share/texmf/tex/generic/xypic/xytp-f.tex
 share/texmf/tex/generic/xypic/xytpic.tex
 share/texmf/tex/generic/xypic/xyv2.tex
 share/texmf/tex/generic/xypic/xyweb.tex
-share/texmf/tex/generic/xypic/xyxdvi.tex
+%%X11BITS%%share/texmf/tex/generic/xypic/xyxdvi.tex
 share/texmf/tex/latex/ae/ae.sty
 share/texmf/tex/latex/ae/aecompl.sty
 share/texmf/tex/latex/ae/omlaer.fd
@@ -8763,9 +8763,9 @@ share/texmf/web2c/tex.fmt
 share/texmf/web2c/tex.log
 share/texmf/web2c/tex.pool
 share/texmf/web2c/texmf.cnf
-share/texmf/xdvi/XDvi
+%%X11BITS%%share/texmf/xdvi/XDvi
 @exec mkdir %D/share/texmf/fonts/source/public/cs
-@dirrm share/texmf/xdvi
+%%X11BITS%%@dirrm share/texmf/xdvi
 @dirrm share/texmf/web2c
 @dirrm share/texmf/texconfig/x
 @dirrm share/texmf/texconfig/v