Update to 6.0.4

Changelog:
2013-12-30: Version 6.0.4

  * New options -ul and -ub to convert UTF-16 files without BOM.
  * New Russian translation of the messages.
  * Build 32 bit Windows binaries with Large File Support (LFS)
    by using mingw-w64 for 32 bit Windows.
  * When a binary symbol is encountered the value is printed.

4 files changed, 39 insertions, 16 deletions

diff --git a/converters/dos2unix/Makefile b/converters/dos2unix/Makefile
index 1b4aaf872cb..f529b312193 100644
--- a/converters/dos2unix/Makefile
+++ b/converters/dos2unix/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2013/05/31 12:39:43 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/01/08 15:14:03 ryoon Exp $
 #
 
-DISTNAME=	dos2unix-6.0.3
-PKGREVISION=	1
+DISTNAME=	dos2unix-6.0.4
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dos2unix/}
 
diff --git a/converters/dos2unix/PLIST b/converters/dos2unix/PLIST
index fe2c372fc68..77f80819836 100644
--- a/converters/dos2unix/PLIST
+++ b/converters/dos2unix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/04/11 17:45:39 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/01/08 15:14:03 ryoon Exp $
 bin/dos2unix
 bin/mac2unix
 bin/unix2dos
@@ -18,6 +18,7 @@ man/nl/man1/unix2mac.1
 share/doc/${PKGNAME}/BUGS.txt
 share/doc/${PKGNAME}/COPYING.txt
 share/doc/${PKGNAME}/ChangeLog.txt
+share/doc/${PKGNAME}/INSTALL.txt
 share/doc/${PKGNAME}/NEWS.txt
 share/doc/${PKGNAME}/README.txt
 share/doc/${PKGNAME}/TODO.txt
@@ -27,3 +28,4 @@ share/locale/de/LC_MESSAGES/dos2unix.mo
 share/locale/eo/LC_MESSAGES/dos2unix.mo
 share/locale/es/LC_MESSAGES/dos2unix.mo
 share/locale/nl/LC_MESSAGES/dos2unix.mo
+share/locale/ru/LC_MESSAGES/dos2unix.mo
diff --git a/converters/dos2unix/distinfo b/converters/dos2unix/distinfo
index 6ca062e2aa1..678ab3bcbc0 100644
--- a/converters/dos2unix/distinfo
+++ b/converters/dos2unix/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2013/01/26 22:28:06 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2014/01/08 15:14:03 ryoon Exp $
 
-SHA1 (dos2unix-6.0.3.tar.gz) = 2c9ae9177fcb0d8b63d141f73a75c928c38ace01
-RMD160 (dos2unix-6.0.3.tar.gz) = c21dc47b7f1e4adb11705f884ac18a2ead018ad9
-Size (dos2unix-6.0.3.tar.gz) = 77227 bytes
-SHA1 (patch-Makefile) = cf13e5b8dbe9d0b5d1a1ce024697d0970806df1e
+SHA1 (dos2unix-6.0.4.tar.gz) = 93d73148c09908a42dcbf5339312c9aa1f18ba7c
+RMD160 (dos2unix-6.0.4.tar.gz) = 8fa972e309b1de1228b09e247d4b110122757512
+Size (dos2unix-6.0.4.tar.gz) = 84848 bytes
+SHA1 (patch-Makefile) = a6b9d829af0d54c8c9d58814171e5890459a181e
diff --git a/converters/dos2unix/patches/patch-Makefile b/converters/dos2unix/patches/patch-Makefile
index 620ae121a52..c324db94205 100644
--- a/converters/dos2unix/patches/patch-Makefile
+++ b/converters/dos2unix/patches/patch-Makefile
@@ -1,11 +1,20 @@
-$NetBSD: patch-Makefile,v 1.1.1.1 2012/04/11 17:45:39 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.2 2014/01/08 15:14:03 ryoon Exp $
 
 * install man pages to ${PREFIX}/man
 * do not generate ps, pdf, and html documents
 
---- Makefile.orig	2012-03-10 08:04:59.000000000 +0000
+--- Makefile.orig	2013-11-26 22:56:57.000000000 +0000
 +++ Makefile
-@@ -70,7 +70,7 @@ datadir		= $(datarootdir)
+@@ -35,7 +35,7 @@
+ 
+ include version.mk
+ 
+-.PHONY: man txt html pdf mofiles tags merge
++.PHONY: man txt html pdf mofiles tags merge
+ 
+ CC		?= gcc
+ CPP		?= cpp
+@@ -80,7 +80,7 @@ datadir		= $(datarootdir)
  docsubdir	= $(PACKAGE)-$(DOS2UNIX_VERSION)
  docdir		= $(datarootdir)/doc/$(docsubdir)
  localedir	= $(datarootdir)/locale
@@ -14,7 +23,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/04/11 17:45:39 ryoon Exp $
  man1dir		= $(mandir)/man1
  manext		= .1
  man1ext		= .1
-@@ -321,11 +321,11 @@ else
+@@ -465,11 +465,11 @@ else
  	cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1
  	cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1
  endif
@@ -28,6 +37,19 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2012/04/11 17:45:39 ryoon Exp $
 +	$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(prefix)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1 ;)
 +	$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(prefix)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1 ;)
 +	$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(prefix)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1 ;)
- ifdef ENABLE_NLS
- 	@echo "-- install-mo"
- 	$(foreach mofile, $(MOFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES ;)
+ 	$(foreach manfile, $(MANFILES_NONLATIN), $(MKDIR) -p -m 755 $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(dir $(manfile))) ;)
+ 	$(foreach manfile, $(MANFILES_NONLATIN), $(INSTALL) -m 644 $(manfile) $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(dir $(manfile))) ;)
+ 	$(foreach manfile, $(MANFILES_NONLATIN), cd $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(dir $(manfile))) ; $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1 ;)
+@@ -494,12 +494,6 @@ install-doc: $(INSTALL_OBJS_DOC)
+ 	$(foreach txtfile, $(wildcard man/*/man1/*.txt), $(INSTALL) -m 644 $(txtfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;)
+ 	$(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;)
+ 	$(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(INSTALL) -m 644 $(htmlfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;)
+-	$(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;)
+-	$(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(INSTALL) -m 644 $(pdffile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;)
+-	$(foreach pdffile, $(wildcard man/man1/*.pdf), $(INSTALL) -m 644 $(pdffile) $(DESTDIR)$(docdir) ;)
+-	$(foreach psfile, $(wildcard man/*/man1/*.ps), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;)
+-	$(foreach psfile, $(wildcard man/*/man1/*.ps), $(INSTALL) -m 644 $(psfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;)
+-	$(foreach psfile, $(wildcard man/man1/*.ps), $(INSTALL) -m 644 $(psfile) $(DESTDIR)$(docdir) ;)
+ 	$(foreach txtfile, $(wildcard man/nonlatin/*/man1/*.txt), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 3,$(subst /, ,$(txtfile),)) ;)
+ 	$(foreach txtfile, $(wildcard man/nonlatin/*/man1/*.txt), $(INSTALL) -m 644 $(txtfile) $(DESTDIR)$(docdir)/$(word 3,$(subst /, ,$(txtfile),)) ;)
+ 	$(foreach htmlfile, $(wildcard man/nonlatin/*/man1/*.$(HTMLEXT)), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 3,$(subst /, ,$(htmlfile),)) ;)