Upgrade to latest release and fix build issues

[Charlie Root <root%netbsddev.local.hpc.uwm.edu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Charlie Root <root%netbsddev.local.hpc.uwm.edu@localhost>
Pushed By:	outpaddling
Date:		Mon Sep 12 12:39:27 2016 -0500
Changeset:	9826666cb6fdb317480372191fd39dca571ce854

Modified Files:
	gflags/DESCR
	gflags/Makefile
	gflags/PLIST
	gflags/buildlink3.mk
	gflags/distinfo

Log Message:
Upgrade to latest release and fix build issues

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

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

diffstat:
 gflags/DESCR         |  7 ++++---
 gflags/Makefile      | 39 ++++++++++++++++++++++++++-------------
 gflags/PLIST         | 12 ++++++++----
 gflags/buildlink3.mk |  5 ++---
 gflags/distinfo      |  7 ++++---
 5 files changed, 44 insertions(+), 26 deletions(-)

diffs:
diff --git a/gflags/DESCR b/gflags/DESCR
index 9ea23b6..df1566c 100644
--- a/gflags/DESCR
+++ b/gflags/DESCR
@@ -1,4 +1,5 @@
+gflags - Commandline flags module for C++
 The gflags package contains a library that implements commandline flags
-processing. As such it's a replacement for getopt(). Is has increased
-flexibility, including built-in support for C++ types like string, and
-the ability to define flags in the source file in which they're used.
+processing. As such it's a replacement for getopt(). It has increased
+flexibility, including built-in support for C++ types like string, and the
+ability to define flags in the source file in which they're used.
diff --git a/gflags/Makefile b/gflags/Makefile
index 79d3e79..68b464d 100644
--- a/gflags/Makefile
+++ b/gflags/Makefile
@@ -1,24 +1,37 @@
 # $NetBSD: Makefile,v 1.1 2014/11/29 16:22:45 nros Exp $
+#
+###########################################################
+#                  Generated by fbsd2pkg                  #
+#              Mon Sep 12 11:06:58 CDT 2016               #
+###########################################################
 
-DISTNAME= 	gflags-2.1.1
-CATEGORIES= 	devel
-MASTER_SITES=	-https://github.com/schuhschuh/gflags/archive/v${PKGVERSION_NOREV}.tar.gz
-EXTRACT_USING=	bsdtar
+DISTNAME=	gflags-${PORTVERSION}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=gflags/}
+GITHUB_PROJECT=	gflags
+GITHUB_TAG=	v${PORTVERSION}
+
+MAINTAINER=	bacon4000%gmail.com@localhost
+HOMEPAGE=	https://github.com/gflags/gflags
+COMMENT=	Commandline flags module for C++
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://code.google.com/p/gflags/
-COMMENT=	Commandline flags processing library
 LICENSE=	modified-bsd
 
-USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	bash:run
+REPLACE_BASH=	src/gflags_completions.sh
+USE_CMAKE=	yes
+# Check this
+CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
+		-DBUILD_SHARED_LIBS:BOOL=ON \
+		-DBUILD_STATIC_LIBS:BOOL=ON \
+		-DBUILD_TESTING:BOOL=ON \
+		-DGFLAGS_NAMESPACE:STRING=gflags
 
-CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON
-CMAKE_ARGS+=	-DBUILD_STATIC_LIBS:BOOL=ON
-PTHREAD_OPTS+=	require
+TEST_TARGET=	test
 
-REPLACE_BASH=	src/gflags_completions.sh
+PORTVERSION=	2.1.2
 
-.include "../../mk/pthread.buildlink3.mk"
+# From old version.  Is this needed?
+# .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gflags/PLIST b/gflags/PLIST
index f086f73..fef1c1a 100644
--- a/gflags/PLIST
+++ b/gflags/PLIST
@@ -1,13 +1,17 @@
 @comment $NetBSD: PLIST,v 1.1 2014/11/29 16:22:45 nros Exp $
 bin/gflags_completions.sh
-include/gflags/gflags.h
 include/gflags/gflags_completions.h
 include/gflags/gflags_declare.h
-lib/cmake/gflags/gflags-config-version.cmake
+include/gflags/gflags.h
 lib/cmake/gflags/gflags-config.cmake
-lib/cmake/gflags/gflags-export-noconfig.cmake
+lib/cmake/gflags/gflags-config-version.cmake
 lib/cmake/gflags/gflags-export.cmake
+lib/cmake/gflags/gflags-export-release.cmake
 lib/libgflags.a
-lib/libgflags.so
 lib/libgflags_nothreads.a
 lib/libgflags_nothreads.so
+lib/libgflags_nothreads.so.2
+lib/libgflags_nothreads.so.${PKGVERSION}
+lib/libgflags.so
+lib/libgflags.so.2
+lib/libgflags.so.${PKGVERSION}
diff --git a/gflags/buildlink3.mk b/gflags/buildlink3.mk
index 9bc418d..aa82a3a 100644
--- a/gflags/buildlink3.mk
+++ b/gflags/buildlink3.mk
@@ -1,13 +1,12 @@
 # $NetBSD: buildlink3.mk,v 1.1 2014/11/29 19:31:38 nros Exp $
-#
 
 BUILDLINK_TREE+=	gflags
 
 .if !defined(GFLAGS_BUILDLINK3_MK)
 GFLAGS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gflags+=	gflags>=2.1.1
-BUILDLINK_PKGSRCDIR.gflags?=	../../wip/gflags
+BUILDLINK_API_DEPENDS.gflags+=	gflags>=2.1.2
+BUILDLINK_PKGSRCDIR.gflags?=	../../jb-wip/gflags
 .endif	# GFLAGS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gflags
diff --git a/gflags/distinfo b/gflags/distinfo
index 81719c0..ffe7663 100644
--- a/gflags/distinfo
+++ b/gflags/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.1 2014/11/29 16:22:45 nros Exp $
 
-SHA1 (gflags-2.1.1.tar.gz) = 59b37548b10daeaa87a3093a11d13c2442ac6849
-RMD160 (gflags-2.1.1.tar.gz) = 5b28a31004674a7a7c2585d9025222b8a99a71a2
-Size (gflags-2.1.1.tar.gz) = 102015 bytes
+SHA1 (gflags-2.1.2.tar.gz) = 8bdbade9d041339dc14b4ab426e2354a5af38478
+RMD160 (gflags-2.1.2.tar.gz) = c43a4b98d72f3093e4a6268c6a656667856d2401
+SHA512 (gflags-2.1.2.tar.gz) = f636023c1150e4d536d2d472e40d643ff0b02d3c96d8cb7f31544df23e6255fa6c4fd927ef94a3660c250d3faeae7d8d78519fc5e856749a577347a78d9d9ab5
+Size (gflags-2.1.2.tar.gz) = 95716 bytes