Tue Jun 17 12:54:28 2014 UTC ()
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).


(ryoon)
diff -r1.12 -r1.13 pkgsrc/converters/dos2unix/Makefile
diff -r1.2 -r1.3 pkgsrc/converters/dos2unix/PLIST
diff -r1.6 -r1.7 pkgsrc/converters/dos2unix/distinfo
diff -r1.2 -r1.3 pkgsrc/converters/dos2unix/patches/patch-Makefile
cvs diff -r1.12 -r1.13 pkgsrc/converters/dos2unix/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/dos2unix/Makefile 2014/05/29 23:35:21 1.12
+++ pkgsrc/converters/dos2unix/Makefile 2014/06/17 12:54:28 1.13
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.12 2014/05/29 23:35:21 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2014/06/17 12:54:28 ryoon Exp $
2# 2#
3 3
4DISTNAME= dos2unix-6.0.4 4DISTNAME= dos2unix-6.0.5
5PKGREVISION= 1 
6CATEGORIES= converters 5CATEGORIES= converters
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dos2unix/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dos2unix/}
8 7
9MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= http://waterlan.home.xs4all.nl/dos2unix.html 9HOMEPAGE= http://waterlan.home.xs4all.nl/dos2unix.html
11COMMENT= DOS/Mac to Unix and vice versa text file format converter 10COMMENT= DOS/Mac to Unix and vice versa text file format converter
12LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
13 12
14CONFLICTS= unix2dos-[0-9]* 13CONFLICTS= unix2dos-[0-9]*
15 14
16USE_TOOLS+= gmake msgfmt xgettext perl 15USE_TOOLS+= gmake msgfmt xgettext perl
17 16
18BUILD_MAKE_FLAGS+= LDFLAGS_EXTRA+="${COMPILER_RPATH_FLAG}${PREFIX}/lib -lintl" 17BUILD_MAKE_FLAGS+= LDFLAGS_EXTRA+="${COMPILER_RPATH_FLAG}${PREFIX}/lib -lintl"
cvs diff -r1.2 -r1.3 pkgsrc/converters/dos2unix/PLIST (expand / switch to unified diff)

--- pkgsrc/converters/dos2unix/PLIST 2014/01/08 15:14:03 1.2
+++ pkgsrc/converters/dos2unix/PLIST 2014/06/17 12:54:28 1.3
@@ -1,31 +1,74 @@ @@ -1,31 +1,74 @@
1@comment $NetBSD: PLIST,v 1.2 2014/01/08 15:14:03 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.3 2014/06/17 12:54:28 ryoon Exp $
2bin/dos2unix 2bin/dos2unix
3bin/mac2unix 3bin/mac2unix
4bin/unix2dos 4bin/unix2dos
5bin/unix2mac 5bin/unix2mac
6man/es/man1/dos2unix.1 
7man/es/man1/mac2unix.1 
8man/es/man1/unix2dos.1 
9man/es/man1/unix2mac.1 
10man/man1/dos2unix.1 6man/man1/dos2unix.1
11man/man1/mac2unix.1 7man/man1/mac2unix.1
12man/man1/unix2dos.1 8man/man1/unix2dos.1
13man/man1/unix2mac.1 9man/man1/unix2mac.1
14man/nl/man1/dos2unix.1 
15man/nl/man1/mac2unix.1 
16man/nl/man1/unix2dos.1 
17man/nl/man1/unix2mac.1 
18share/doc/${PKGNAME}/BUGS.txt 10share/doc/${PKGNAME}/BUGS.txt
19share/doc/${PKGNAME}/COPYING.txt 11share/doc/${PKGNAME}/COPYING.txt
20share/doc/${PKGNAME}/ChangeLog.txt 12share/doc/${PKGNAME}/ChangeLog.txt
21share/doc/${PKGNAME}/INSTALL.txt 13share/doc/${PKGNAME}/INSTALL.txt
22share/doc/${PKGNAME}/NEWS.txt 14share/doc/${PKGNAME}/NEWS.txt
23share/doc/${PKGNAME}/README.txt 15share/doc/${PKGNAME}/README.txt
24share/doc/${PKGNAME}/TODO.txt 16share/doc/${PKGNAME}/TODO.txt
 17share/doc/${PKGNAME}/de/dos2unix.htm
 18share/doc/${PKGNAME}/de/dos2unix.txt
25share/doc/${PKGNAME}/dos2unix.htm 19share/doc/${PKGNAME}/dos2unix.htm
26share/doc/${PKGNAME}/dos2unix.txt 20share/doc/${PKGNAME}/dos2unix.txt
 21share/doc/${PKGNAME}/es/dos2unix.htm
 22share/doc/${PKGNAME}/es/dos2unix.txt
 23share/doc/${PKGNAME}/fr/dos2unix.htm
 24share/doc/${PKGNAME}/fr/dos2unix.txt
 25share/doc/${PKGNAME}/nl/dos2unix.htm
 26share/doc/${PKGNAME}/nl/dos2unix.txt
 27share/doc/${PKGNAME}/pl/dos2unix.htm
 28share/doc/${PKGNAME}/pl/dos2unix.txt
 29share/doc/${PKGNAME}/pt_BR/dos2unix.htm
 30share/doc/${PKGNAME}/pt_BR/dos2unix.txt
 31share/doc/${PKGNAME}/uk/dos2unix.htm
 32share/doc/${PKGNAME}/uk/dos2unix.txt
 33share/locale/da/LC_MESSAGES/dos2unix.mo
