From owner-svn-ports-all@FreeBSD.ORG  Sat Aug 30 08:31:42 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 07ADA24B;
 Sat, 30 Aug 2014 08:31:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E7A921E14;
 Sat, 30 Aug 2014 08:31:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7U8VfOT098201;
 Sat, 30 Aug 2014 08:31:41 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7U8Vfdv098200;
 Sat, 30 Aug 2014 08:31:41 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201408300831.s7U8Vfdv098200@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 30 Aug 2014 08:31:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r366596 - head/japanese/dvi2tty
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Aug 2014 08:31:42 -0000

Author: hrs
Date: Sat Aug 30 08:31:41 2014
New Revision: 366596
URL: http://svnweb.freebsd.org/changeset/ports/366596
QAT: https://qat.redports.org/buildarchive/r366596/

Log:
  Fix filename conflict with dvi2tty installed by TeXLive.
  
  PR:	193140

Modified:
  head/japanese/dvi2tty/Makefile

Modified: head/japanese/dvi2tty/Makefile
==============================================================================
--- head/japanese/dvi2tty/Makefile	Sat Aug 30 08:13:55 2014	(r366595)
+++ head/japanese/dvi2tty/Makefile	Sat Aug 30 08:31:41 2014	(r366596)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dvi2tty
 PORTVERSION=	5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
 MASTER_SITES=	LOCAL
 MASTER_SITE_SUBDIR=	hrs
@@ -20,18 +20,13 @@ COMMENT=	Character-based DVI file previe
 
 RUN_DEPENDS=	jless:${PORTSDIR}/japanese/less
 
-CONFLICTS=	dvi2tty-[0-9]*
-
 PLIST_FILES=	bin/jdvi2tty \
-		bin/dvi2tty \
-		bin/disdvi \
-		man/man1/dvi2tty.1.gz \
+		bin/jdisdvi \
 		man/man1/jdvi2tty.1.gz
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} jdvi2tty disdvi ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 ${STAGEDIR}${PREFIX}/man/man1
-	${LN} -sf ${PREFIX}/bin/jdvi2tty ${STAGEDIR}${PREFIX}/bin/dvi2tty
-	${LN} -sf dvi2tty.1.gz ${STAGEDIR}${PREFIX}/man/man1/jdvi2tty.1.gz
+	${INSTALL_PROGRAM} ${WRKSRC}/jdvi2tty ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/disdvi ${STAGEDIR}${PREFIX}/bin/jdisdvi
+	${INSTALL_MAN} ${WRKSRC}/dvi2tty.1 ${STAGEDIR}${PREFIX}/man/man1/jdvi2tty.1
 
 .include <bsd.port.mk>