Update to 6.0.5

* Install HTML files

Changelog:
2014-04-17: Version 6.0.5

  * Dos2unix is part of the Translation Project (TP).
    All translations go via the Translation Project.
    See http://translationproject.org/
  * New translations of UI messages: Brazilian Portuguese, Chinese (traditional),
    Danish, French, Hungarian, Polish, Serbian, Ukrainian, Vietnamese.
  * New translations of the manual: Brazilian Portuguese, French, German,
    Polish, Ukrainian.
  * Generated man pages are included in the source package to prevent
    compilation problems with very old or very new perl/pod2man versions.
  * Manuals are now generated from gettext PO files with po4a for easier
    translation.
  * All manuals are now in UTF-8 encoding.
  * Skip symbolic links on Windows by default (same as on Unix).

4 files changed, 62 insertions, 60 deletions

diff --git a/converters/dos2unix/Makefile b/converters/dos2unix/Makefile
index 1f36335176c..d4904ce9ba7 100644
--- a/converters/dos2unix/Makefile
+++ b/converters/dos2unix/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2014/05/29 23:35:21 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/17 12:54:28 ryoon Exp $
 #
 
-DISTNAME=	dos2unix-6.0.4
-PKGREVISION=	1
+DISTNAME=	dos2unix-6.0.5
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dos2unix/}
 
diff --git a/converters/dos2unix/PLIST b/converters/dos2unix/PLIST
index 77f80819836..c4e3a6f11e3 100644
--- a/converters/dos2unix/PLIST
+++ b/converters/dos2unix/PLIST
@@ -1,20 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2014/01/08 15:14:03 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/06/17 12:54:28 ryoon Exp $
 bin/dos2unix
 bin/mac2unix
 bin/unix2dos
 bin/unix2mac
-man/es/man1/dos2unix.1
-man/es/man1/mac2unix.1
-man/es/man1/unix2dos.1
-man/es/man1/unix2mac.1
 man/man1/dos2unix.1
 man/man1/mac2unix.1
 man/man1/unix2dos.1
 man/man1/unix2mac.1
-man/nl/man1/dos2unix.1
-man/nl/man1/mac2unix.1
-man/nl/man1/unix2dos.1
-man/nl/man1/unix2mac.1
 share/doc/${PKGNAME}/BUGS.txt
 share/doc/${PKGNAME}/COPYING.txt
 share/doc/${PKGNAME}/ChangeLog.txt
@@ -22,10 +14,61 @@ share/doc/${PKGNAME}/INSTALL.txt
 share/doc/${PKGNAME}/NEWS.txt
 share/doc/${PKGNAME}/README.txt
 share/doc/${PKGNAME}/TODO.txt
+share/doc/${PKGNAME}/de/dos2unix.htm
+share/doc/${PKGNAME}/de/dos2unix.txt
 share/doc/${PKGNAME}/dos2unix.htm
 share/doc/${PKGNAME}/dos2unix.txt
+share/doc/${PKGNAME}/es/dos2unix.htm
+share/doc/${PKGNAME}/es/dos2unix.txt
+share/doc/${PKGNAME}/fr/dos2unix.htm
+share/doc/${PKGNAME}/fr/dos2unix.txt
+share/doc/${PKGNAME}/nl/dos2unix.htm
+share/doc/${PKGNAME}/nl/dos2unix.txt
+share/doc/${PKGNAME}/pl/dos2unix.htm
+share/doc/${PKGNAME}/pl/dos2unix.txt
+share/doc/${PKGNAME}/pt_BR/dos2unix.htm
+share/doc/${PKGNAME}/pt_BR/dos2unix.txt
+share/doc/${PKGNAME}/uk/dos2unix.htm
+share/doc/${PKGNAME}/uk/dos2unix.txt
+share/locale/da/LC_MESSAGES/dos2unix.mo
 share/locale/de/LC_MESSAGES/dos2unix.mo
 share/locale/eo/LC_MESSAGES/dos2unix.mo
 share/locale/es/LC_MESSAGES/dos2unix.mo
+share/locale/fr/LC_MESSAGES/dos2unix.mo
+share/locale/hu/LC_MESSAGES/dos2unix.mo
 share/locale/nl/LC_MESSAGES/dos2unix.mo
+share/locale/pl/LC_MESSAGES/dos2unix.mo
+share/locale/pt_BR/LC_MESSAGES/dos2unix.mo
 share/locale/ru/LC_MESSAGES/dos2unix.mo