27share/locale/de/LC_MESSAGES/dos2unix.mo 34share/locale/de/LC_MESSAGES/dos2unix.mo
28share/locale/eo/LC_MESSAGES/dos2unix.mo 35share/locale/eo/LC_MESSAGES/dos2unix.mo
29share/locale/es/LC_MESSAGES/dos2unix.mo 36share/locale/es/LC_MESSAGES/dos2unix.mo
 37share/locale/fr/LC_MESSAGES/dos2unix.mo
 38share/locale/hu/LC_MESSAGES/dos2unix.mo
30share/locale/nl/LC_MESSAGES/dos2unix.mo 39share/locale/nl/LC_MESSAGES/dos2unix.mo
 40share/locale/pl/LC_MESSAGES/dos2unix.mo
 41share/locale/pt_BR/LC_MESSAGES/dos2unix.mo
31share/locale/ru/LC_MESSAGES/dos2unix.mo 42share/locale/ru/LC_MESSAGES/dos2unix.mo
 43share/locale/sr/LC_MESSAGES/dos2unix.mo
 44share/locale/uk/LC_MESSAGES/dos2unix.mo
 45share/locale/vi/LC_MESSAGES/dos2unix.mo
 46share/locale/zh_TW/LC_MESSAGES/dos2unix.mo
 47share/man/de/man1/dos2unix.1
 48share/man/de/man1/mac2unix.1
 49share/man/de/man1/unix2dos.1
 50share/man/de/man1/unix2mac.1
 51share/man/es/man1/dos2unix.1
 52share/man/es/man1/mac2unix.1
 53share/man/es/man1/unix2dos.1
 54share/man/es/man1/unix2mac.1
 55share/man/fr/man1/dos2unix.1
 56share/man/fr/man1/mac2unix.1
 57share/man/fr/man1/unix2dos.1
 58share/man/fr/man1/unix2mac.1
 59share/man/nl/man1/dos2unix.1
 60share/man/nl/man1/mac2unix.1
 61share/man/nl/man1/unix2dos.1
 62share/man/nl/man1/unix2mac.1
 63share/man/pl/man1/dos2unix.1
 64share/man/pl/man1/mac2unix.1
 65share/man/pl/man1/unix2dos.1
 66share/man/pl/man1/unix2mac.1
 67share/man/pt_BR/man1/dos2unix.1
 68share/man/pt_BR/man1/mac2unix.1
 69share/man/pt_BR/man1/unix2dos.1
 70share/man/pt_BR/man1/unix2mac.1
 71share/man/uk/man1/dos2unix.1
 72share/man/uk/man1/mac2unix.1
 73share/man/uk/man1/unix2dos.1
 74share/man/uk/man1/unix2mac.1
