universalcodegrep: go to nearly git head.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Oct 1 12:22:08 2016 +0200
Changeset:	b6d48ec452d7bdf5dabbf365ff95dac1b1e5f28a

Modified Files:
	universalcodegrep/Makefile
	universalcodegrep/distinfo
Added Files:
	universalcodegrep/patches/patch-configure.ac
Removed Files:
	universalcodegrep/patches/patch-src_ArgParse.cpp
	universalcodegrep/patches/patch-src_MemDiags.cpp

Log Message:
universalcodegrep: go to nearly git head.

Adds support for pcre2 and fixes some NetBSD issues.

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

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

diffstat:
 universalcodegrep/Makefile                       | 15 ++++++--
 universalcodegrep/distinfo                       | 11 +++---
 universalcodegrep/patches/patch-configure.ac     | 48 ++++++++++++++++++++++++
 universalcodegrep/patches/patch-src_ArgParse.cpp | 25 ------------
 universalcodegrep/patches/patch-src_MemDiags.cpp | 14 -------
 5 files changed, 65 insertions(+), 48 deletions(-)

diffs:
diff --git a/universalcodegrep/Makefile b/universalcodegrep/Makefile
index c0059c2..0bca67a 100644
--- a/universalcodegrep/Makefile
+++ b/universalcodegrep/Makefile
@@ -4,7 +4,8 @@ DISTNAME=	universalcodegrep-0.2.2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=gvansickle/}
 GITHUB_PROJECT=	ucg
-GITHUB_RELEASE=	${PKGVERSION_NOREV}
+#GITHUB_RELEASE=	${PKGVERSION_NOREV}
+GITHUB_TAG=	038e498679dcce932469089ff794176e44d7024c
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/gvansickle/ucg/
@@ -13,8 +14,16 @@ LICENSE=	gnu-gpl-v3
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
+USE_LIBTOOL=	yes
+USE_TOOLS+=	autoconf automake pkg-config
 
+NOT_PAX_MPROTECT_SAFE=	bin/ucg
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -fi
+
+.include "../../lang/python/application.mk"
 .include "../../devel/argp/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pcre2+=	pcre2>=10.22nb1
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/universalcodegrep/distinfo b/universalcodegrep/distinfo
index 3e335fd..9855ee5 100644
--- a/universalcodegrep/distinfo
+++ b/universalcodegrep/distinfo
@@ -1,8 +1,7 @@
 $NetBSD$
 