+share/locale/sr/LC_MESSAGES/dos2unix.mo
+share/locale/uk/LC_MESSAGES/dos2unix.mo
+share/locale/vi/LC_MESSAGES/dos2unix.mo
+share/locale/zh_TW/LC_MESSAGES/dos2unix.mo
+share/man/de/man1/dos2unix.1
+share/man/de/man1/mac2unix.1
+share/man/de/man1/unix2dos.1
+share/man/de/man1/unix2mac.1
+share/man/es/man1/dos2unix.1
+share/man/es/man1/mac2unix.1
+share/man/es/man1/unix2dos.1
+share/man/es/man1/unix2mac.1
+share/man/fr/man1/dos2unix.1
+share/man/fr/man1/mac2unix.1
+share/man/fr/man1/unix2dos.1
+share/man/fr/man1/unix2mac.1
+share/man/nl/man1/dos2unix.1
+share/man/nl/man1/mac2unix.1
+share/man/nl/man1/unix2dos.1
+share/man/nl/man1/unix2mac.1
+share/man/pl/man1/dos2unix.1
+share/man/pl/man1/mac2unix.1
+share/man/pl/man1/unix2dos.1
+share/man/pl/man1/unix2mac.1
+share/man/pt_BR/man1/dos2unix.1
+share/man/pt_BR/man1/mac2unix.1
+share/man/pt_BR/man1/unix2dos.1
+share/man/pt_BR/man1/unix2mac.1
+share/man/uk/man1/dos2unix.1
+share/man/uk/man1/mac2unix.1
+share/man/uk/man1/unix2dos.1
+share/man/uk/man1/unix2mac.1
diff --git a/converters/dos2unix/distinfo b/converters/dos2unix/distinfo
index 678ab3bcbc0..0d70b79c58b 100644
--- a/converters/dos2unix/distinfo
+++ b/converters/dos2unix/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2014/01/08 15:14:03 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2014/06/17 12:54:28 ryoon Exp $
 
-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
+SHA1 (dos2unix-6.0.5.tar.gz) = b43d138e1713791ea5067c32afbcd7a32655d2fa
+RMD160 (dos2unix-6.0.5.tar.gz) = 63af2b26e363cba0dbd2294dd79399066ba11bd2
+Size (dos2unix-6.0.5.tar.gz) = 326460 bytes
+SHA1 (patch-Makefile) = 50150be7ac3090d33ad38e654433bd09837132ab
diff --git a/converters/dos2unix/patches/patch-Makefile b/converters/dos2unix/patches/patch-Makefile
index c324db94205..dac52e77418 100644
--- a/converters/dos2unix/patches/patch-Makefile
+++ b/converters/dos2unix/patches/patch-Makefile
@@ -1,20 +1,10 @@
-$NetBSD: patch-Makefile,v 1.2 2014/01/08 15:14:03 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.3 2014/06/17 12:54:28 ryoon Exp $
 
 * install man pages to ${PREFIX}/man
-* do not generate ps, pdf, and html documents
 
---- Makefile.orig	2013-11-26 22:56:57.000000000 +0000
+--- Makefile.orig	2014-04-17 19:43:48.000000000 +0000
 +++ Makefile
-@@ -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)
+@@ -78,7 +78,7 @@ datadir		= $(datarootdir)
  docsubdir	= $(PACKAGE)-$(DOS2UNIX_VERSION)
  docdir		= $(datarootdir)/doc/$(docsubdir)
  localedir	= $(datarootdir)/locale
@@ -23,33 +13,3 @@ $NetBSD: patch-Makefile,v 1.2 2014/01/08 15:14:03 ryoon Exp $
  man1dir		= $(mandir)/man1
  manext		= .1
  man1ext		= .1
-@@ -465,11 +465,11 @@ else
- 	cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1
- 	cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1
- endif
--	$(foreach manfile, $(MANFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ;)
--	$(foreach manfile, $(MANFILES), $(INSTALL) -m 644 $(manfile) $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ;)
--	$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1 ;)
--	$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1 ;)
--	$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1 ;)
-+	$(foreach manfile, $(MANFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(prefix)/$(dir $(manfile)) ;)
-+	$(foreach manfile, $(MANFILES), $(INSTALL) -m 644 $(manfile) $(DESTDIR)$(prefix)/$(dir $(manfile)) ;)
-+	$(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 ;)
- 	$(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),)) ;)