pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Also patch lex_count



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Wed Aug 23 18:18:25 2017 +0200
Changeset:	5daf377658e7eb68302ab90d3946bf3c61e97920

Modified Files:
	sloccount/Makefile
	sloccount/distinfo
Added Files:
	sloccount/patches/patch-lex__count

Log Message:
Also patch lex_count

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5daf377658e7eb68302ab90d3946bf3c61e97920

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

diffstat:
 sloccount/Makefile                 |  4 ++--
 sloccount/distinfo                 |  1 +
 sloccount/patches/patch-lex__count | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diffs:
diff --git a/sloccount/Makefile b/sloccount/Makefile
index 9334dbbd53..1c200de3cb 100644
--- a/sloccount/Makefile
+++ b/sloccount/Makefile
@@ -3,7 +3,7 @@
 # - let sloccount(1) find its helper binaries
 
 DISTNAME=	sloccount-2.26
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.dwheeler.com/sloccount/
 
@@ -61,7 +61,7 @@ SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Fixing path to internal binaries.
 SUBST_STAGE.prefix=	post-patch
 SUBST_SED.prefix=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_FILES.prefix=	compute_all compute_sloc_lang sloccount
+SUBST_FILES.prefix=	compute_all compute_sloc_lang lex_count sloccount
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/libexec/sloccount/sloccount ${DESTDIR}${PREFIX}/bin/sloccount
diff --git a/sloccount/distinfo b/sloccount/distinfo
index 5408932571..434b231949 100644
--- a/sloccount/distinfo
+++ b/sloccount/distinfo
@@ -6,6 +6,7 @@ SHA512 (sloccount-2.26.tar.gz) = ed6ab315a56dbdc86c654b94e790c9ea9e2dcad0db26b63
 Size (sloccount-2.26.tar.gz) = 190948 bytes
 SHA1 (patch-compute__all) = 86bee28f56a366c63f122a417bad92020e748df1
 SHA1 (patch-compute__sloc__lang) = 8692b6b086aad2cf986123c85f70229017a9bf37
+SHA1 (patch-lex__count) = b9014c54a9a4a3a39bb84c5b008be486931ea57f
 SHA1 (patch-makefile) = 0f696e08486299dadd919d3aee1d31d01d1c6ad1
 SHA1 (patch-rpm__unpacker) = 1bd30245b1ad1c6de72c0ec63acbd76b95d79efb
 SHA1 (patch-sloccount) = 610b0033e7b0e10939f1d4b5ec3f7e1fcaa83827
diff --git a/sloccount/patches/patch-lex__count b/sloccount/patches/patch-lex__count
new file mode 100644
index 0000000000..18787a8aa3
--- /dev/null
+++ b/sloccount/patches/patch-lex__count
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Correct path to the helper binaries
+
+--- lex_count.orig	2004-08-01 03:06:09.000000000 +0000
++++ lex_count
+@@ -62,7 +62,7 @@ sub count_file {
+   my ($file) = @_;
+   my $sloc = 0;
+ 
+-  $sloc = `lexcount1 < "$file"`;
++  $sloc = `@PREFIX@/libexec/sloccount/lexcount1 < "$file"`;
+   chomp($sloc);
+   print "$sloc $file\n";
+   $total_sloc += $sloc;


Home | Main Index | Thread Index | Old Index