Correct path to the helper binaries

[Pierre Pronchery <khorben%defora.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Wed Aug 2 01:49:37 2017 +0200
Changeset:	d7d516bcada45a6eb1511428db6be295ca91060e

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

Log Message:
Correct path to the helper binaries

This is still not fully functional though.

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

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

diffstat:
 sloccount/Makefile                |  6 ++++++
 sloccount/distinfo                |  1 +
 sloccount/patches/patch-sloccount | 44 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)

diffs:
diff --git a/sloccount/Makefile b/sloccount/Makefile
index 781b24ac06..7f888dc72f 100644
--- a/sloccount/Makefile
+++ b/sloccount/Makefile
@@ -51,6 +51,12 @@ REPLACE_PERL+=		python_count
 REPLACE_PERL+=		simplecount
 REPLACE_PERL+=		sql_count
 
+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=	sloccount
+
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/libexec/sloccount/sloccount ${DESTDIR}${PREFIX}/bin/sloccount
 	${GUNZIP_CMD} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/sloccount.1.gz
diff --git a/sloccount/distinfo b/sloccount/distinfo
index f17751793e..6ad1d9f655 100644
--- a/sloccount/distinfo
+++ b/sloccount/distinfo
@@ -6,3 +6,4 @@ SHA512 (sloccount-2.26.tar.gz) = ed6ab315a56dbdc86c654b94e790c9ea9e2dcad0db26b63
 Size (sloccount-2.26.tar.gz) = 190948 bytes
 SHA1 (patch-makefile) = 67ee105f46bb15b219b0ef888594928b453fe407
 SHA1 (patch-rpm__unpacker) = 1bd30245b1ad1c6de72c0ec63acbd76b95d79efb
+SHA1 (patch-sloccount) = 36f2b762aae891bfd0fdee52b0a34b286c16d5d5
diff --git a/sloccount/patches/patch-sloccount b/sloccount/patches/patch-sloccount
new file mode 100644
index 0000000000..1c274d33c1
--- /dev/null
+++ b/sloccount/patches/patch-sloccount
@@ -0,0 +1,44 @@
+$NetBSD$
+
+Correct path to the helper binaries
+
+--- sloccount.orig	2004-08-01 18:52:22.000000000 +0000
++++ sloccount
+@@ -39,6 +39,8 @@ fi
+ 
+ startingdir=`pwd`
+ 
++prefix="/usr/pkg"
++libexecdir="$prefix/libexec/sloccount"
+ 
+ # "datadir" is some suitable safe place for the data; here's the default:
+ datadir=${HOME}/.slocdata
+@@ -212,23 +214,23 @@ in
+   
+   case $split_things_up
+   in
+-   y) make_filelists $follow $notopfollow --datadir "$datadir" --skip src "$1"/* ||
++   y) "$libexecdir/make_filelists" $follow $notopfollow --datadir "$datadir" --skip src "$1"/* ||
+           exit 1
+       if [ -d "$1"/src ]
+       then
+-       make_filelists $notopfollow --datadir "$datadir" --prefix "src_" "$1"/src/* ||
++       "$libexecdir/make_filelists" $notopfollow --datadir "$datadir" --prefix "src_" "$1"/src/* ||
+           exit 1
+       fi
+       ;;
+-   *) make_filelists $follow $notopfollow --datadir "$datadir" "$@" || exit 1
++   *) "$libexecdir/make_filelists" $follow $notopfollow --datadir "$datadir" "$@" || exit 1
+       ;;
+   esac
+   
+   cd $datadir
+   if echo "Categorizing files." &&
+-     break_filelist --duplistfile sloc_hashes $duplicate_control $autogen * &&
++     "$libexecdir/break_filelist" --duplistfile sloc_hashes $duplicate_control $autogen * &&
+      echo "Computing results." &&
+-     compute_all *
++     "$libexecdir/compute_all" *
+   then
+     display_results=y
+   fi