diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2004-06-19 07:03:29 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2004-06-19 07:03:29 +0000 |
| commit | 5e6a312f4f6fe3170faba61c41cb0205d9bc316e (patch) | |
| tree | 5ea9b7944fe705de380d36c9ab1a40b5a6b9bfcb | |
| parent | Fix pkg-plist which was broken by the recent print/teTeX change. (diff) | |
Remove unnecessary CONFLICTS.
Pointed out by: eik
Notes
Notes:
svn path=/head/; revision=111791
| -rw-r--r-- | japanese/teTeX/Makefile | 2 | ||||
| -rw-r--r-- | print/teTeX/Makefile | 2 |
2 files changed, 0 insertions, 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 |