svn commit: r301945 - in head: japanese/dvi2tty print/dvi2tty

[Michael Scheidell]

Author: scheidell
Date: Fri Aug  3 09:25:57 2012
New Revision: 301945
URL: http://svn.freebsd.org/changeset/ports/301945

Log:
  - Fix conflicts
  
  PR:		ports/170274
  Submitted by:	Tsurutani Naoki <turutani at scphys.kyoto-u.ac.jp>

Modified:
  head/japanese/dvi2tty/Makefile
  head/print/dvi2tty/Makefile

Modified: head/japanese/dvi2tty/Makefile
==============================================================================
--- head/japanese/dvi2tty/Makefile	Fri Aug  3 09:20:39 2012	(r301944)
+++ head/japanese/dvi2tty/Makefile	Fri Aug  3 09:25:57 2012	(r301945)
@@ -23,6 +23,8 @@ COMMENT=	Character-based DVI file previe
 
 RUN_DEPENDS=	jless:${PORTSDIR}/japanese/less
 
+CONFLICTS=	dvi2tty-[0-9]*
+
 PLIST_FILES=	bin/jdvi2tty bin/dvi2tty bin/disdvi
 
 MAN1=		dvi2tty.1

Modified: head/print/dvi2tty/Makefile
==============================================================================
--- head/print/dvi2tty/Makefile	Fri Aug  3 09:20:39 2012	(r301944)
+++ head/print/dvi2tty/Makefile	Fri Aug  3 09:25:57 2012	(r301945)
@@ -14,6 +14,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports at 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