From eb930beeb3a3b2a6e9255cccfdb8fcb52eab7228 Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 30 Apr 2015 07:23:54 +0000 Subject: [PATCH] Note conflict with teTeX3-texmf. --- fonts/tex-fontinst-doc/Makefile | 4 +++- fonts/tex-fontinst/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fonts/tex-fontinst-doc/Makefile b/fonts/tex-fontinst-doc/Makefile index ab5adbbf3681..4c3ebe2d26af 100644 --- a/fonts/tex-fontinst-doc/Makefile +++ b/fonts/tex-fontinst-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/11/18 19:03:29 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2015/04/30 07:23:54 markd Exp $ DISTNAME= fontinst.doc PKGNAME= tex-${DISTNAME:S/./-/}-1.933 @@ -8,5 +8,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Documentation for tex-fontinst LICENSE= lppl-1.3c +CONFLICTS+= teTeX-texmf<=3.0nb45 + .include "../../print/texlive/package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/tex-fontinst/Makefile b/fonts/tex-fontinst/Makefile index b73444f36e7f..5372b9ac954a 100644 --- a/fonts/tex-fontinst/Makefile +++ b/fonts/tex-fontinst/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/11/18 19:02:57 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2015/04/30 07:23:54 markd Exp $ DISTNAME= fontinst PKGNAME= tex-${DISTNAME}-1.933 @@ -8,6 +8,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Help with installing fonts for TeX and LaTeX LICENSE= lppl-1.3c +CONFLICTS+= teTeX-texmf<=3.0nb45 + USE_TOOLS+= sh:run REPLACE_SH= bin/fontinst