From 5e6a312f4f6fe3170faba61c41cb0205d9bc316e Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Sat, 19 Jun 2004 07:03:29 +0000 Subject: [PATCH] Remove unnecessary CONFLICTS. Pointed out by: eik --- japanese/teTeX/Makefile | 2 -- print/teTeX/Makefile | 2 -- 2 files changed, 4 deletions(-) diff --git a/japanese/teTeX/Makefile b/japanese/teTeX/Makefile index 6d49ffe4a931..583b49176563 100644 --- a/japanese/teTeX/Makefile +++ b/japanese/teTeX/Makefile @@ -24,8 +24,6 @@ RUN_DEPENDS= ${TETEX_MODESW}:${PORTSDIR}/print/tex-texmflocal \ jtex:${PORTSDIR}/japanese/texfamily \ #${JTEXVF}:${PORTSDIR}/japanese/texfamily-vfn2a -CONFLICTS= dvips* xdvi* ptex-base* - TETEX_MODESW= ${LOCALBASE}/bin/tetex-modesw JTEXVF= ${LOCALBASE}/share/texmf-local/fonts/vf/n2a/dmjsy5.vf diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile index 2d0d6322c16b..90ac85243760 100644 --- a/print/teTeX/Makefile +++ b/print/teTeX/Makefile @@ -29,8 +29,6 @@ PKGDEINSTALL= ${WRKDIR}/pkg-install.sh PKGINSTALL_SUB= TETEX_MODESW=${TETEX_MODESW} \ MODE=${DEFAULT_MODE} -CONFLICTS= *-teTeX* *-dvips* *-xdvi* - # XXX: We always build in batch mode to disable OPTIONS # in print/teTeX-base. DEPENDS_ARGS+= BATCH=yes