cvs diff -r1.6 -r1.7 pkgsrc/converters/dos2unix/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/dos2unix/distinfo 2014/01/08 15:14:03 1.6
+++ pkgsrc/converters/dos2unix/distinfo 2014/06/17 12:54:28 1.7
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.6 2014/01/08 15:14:03 ryoon Exp $ 1$NetBSD: distinfo,v 1.7 2014/06/17 12:54:28 ryoon Exp $
2 2
3SHA1 (dos2unix-6.0.4.tar.gz) = 93d73148c09908a42dcbf5339312c9aa1f18ba7c 3SHA1 (dos2unix-6.0.5.tar.gz) = b43d138e1713791ea5067c32afbcd7a32655d2fa
4RMD160 (dos2unix-6.0.4.tar.gz) = 8fa972e309b1de1228b09e247d4b110122757512 4RMD160 (dos2unix-6.0.5.tar.gz) = 63af2b26e363cba0dbd2294dd79399066ba11bd2
5Size (dos2unix-6.0.4.tar.gz) = 84848 bytes 5Size (dos2unix-6.0.5.tar.gz) = 326460 bytes
6SHA1 (patch-Makefile) = a6b9d829af0d54c8c9d58814171e5890459a181e 6SHA1 (patch-Makefile) = 50150be7ac3090d33ad38e654433bd09837132ab
cvs diff -r1.2 -r1.3 pkgsrc/converters/dos2unix/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/converters/dos2unix/patches/patch-Makefile 2014/01/08 15:14:03 1.2
+++ pkgsrc/converters/dos2unix/patches/patch-Makefile 2014/06/17 12:54:28 1.3
@@ -1,55 +1,15 @@ @@ -1,55 +1,15 @@
1$NetBSD: patch-Makefile,v 1.2 2014/01/08 15:14:03 ryoon Exp $ 1$NetBSD: patch-Makefile,v 1.3 2014/06/17 12:54:28 ryoon Exp $
2 2
3* install man pages to ${PREFIX}/man 3* install man pages to ${PREFIX}/man
4* do not generate ps, pdf, and html documents 
5 4
6--- Makefile.orig 2013-11-26 22:56:57.000000000 +0000 5--- Makefile.orig 2014-04-17 19:43:48.000000000 +0000
7+++ Makefile 6+++ Makefile
8@@ -35,7 +35,7 @@ 7@@ -78,7 +78,7 @@ datadir = $(datarootdir)
9  
10 include version.mk 
11  
12-.PHONY: man txt html pdf mofiles tags merge 
13+.PHONY: man txt html pdf mofiles tags merge 
14  
15 CC ?= gcc 
16 CPP ?= cpp 
17@@ -80,7 +80,7 @@ datadir = $(datarootdir) 
18 docsubdir = $(PACKAGE)-$(DOS2UNIX_VERSION) 8 docsubdir = $(PACKAGE)-$(DOS2UNIX_VERSION)
19 docdir = $(datarootdir)/doc/$(docsubdir) 9 docdir = $(datarootdir)/doc/$(docsubdir)
20 localedir = $(datarootdir)/locale 10 localedir = $(datarootdir)/locale
21-mandir = $(datarootdir)/man 11-mandir = $(datarootdir)/man
22+mandir = $(prefix)/${PKGMANDIR} 12+mandir = $(prefix)/${PKGMANDIR}
23 man1dir = $(mandir)/man1 13 man1dir = $(mandir)/man1
24 manext = .1 14 manext = .1
25 man1ext = .1 15 man1ext = .1
26@@ -465,11 +465,11 @@ else 
27 cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1 
28 cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1 
29 endif 
30- $(foreach manfile, $(MANFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ;) 
31- $(foreach manfile, $(MANFILES), $(INSTALL) -m 644 $(manfile) $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ;) 
32- $(foreach manfile, $(MANFILES), cd $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1 ;) 
33- $(foreach manfile, $(MANFILES), cd $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1 ;) 
34- $(foreach manfile, $(MANFILES), cd $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1 ;) 
35+ $(foreach manfile, $(MANFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(prefix)/$(dir $(manfile)) ;) 
36+ $(foreach manfile, $(MANFILES), $(INSTALL) -m 644 $(manfile) $(DESTDIR)$(prefix)/$(dir $(manfile)) ;) 
37+ $(foreach manfile, $(MANFILES), cd $(DESTDIR)$(prefix)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1 ;) 
38+ $(foreach manfile, $(MANFILES), cd $(DESTDIR)$(prefix)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1 ;) 
39+ $(foreach manfile, $(MANFILES), cd $(DESTDIR)$(prefix)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1 ;) 
40 $(foreach manfile, $(MANFILES_NONLATIN), $(MKDIR) -p -m 755 $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(dir $(manfile))) ;) 
41 $(foreach manfile, $(MANFILES_NONLATIN), $(INSTALL) -m 644 $(manfile) $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(dir $(manfile))) ;) 
42 $(foreach manfile, $(MANFILES_NONLATIN), cd $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(dir $(manfile))) ; $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1 ;) 
43@@ -494,12 +494,6 @@ install-doc: $(INSTALL_OBJS_DOC) 
44 $(foreach txtfile, $(wildcard man/*/man1/*.txt), $(INSTALL) -m 644 $(txtfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;) 
45 $(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;) 
46 $(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(INSTALL) -m 644 $(htmlfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;) 
47- $(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;) 
48- $(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(INSTALL) -m 644 $(pdffile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;) 
49- $(foreach pdffile, $(wildcard man/man1/*.pdf), $(INSTALL) -m 644 $(pdffile) $(DESTDIR)$(docdir) ;) 
50- $(foreach psfile, $(wildcard man/*/man1/*.ps), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;) 
51- $(foreach psfile, $(wildcard man/*/man1/*.ps), $(INSTALL) -m 644 $(psfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;) 
52- $(foreach psfile, $(wildcard man/man1/*.ps), $(INSTALL) -m 644 $(psfile) $(DESTDIR)$(docdir) ;) 
53 $(foreach txtfile, $(wildcard man/nonlatin/*/man1/*.txt), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 3,$(subst /, ,$(txtfile),)) ;) 
54 $(foreach txtfile, $(wildcard man/nonlatin/*/man1/*.txt), $(INSTALL) -m 644 $(txtfile) $(DESTDIR)$(docdir)/$(word 3,$(subst /, ,$(txtfile),)) ;) 
55 $(foreach htmlfile, $(wildcard man/nonlatin/*/man1/*.$(HTMLEXT)), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 3,$(subst /, ,$(htmlfile),)) ;)