Index: /usr/ports/print/teTeX/Makefile =================================================================== --- /usr/ports/print/teTeX/Makefile (revision 311150) +++ /usr/ports/print/teTeX/Makefile (working copy) @@ -34,7 +34,8 @@ # in print/teTeX-base. DEPENDS_ARGS+= BATCH=yes -CONFLICTS= latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* +CONFLICTS= latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* \ + texlive-[0-9]* .if defined(WITH_LETTERSIZE) FLAVOR+= letter Index: /usr/ports/print/teTeX-base/Makefile =================================================================== --- /usr/ports/print/teTeX-base/Makefile (revision 311150) +++ /usr/ports/print/teTeX-base/Makefile (working copy) @@ -53,7 +53,7 @@ CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 PKGMESSAGE= ${WRKDIR}/pkg-message CONFLICTS= ja-ptex-base-[0-9]* latex2e-[0-9]* \ - tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* + tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* texlive-base-[0-9]* MAN1= tie.1 kpseaccess.1 kpsereadlink.1 mpost.1 \ dmp.1 dvicopy.1 dvilj.1 dvipdfm.1 \ Index: /usr/ports/print/teTeX-texmf/Makefile =================================================================== --- /usr/ports/print/teTeX-texmf/Makefile (revision 311150) +++ /usr/ports/print/teTeX-texmf/Makefile (working copy) @@ -24,7 +24,7 @@ ${LOCALBASE}/share/fonts/amsfonts/doc/fonts/amsfonts/00README:${PORTSDIR}/print/font-amsfonts CONFLICTS= latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* \ - ja-ptext-base-[0-9]* + ja-ptext-base-[0-9]* texlive-texmf-[0-9]* .include