From owner-svn-ports-head@FreeBSD.ORG  Thu Nov  7 15:37:33 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F3EEAD8E;
 Thu,  7 Nov 2013 15:37:32 +0000 (UTC)
 (envelope-from clsung@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C6BB32895;
 Thu,  7 Nov 2013 15:37:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA7FbWj9039102;
 Thu, 7 Nov 2013 15:37:32 GMT (envelope-from clsung@svn.freebsd.org)
Received: (from clsung@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA7FbWpm039100;
 Thu, 7 Nov 2013 15:37:32 GMT (envelope-from clsung@svn.freebsd.org)
Message-Id: <201311071537.rA7FbWpm039100@svn.freebsd.org>
From: Cheng-Lung Sung <clsung@FreeBSD.org>
Date: Thu, 7 Nov 2013 15:37:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333122 - in head/devel/glog: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Nov 2013 15:37:33 -0000

Author: clsung
Date: Thu Nov  7 15:37:32 2013
New Revision: 333122
URL: http://svnweb.freebsd.org/changeset/ports/333122

Log:
  convert to STAGE

Added:
  head/devel/glog/files/
  head/devel/glog/files/patch-stl_logging.h.in   (contents, props changed)
Modified:
  head/devel/glog/Makefile

Modified: head/devel/glog/Makefile
==============================================================================
--- head/devel/glog/Makefile	Thu Nov  7 15:35:14 2013	(r333121)
+++ head/devel/glog/Makefile	Thu Nov  7 15:37:32 2013	(r333122)
@@ -13,14 +13,13 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/
 		gflags:${PORTSDIR}/devel/gflags
 
 GNU_CONFIGURE=	yes
-USES=	pathfix
+USES=		pathfix
 USE_LDCONFIG=	yes
 PROJECTHOST=	google-glog
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
@@ -30,7 +29,7 @@ post-patch:
 	    ${WRKSRC}/Makefile.in
 .endif
 
-#regression-test:
-#	cd ${WRKSRC}; ${MAKE} check
+regression-test:
+	cd ${WRKSRC}; ${MAKE} check
 
 .include <bsd.port.post.mk>

Added: head/devel/glog/files/patch-stl_logging.h.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/glog/files/patch-stl_logging.h.in	Thu Nov  7 15:37:32 2013	(r333122)
@@ -0,0 +1,28 @@
+--- src/glog/stl_logging.h.in.orig	2013-01-09 21:57:36.000000000 +0800
++++ src/glog/stl_logging.h.in	2013-09-20 19:39:39.000000000 +0800
+@@ -53,8 +53,12 @@
+ #ifdef __GNUC__
+ # include <ext/hash_set>
+ # include <ext/hash_map>
++#ifdef _LIBCPP_VERSION
++# include <forward_list>
++#else
+ # include <ext/slist>
+ #endif
++#endif
+ 
+ // Forward declare these two, and define them after all the container streams
+ // operators so that we can recurse from pair -> container -> container -> pair
+@@ -81,8 +85,12 @@ OUTPUT_TWO_ARG_CONTAINER(std::vector)
+ OUTPUT_TWO_ARG_CONTAINER(std::deque)
+ OUTPUT_TWO_ARG_CONTAINER(std::list)
+ #ifdef __GNUC__
++#ifdef _LIBCPP_VERSION
++OUTPUT_TWO_ARG_CONTAINER(std::forward_list)
++#else
+ OUTPUT_TWO_ARG_CONTAINER(__gnu_cxx::slist)
+ #endif
++#endif
+ 
+ #undef OUTPUT_TWO_ARG_CONTAINER
+