Wed Jul 5 19:22:04 2017 UTC ()
Fix at least SunOS by not overwriting "install"


(wiedi)
diff -r1.1 -r1.2 pkgsrc/devel/cloc/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/cloc/patches/patch-Unix_Makefile
cvs diff -r1.1 -r1.2 pkgsrc/devel/cloc/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cloc/distinfo 2017/04/23 03:29:00 1.1
+++ pkgsrc/devel/cloc/distinfo 2017/07/05 19:22:04 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1 2017/04/23 03:29:00 markd Exp $ 1$NetBSD: distinfo,v 1.2 2017/07/05 19:22:04 wiedi Exp $
2 2
3SHA1 (cloc-1.72.tar.gz) = 6fab8f9e2e2402b25b5b1b3527e02390ba0be1e8 3SHA1 (cloc-1.72.tar.gz) = 6fab8f9e2e2402b25b5b1b3527e02390ba0be1e8
4RMD160 (cloc-1.72.tar.gz) = 7e5963661d2fb792fff34d3dfa9b0464f124363f 4RMD160 (cloc-1.72.tar.gz) = 7e5963661d2fb792fff34d3dfa9b0464f124363f
5SHA512 (cloc-1.72.tar.gz) = e83567fcc2703b6de761c44d3b85e4c176eaff9f35419a202bd4c00b5cc9160d39251deb762d57b40aacf4fe6322cf79877032ed29abec2a5f00c1abb8d44021 5SHA512 (cloc-1.72.tar.gz) = e83567fcc2703b6de761c44d3b85e4c176eaff9f35419a202bd4c00b5cc9160d39251deb762d57b40aacf4fe6322cf79877032ed29abec2a5f00c1abb8d44021
6Size (cloc-1.72.tar.gz) = 347245 bytes 6Size (cloc-1.72.tar.gz) = 347245 bytes
7SHA1 (patch-Unix_Makefile) = 776ef2d40c5c4877259a7adcbd60cd15fe6ab5b6 7SHA1 (patch-Unix_Makefile) = b797a50124177380837d00ff72dd119c508c87c3
cvs diff -r1.1 -r1.2 pkgsrc/devel/cloc/patches/patch-Unix_Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cloc/patches/patch-Unix_Makefile 2017/04/23 03:29:00 1.1
+++ pkgsrc/devel/cloc/patches/patch-Unix_Makefile 2017/07/05 19:22:04 1.2
@@ -1,17 +1,27 @@ @@ -1,17 +1,27 @@
1$NetBSD: patch-Unix_Makefile,v 1.1 2017/04/23 03:29:00 markd Exp $ 1$NetBSD: patch-Unix_Makefile,v 1.2 2017/07/05 19:22:04 wiedi Exp $
2 2
 3Don't hardcode env
3--- Unix/Makefile.orig 2017-01-14 23:25:40.000000000 +0000 4--- Unix/Makefile.orig 2017-01-14 23:25:40.000000000 +0000
4+++ Unix/Makefile 5+++ Unix/Makefile
5@@ -26,10 +26,10 @@ endif 6@@ -26,10 +26,10 @@ endif
6 PACKAGE = cloc 7 PACKAGE = cloc
7  8
8 DESTDIR = 9 DESTDIR =
9-prefix = /usr 10-prefix = /usr
10+prefix = $(PREFIX) 11+prefix = $(PREFIX)
11 exec_prefix = $(prefix) 12 exec_prefix = $(prefix)
12 man_prefix = $(prefix)/share 13 man_prefix = $(prefix)/share
13-mandir = $(man_prefix)/man 14-mandir = $(man_prefix)/man
14+mandir = $(prefix)/$(PKGMANDIR) 15+mandir = $(prefix)/$(PKGMANDIR)
15 bindir = $(exec_prefix)/bin 16 bindir = $(exec_prefix)/bin
16 sharedir = $(prefix)/share 17 sharedir = $(prefix)/share
17  18
 19@@ -54,7 +54,7 @@ PL_SCRIPT = $(BIN)
 20 INSTALL_OBJS_BIN = $(PL_SCRIPT)
 21 INSTALL_OBJS_MAN = *.1
 22
 23-INSTALL = /usr/bin/install
 24+INSTALL = install
 25 INSTALL_BIN = $(INSTALL) -m 755
 26 INSTALL_DATA = $(INSTALL) -m 644
 27