dos2unix: Install all man pages to PKGMANDIR.

Bump PKGREVISION.

4 files changed, 44 insertions, 55 deletions

diff --git a/converters/dos2unix/Makefile b/converters/dos2unix/Makefile
index ec315db0338..b1b663d49aa 100644
--- a/converters/dos2unix/Makefile
+++ b/converters/dos2unix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/08/11 13:18:10 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/10/02 07:20:24 nia Exp $
 
 DISTNAME=	dos2unix-7.4.0
 PKGREVISION=	3
@@ -17,5 +17,10 @@ USE_TOOLS+=	gmake msgfmt xgettext perl
 BUILD_MAKE_FLAGS+=	LDFLAGS_EXTRA+="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lintl ${LDFLAGS}"
 INSTALL_MAKE_FLAGS+=	prefix=${PREFIX}
 
+INSTALLATION_DIRS+=	${PKGMANDIR}
+
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/share/man/* ${DESTDIR}${PREFIX}/${PKGMANDIR} || ${TRUE}
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/dos2unix/PLIST b/converters/dos2unix/PLIST
index 1404431311f..f8d8f392c33 100644
--- a/converters/dos2unix/PLIST
+++ b/converters/dos2unix/PLIST
@@ -1,12 +1,48 @@
-@comment $NetBSD: PLIST,v 1.7 2015/12/31 22:27:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/10/02 07:20:24 nia Exp $
 bin/dos2unix
 bin/mac2unix
 bin/unix2dos
 bin/unix2mac
+man/de/man1/dos2unix.1
+man/de/man1/mac2unix.1
+man/de/man1/unix2dos.1
+man/de/man1/unix2mac.1
+man/es/man1/dos2unix.1
+man/es/man1/mac2unix.1
+man/es/man1/unix2dos.1
+man/es/man1/unix2mac.1
+man/fr/man1/dos2unix.1
+man/fr/man1/mac2unix.1
+man/fr/man1/unix2dos.1
+man/fr/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
+man/pl/man1/dos2unix.1
+man/pl/man1/mac2unix.1
+man/pl/man1/unix2dos.1
+man/pl/man1/unix2mac.1
+man/pt_BR/man1/dos2unix.1
+man/pt_BR/man1/mac2unix.1
+man/pt_BR/man1/unix2dos.1
+man/pt_BR/man1/unix2mac.1
+man/sv/man1/dos2unix.1
+man/sv/man1/mac2unix.1
+man/sv/man1/unix2dos.1
+man/sv/man1/unix2mac.1
+man/uk/man1/dos2unix.1
+man/uk/man1/mac2unix.1
+man/uk/man1/unix2dos.1
+man/uk/man1/unix2mac.1
+man/zh_CN/man1/dos2unix.1
+man/zh_CN/man1/mac2unix.1
+man/zh_CN/man1/unix2dos.1
+man/zh_CN/man1/unix2mac.1
 share/doc/${PKGNAME}/BUGS.txt
 share/doc/${PKGNAME}/COPYING.txt
 share/doc/${PKGNAME}/ChangeLog.txt
@@ -52,39 +88,3 @@ share/locale/uk/LC_MESSAGES/dos2unix.mo
 share/locale/vi/LC_MESSAGES/dos2unix.mo
 share/locale/zh_CN/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/sv/man1/dos2unix.1
-share/man/sv/man1/mac2unix.1
-share/man/sv/man1/unix2dos.1
-share/man/sv/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
-share/man/zh_CN/man1/dos2unix.1
-share/man/zh_CN/man1/mac2unix.1
-share/man/zh_CN/man1/unix2dos.1
-share/man/zh_CN/man1/unix2mac.1
diff --git a/converters/dos2unix/distinfo b/converters/dos2unix/distinfo
index 1667c80de8f..bb26831d711 100644
--- a/converters/dos2unix/distinfo
+++ b/converters/dos2unix/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.17 2017/10/27 13:06:16 ryoon Exp $
+$NetBSD: distinfo,v 1.18 2019/10/02 07:20:24 nia Exp $
 
 SHA1 (dos2unix-7.4.0.tar.gz) = fec41c9ea7b87db597bd20abf79b053b82689974
 RMD160 (dos2unix-7.4.0.tar.gz) = 5714e652b3549ed3cedd9237c68bda95ff9e2962
 SHA512 (dos2unix-7.4.0.tar.gz) = 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9
 Size (dos2unix-7.4.0.tar.gz) = 710339 bytes
-SHA1 (patch-Makefile) = 78e9b2237c54805c08af242e85b1a97c327e5724
diff --git a/converters/dos2unix/patches/patch-Makefile b/converters/dos2unix/patches/patch-Makefile
deleted file mode 100644
index 31b3a60b475..00000000000
--- a/converters/dos2unix/patches/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile,v 1.4 2017/10/27 13:06:17 ryoon Exp $
-
-* install man pages to ${PREFIX}/man
-
---- Makefile.orig	2017-10-10 20:00:32.000000000 +0000
-+++ Makefile
-@@ -79,7 +79,7 @@ datadir         = $(datarootdir)
- docsubdir       = $(PACKAGE)-$(DOS2UNIX_VERSION)
- docdir          = $(datarootdir)/doc/$(docsubdir)
- localedir       = $(datarootdir)/locale
--mandir          = $(datarootdir)/man
-+mandir          = $(prefix)/${PKGMANDIR}
- man1dir         = $(mandir)/man1
- manext          = .1
- man1ext         = .1