diff options
| author | scheidell <scheidell@FreeBSD.org> | 2012-08-03 17:25:57 +0800 |
|---|---|---|
| committer | scheidell <scheidell@FreeBSD.org> | 2012-08-03 17:25:57 +0800 |
| commit | 0881d2fb3d410650c5f698ef4118ab6e66a30106 (patch) | |
| tree | 49f62eecb3b74c9a225ed9d39d96b69ef491ff5d | |
| parent | 017668bebf98d9e1ff971596cb798ccd5292816c (diff) | |
| download | freebsd-ports-gnome-0881d2fb3d410650c5f698ef4118ab6e66a30106.tar.gz freebsd-ports-gnome-0881d2fb3d410650c5f698ef4118ab6e66a30106.tar.zst freebsd-ports-gnome-0881d2fb3d410650c5f698ef4118ab6e66a30106.zip | |
- Fix conflicts
PR: ports/170274
Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
| -rw-r--r-- | japanese/dvi2tty/Makefile | 2 | ||||
| -rw-r--r-- | print/dvi2tty/Makefile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/japanese/dvi2tty/Makefile b/japanese/dvi2tty/Makefile index dac25c8ff960..e75c36a48895 100644 --- a/japanese/dvi2tty/Makefile +++ b/japanese/dvi2tty/Makefile @@ -23,6 +23,8 @@ COMMENT= Character-based DVI file previewer RUN_DEPENDS= jless:${PORTSDIR}/japanese/less +CONFLICTS= dvi2tty-[0-9]* + PLIST_FILES= bin/jdvi2tty bin/dvi2tty bin/disdvi MAN1= dvi2tty.1 diff --git a/print/dvi2tty/Makefile b/print/dvi2tty/Makefile index 7cbfe81deae6..4938f7155546 100644 --- a/print/dvi2tty/Makefile +++ b/print/dvi2tty/Makefile @@ -14,6 +14,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A dvi-file previewer for text only devices +CONFLICTS= ja-dvi2tty-[0-9]* + MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${STRIP}" MAN1= disdvi.1 dvi2tty.1 |