-SHA1 (universalcodegrep-0.2.2.tar.gz) = 54722fc7bf9e3ef6710bba6416d4b758269c20c1
-RMD160 (universalcodegrep-0.2.2.tar.gz) = 8bd24ad61e2684dc8042211fd63502fca422d3e2
-SHA512 (universalcodegrep-0.2.2.tar.gz) = 18f58cb867a4c08bbeb0c9f26b3578140d4331ee35d247b6df9aa6a89fef1e9d2760c4a0429a4c95ed7642607401c3c98705748eaf656b6926cd8d8e135a6708
-Size (universalcodegrep-0.2.2.tar.gz) = 230219 bytes
-SHA1 (patch-src_ArgParse.cpp) = c4852079cd586a6a397ab5899f2043ef4bc94cb1
-SHA1 (patch-src_MemDiags.cpp) = 21da5c4e8134a56963cd7c5716cc90d267378308
+SHA1 (universalcodegrep-0.2.2-038e498679dcce932469089ff794176e44d7024c.tar.gz) = a389b5e0832663c6773a47cbc7fa59851b29cc79
+RMD160 (universalcodegrep-0.2.2-038e498679dcce932469089ff794176e44d7024c.tar.gz) = 448d52a3a413996aa71d2365c59293cc539080e4
+SHA512 (universalcodegrep-0.2.2-038e498679dcce932469089ff794176e44d7024c.tar.gz) = fe2ec25dde1743ec57539a9aa0a1def2b73fce56266579e20940a19a2696930b115b8cd256d397f98cf7784266e0991781ee02c5a5668fe4336e2cdc43f97a30
+Size (universalcodegrep-0.2.2-038e498679dcce932469089ff794176e44d7024c.tar.gz) = 171356 bytes
+SHA1 (patch-configure.ac) = afc28eb7dd5d618f08631c8c92ed2e353d8488d5
diff --git a/universalcodegrep/patches/patch-configure.ac b/universalcodegrep/patches/patch-configure.ac
new file mode 100644
index 0000000..44656eb
--- /dev/null
+++ b/universalcodegrep/patches/patch-configure.ac
@@ -0,0 +1,48 @@
+$NetBSD$
+
+Disable broken script(1) test.
+https://github.com/gvansickle/ucg/issues/99
+
+--- configure.ac.orig	2016-09-30 13:40:33.000000000 +0000
++++ configure.ac
+@@ -126,23 +126,23 @@ AS_IF([ test "x$ac_path_ESED_found" = "x
+ # The testsuite needs a way to invoke "script", to fool ucg into thinking it's outputting to a tty.
+ # Of course, Linux and *BSD (including OSX) "script"'s take different options and parameters, so we
+ # try to sort it out here.
+-AC_PATH_PROG([PROG_SCRIPT], [script], [:])
+-AC_MSG_CHECKING([$PROG_SCRIPT's command line type])
+-AS_IF([$PROG_SCRIPT -qfc "echo hello" /dev/null > /dev/null 2>&1],
+-		[
+-		AC_SUBST([PROG_SCRIPT_TYPE], [linux])
+-		AC_SUBST([PROG_SCRIPT_PRE_TEXT], ['-qfc'])
+-		AC_SUBST([PROG_SCRIPT_POST_TEXT], ['/dev/null'])
+-		AC_MSG_RESULT([Linux style])
+-		],
+-      [$PROG_SCRIPT -q /dev/null echo "hello" > /dev/null 2>&1],
+-		[
+-		AC_SUBST([PROG_SCRIPT_TYPE], [bsd])
+-		AC_SUBST([PROG_SCRIPT_PRE_TEXT], ['-q /dev/null'])
+-		AC_SUBST([PROG_SCRIPT_POST_TEXT], [])
+-		AC_MSG_RESULT([BSD style])
+-		],
+-      [AC_MSG_ERROR([could not determine how to invoke $PROG_SCRIPT])])
++#AC_PATH_PROG([PROG_SCRIPT], [script], [:])
++#AC_MSG_CHECKING([$PROG_SCRIPT's command line type])
++#AS_IF([$PROG_SCRIPT -qfc "echo hello" /dev/null > /dev/null 2>&1],
++		#[
++		#AC_SUBST([PROG_SCRIPT_TYPE], [linux])
++		#AC_SUBST([PROG_SCRIPT_PRE_TEXT], ['-qfc'])
++		#AC_SUBST([PROG_SCRIPT_POST_TEXT], ['/dev/null'])
++		#AC_MSG_RESULT([Linux style])
++		#],
++      #[$PROG_SCRIPT -q /dev/null echo "hello" > /dev/null 2>&1],
++		#[
++		#AC_SUBST([PROG_SCRIPT_TYPE], [bsd])
++		#AC_SUBST([PROG_SCRIPT_PRE_TEXT], ['-q /dev/null'])
++		#AC_SUBST([PROG_SCRIPT_POST_TEXT], [])
++		#AC_MSG_RESULT([BSD style])
++		#],
++      #[AC_MSG_ERROR([could not determine how to invoke $PROG_SCRIPT])])
+ 
+ AC_PROG_MKDIR_P
+ AC_PROG_EGREP
diff --git a/universalcodegrep/patches/patch-src_ArgParse.cpp b/universalcodegrep/patches/patch-src_ArgParse.cpp
deleted file mode 100644
index 11a7368..0000000
--- a/universalcodegrep/patches/patch-src_ArgParse.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-https://github.com/gvansickle/ucg/issues/96
-
---- src/ArgParse.cpp.orig	2016-04-11 00:11:55.000000000 +0000
-+++ src/ArgParse.cpp
-@@ -663,6 +663,7 @@ std::string ArgParse::GetProjectRCFilena
- 	char *current_cwd = original_cwd;
- 	while((current_cwd != nullptr) && (current_cwd[0] != '.'))
- 	{
-+		char *prev_cwd;
- 		// If we were able to get a file descriptor to $HOME above...
- 		if(home_fd != -1)
- 		{
-@@ -710,7 +711,9 @@ std::string ArgParse::GetProjectRCFilena
- 		}
- 
- 		// Go up one directory.
--		current_cwd = dirname(current_cwd);
-+		prev_cwd = strdup(current_cwd);
-+		current_cwd = dirname(prev_cwd);
-+		free(prev_cwd);
- 	}
- 
- 	// Free the cwd string.
diff --git a/universalcodegrep/patches/patch-src_MemDiags.cpp b/universalcodegrep/patches/patch-src_MemDiags.cpp
deleted file mode 100644
index 562c3e8..0000000
--- a/universalcodegrep/patches/patch-src_MemDiags.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-https://github.com/gvansickle/ucg/issues/97
-
---- src/MemDiags.cpp.orig	2016-03-31 00:05:28.000000000 +0000
-+++ src/MemDiags.cpp
-@@ -28,5 +28,7 @@ MemDiags::MemDiags()
- 
- void MemDiags::PrintStats() const
- {
-+#ifndef __NetBSD__
- 	malloc_stats();
-+#endif
- }