CVS commit: pkgsrc/converters/dos2unix

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Oct  2 13:46:49 UTC 2019

Modified Files:
        pkgsrc/converters/dos2unix: Makefile distinfo
Added Files:
        pkgsrc/converters/dos2unix/patches: patch-Makefile

Log Message:
Install NLS man pages in dos2unix-7.4.0/Makefile
instead of post-install target of pkgsrc.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/converters/dos2unix/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/converters/dos2unix/distinfo
cvs rdiff -u -r0 -r1.6 pkgsrc/converters/dos2unix/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/dos2unix/Makefile
diff -u pkgsrc/converters/dos2unix/Makefile:1.29 pkgsrc/converters/dos2unix/Makefile:1.30
--- pkgsrc/converters/dos2unix/Makefile:1.29    Wed Oct  2 07:20:24 2019
+++ pkgsrc/converters/dos2unix/Makefile Wed Oct  2 13:46:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/10/02 07:20:24 nia Exp $
+# $NetBSD: Makefile,v 1.30 2019/10/02 13:46:49 ryoon Exp $
 
 DISTNAME=      dos2unix-7.4.0
 PKGREVISION=   3
@@ -17,10 +17,5 @@ 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"

Index: pkgsrc/converters/dos2unix/distinfo
diff -u pkgsrc/converters/dos2unix/distinfo:1.18 pkgsrc/converters/dos2unix/distinfo:1.19
--- pkgsrc/converters/dos2unix/distinfo:1.18    Wed Oct  2 07:20:24 2019
+++ pkgsrc/converters/dos2unix/distinfo Wed Oct  2 13:46:49 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.18 2019/10/02 07:20:24 nia Exp $
+$NetBSD: distinfo,v 1.19 2019/10/02 13:46:49 ryoon 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) = fd36034eedc1bb15b01c24d5c73df1cd1175af25

Added files:

Index: pkgsrc/converters/dos2unix/patches/patch-Makefile
diff -u /dev/null pkgsrc/converters/dos2unix/patches/patch-Makefile:1.6
--- /dev/null   Wed Oct  2 13:46:49 2019
+++ pkgsrc/converters/dos2unix/patches/patch-Makefile   Wed Oct  2 13:46:49 2019
@@ -0,0 +1,45 @@
+$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 ;)