summaryrefslogtreecommitdiff
path: root/converters/unix2dos
diff options
context:
space:
mode:
authorryoon <ryoon>2012-04-11 17:48:54 +0000
committerryoon <ryoon>2012-04-11 17:48:54 +0000
commit390c0e5e4d1bf6f36688226362bf64bb4847eb19 (patch)
treedd99ef01e3e3ec4801f817dc99d9c0d44ea07db4 /converters/unix2dos
parentc0b488759b989b34c662811ad81a402a6eb31478 (diff)
downloadpkgsrc-390c0e5e4d1bf6f36688226362bf64bb4847eb19.tar.gz
Conflict with dos2unix.
Diffstat (limited to 'converters/unix2dos')
-rw-r--r--converters/unix2dos/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/converters/unix2dos/Makefile b/converters/unix2dos/Makefile
index b501a76008f..132de71ecf0 100644
--- a/converters/unix2dos/Makefile
+++ b/converters/unix2dos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2010/02/26 10:28:31 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2012/04/11 17:48:54 ryoon Exp $
DISTNAME= unix2dos-1.3
CATEGORIES= converters
@@ -9,6 +9,8 @@ COMMENT= Translate ASCII files to/from DOS (cr/lf) and UNIX (lf)
PKG_DESTDIR_SUPPORT= user-destdir
+CONFLICTS= dos2unix-[0-9]*
+
WRKSRC= ${WRKDIR}
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1