Avoid conflicts between "teTeX-share" and "teTeX-bin" package completely

instead of trying to work arround them with "preserve" option (which
would have required some changes to the install target).

4 files changed, 11 insertions, 12 deletions

diff --git a/print/teTeX-bin/pkg/PLIST b/print/teTeX-bin/pkg/PLIST
index f0e22ffbac8..1b0c77dce94 100644
--- a/print/teTeX-bin/pkg/PLIST
+++ b/print/teTeX-bin/pkg/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 1999/08/14 18:42:09 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/08/17 21:20:41 tron Exp $
 @comment There are three files in this package that teTeX-share installs
 @comment and that teTeX-bin modifies. Take care of this:
-@option preserve
 lib/libkpathsea.a
 info/latex.info-3
 info/latex.info-2
@@ -135,10 +134,9 @@ share/texmf/web2c/elatex.efmt
 @comment also in teTeX-share; touched but unmodified: share/texmf/web2c/pdftex.pool
 @comment also in teTeX-share; touched but unmodified: share/texmf/web2c/omega.pool
 @comment also in teTeX-share; touched but unmodified: share/texmf/web2c/etex.pool
-@comment The next file needs preserving:
 share/texmf/web2c/fmtutil.cnf
+share/texmf/web2c/mktex.cnf
 @comment also in teTeX-share; touched but unmodified: share/texmf/web2c/tex.pool
-@comment The next file needs preserving:
 share/texmf/web2c/texmf.cnf
 @comment also in teTeX-share; touched but unmodified: share/texmf/web2c/mktexupd
 @comment also in teTeX-share; touched but unmodified: share/texmf/web2c/mktexnam.opt
diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index c8512f2055a..92c45ab75c7 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/08/03 14:04:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1999/08/17 21:20:40 tron Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
@@ -25,6 +25,7 @@ do-install:
 	@${ECHO} "  will take _very_ long!"
 	@${ECHO} ""
 	${MKDIR} ${PREFIX}/share/texmf
-	${GTAR} plzxCf ${PREFIX}/share/texmf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
+	${GTAR} plzxCXf ${PREFIX}/share/texmf ${FILESDIR}/exclude \
+	  ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX-share/files/exclude b/print/teTeX-share/files/exclude
new file mode 100644
index 00000000000..439c31bf5d9
--- /dev/null
+++ b/print/teTeX-share/files/exclude
@@ -0,0 +1,4 @@
+ls-R
+web2c/fmtutil.cnf
+web2c/mktex.cnf
+web2c/texmf.cnf
diff --git a/print/teTeX-share/pkg/PLIST b/print/teTeX-share/pkg/PLIST
index a7855d5b23f..d139efb2939 100644
--- a/print/teTeX-share/pkg/PLIST
+++ b/print/teTeX-share/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/08/12 21:11:29 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/08/17 21:20:40 tron Exp $
 share/texmf/xdvi/XDvi
 @dirrm share/texmf/xdvi
 share/texmf/web2c/cp8bit.tcx
@@ -16,15 +16,12 @@ share/texmf/web2c/cp1250pl.tcx
 share/texmf/web2c/cp1250cs.tcx
 share/texmf/web2c/amiga-pl.tcx
 share/texmf/web2c/pdfetex.pool
-share/texmf/web2c/mktex.cnf
 share/texmf/web2c/mp.pool
 share/texmf/web2c/mf.pool
 share/texmf/web2c/pdftex.pool
 share/texmf/web2c/omega.pool
 share/texmf/web2c/etex.pool
-share/texmf/web2c/fmtutil.cnf
 share/texmf/web2c/tex.pool
-share/texmf/web2c/texmf.cnf
 share/texmf/web2c/mktexupd
 share/texmf/web2c/mktexnam.opt
 share/texmf/web2c/mktexnam
@@ -1866,7 +1863,6 @@ share/texmf/makeindex/misc/nomencl.ist
 @dirrm share/texmf/makeindex/misc
 share/texmf/makeindex/nomencl.ist
 @dirrm share/texmf/makeindex
-share/texmf/ls-R
 share/texmf/fonts/pfm/public/xypic/xyeubt10.pfm
 share/texmf/fonts/pfm/public/xypic/xyeuat10.pfm
 share/texmf/fonts/pfm/public/xypic/xydash10.pfm
@@ -7800,4 +7796,4 @@ share/texmf/bibtex/bib/README
 @dirrm share/texmf/bibtex
 share/texmf/aliases
 share/texmf/ChangeLog
-@unexec rmdir %D/share/texmf || true
+@dirrm share/texmf