Wed Oct 2 13:46:49 2019 UTC ()
Install NLS man pages in dos2unix-7.4.0/Makefile
instead of post-install target of pkgsrc.


(ryoon)
diff -r1.29 -r1.30 pkgsrc/converters/dos2unix/Makefile
diff -r1.18 -r1.19 pkgsrc/converters/dos2unix/distinfo
diff -r0 -r1.6 pkgsrc/converters/dos2unix/patches/patch-Makefile
cvs diff -r1.29 -r1.30 pkgsrc/converters/dos2unix/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/dos2unix/Makefile 2019/10/02 07:20:24 1.29
+++ pkgsrc/converters/dos2unix/Makefile 2019/10/02 13:46:49 1.30
@@ -1,26 +1,21 @@ @@ -1,26 +1,21 @@
1# $NetBSD: Makefile,v 1.29 2019/10/02 07:20:24 nia Exp $ 1# $NetBSD: Makefile,v 1.30 2019/10/02 13:46:49 ryoon Exp $
2 2
3DISTNAME= dos2unix-7.4.0 3DISTNAME= dos2unix-7.4.0
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= converters 5CATEGORIES= converters
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dos2unix/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dos2unix/}
7 7
8MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= http://waterlan.home.xs4all.nl/dos2unix.html 9HOMEPAGE= http://waterlan.home.xs4all.nl/dos2unix.html
10COMMENT= DOS/Mac to Unix and vice versa text file format converter 10COMMENT= DOS/Mac to Unix and vice versa text file format converter
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13CONFLICTS= unix2dos-[0-9]* 13CONFLICTS= unix2dos-[0-9]*
14 14
15USE_TOOLS+= gmake msgfmt xgettext perl 15USE_TOOLS+= gmake msgfmt xgettext perl
16 16
17BUILD_MAKE_FLAGS+= LDFLAGS_EXTRA+="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lintl ${LDFLAGS}" 17BUILD_MAKE_FLAGS+= LDFLAGS_EXTRA+="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lintl ${LDFLAGS}"
18INSTALL_MAKE_FLAGS+= prefix=${PREFIX} 18INSTALL_MAKE_FLAGS+= prefix=${PREFIX}
19 19
20INSTALLATION_DIRS+= ${PKGMANDIR} 
21 
22post-install: 
23 ${MV} ${DESTDIR}${PREFIX}/share/man/* ${DESTDIR}${PREFIX}/${PKGMANDIR} || ${TRUE} 
24 
25.include "../../devel/gettext-lib/buildlink3.mk" 20.include "../../devel/gettext-lib/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/converters/dos2unix/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/dos2unix/distinfo 2019/10/02 07:20:24 1.18
+++ pkgsrc/converters/dos2unix/distinfo 2019/10/02 13:46:49 1.19
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.18 2019/10/02 07:20:24 nia Exp $ 1$NetBSD: distinfo,v 1.19 2019/10/02 13:46:49 ryoon Exp $
2 2
3SHA1 (dos2unix-7.4.0.tar.gz) = fec41c9ea7b87db597bd20abf79b053b82689974 3SHA1 (dos2unix-7.4.0.tar.gz) = fec41c9ea7b87db597bd20abf79b053b82689974
4RMD160 (dos2unix-7.4.0.tar.gz) = 5714e652b3549ed3cedd9237c68bda95ff9e2962 4RMD160 (dos2unix-7.4.0.tar.gz) = 5714e652b3549ed3cedd9237c68bda95ff9e2962
5SHA512 (dos2unix-7.4.0.tar.gz) = 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9 5SHA512 (dos2unix-7.4.0.tar.gz) = 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9
6Size (dos2unix-7.4.0.tar.gz) = 710339 bytes 6Size (dos2unix-7.4.0.tar.gz) = 710339 bytes
 7SHA1 (patch-Makefile) = fd36034eedc1bb15b01c24d5c73df1cd1175af25
File Added: pkgsrc/converters/dos2unix/patches/patch-Makefile
$NetBSD: patch-Makefile,v 1.6 2019/10/02 13:46:49 ryoon Exp $

--- 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
@@ -563,11 +563,11 @@ else
 	cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1
 endif
 ifdef ENABLE_NLS
-	$(foreach manfile, $(MANFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ;)
-	$(foreach manfile, $(MANFILES), $(INSTALL_DATA) $(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)$(mandir)/$(dir $(subst man/, , $(manfile))) ;)
+	$(foreach manfile, $(MANFILES), $(INSTALL_DATA) $(manfile) $(DESTDIR)$(mandir)/$(dir $(subst man/, , $(manfile))) ;)
+	$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(mandir)/$(dir $(subst man/, , $(manfile))) ; $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1 ;)
+	$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(mandir)/$(dir $(subst man/, , $(manfile))) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1 ;)
+	$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(mandir)/$(dir $(subst man/, , $(manfile))) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1 ;)
 endif
 
 install-mo: mofiles
@@ -614,10 +614,10 @@ uninstall:
 	-rm -f $(DESTDIR)$(bindir)/$(MAC2UNIX_BIN)
 	-rm -f $(DESTDIR)$(bindir)/$(UNIX2DOS_BIN)
 	-rm -f $(DESTDIR)$(bindir)/$(UNIX2MAC_BIN)
-	-rm -f $(DESTDIR)$(mandir)/man1/$(PACKAGE).1
-	-rm -f $(DESTDIR)$(mandir)/man1/$(MAC2UNIX).1
-	-rm -f $(DESTDIR)$(mandir)/man1/$(UNIX2DOS).1
-	-rm -f $(DESTDIR)$(mandir)/man1/$(UNIX2MAC).1
+	-rm -f $(DESTDIR)$(man1dir)/$(PACKAGE).1
+	-rm -f $(DESTDIR)$(man1dir)/$(MAC2UNIX).1
+	-rm -f $(DESTDIR)$(man1dir)/$(UNIX2DOS).1
+	-rm -f $(DESTDIR)$(man1dir)/$(UNIX2MAC).1
 	-rm -rf $(DESTDIR)$(docdir)
 ifdef ENABLE_NLS
 	$(foreach mofile, $(MOFILES), rm -f $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;)