build with clang

x11/pinot/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.64 2017/04/10 11:46:36 sthen Exp $
+# $OpenBSD: Makefile,v 1.65 2017/05/21 12:34:39 espie Exp $
 
 COMMENT=	personal search and metasearch
 
@@ -29,9 +29,7 @@ WANTLIB += xml++-2.6 xml2 z
 MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=pinot-search/}
 
 # c++11
-MODULES +=		gcc4
-MODGCC4_ARCHS=		*
-MODGCC4_LANGS=		c++
+WANT_CXX =		base gcc
 
 BUILD_DEPENDS=	devel/boost \
 		devel/desktop-file-utils \

x11/pinot/patches/patch-IndexSearch_ModuleFactory_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-IndexSearch_ModuleFactory_cpp,v 1.1 2017/05/21 12:34:39 espie Exp $
+false is no pointer
+
+Index: IndexSearch/ModuleFactory.cpp
+--- IndexSearch/ModuleFactory.cpp.orig
++++ IndexSearch/ModuleFactory.cpp
+@@ -132,7 +132,7 @@ IndexInterface *ModuleFactory::getLibraryIndex(const s
+ 		(typeIter->second.m_canIndex == false))
+ 	{
+ 		// We don't know about this type, or doesn't support indexes
+-		return false;
++		return NULL;
+ 	}
+ 
+ 	void *pHandle = typeIter->second.m_pHandle;

x11/pinot/patches/patch-Tokenize_filters_GMimeMboxFilter_cc

@@ -0,0 +1,15 @@
+$OpenBSD: patch-Tokenize_filters_GMimeMboxFilter_cc,v 1.1 2017/05/21 12:34:39 espie Exp $
+C++11 wants spaces while gluing strings
+
+Index: Tokenize/filters/GMimeMboxFilter.cc
+--- Tokenize/filters/GMimeMboxFilter.cc.orig
++++ Tokenize/filters/GMimeMboxFilter.cc
+@@ -301,7 +301,7 @@ bool GMimeMboxFilter::skip_to_document(const string &i
+ 	}
+ 
+ 	// ipath's format is "o=offset&l=part_levels"
+-	if (sscanf(ipath.c_str(), "o="GMIME_OFFSET_MODIFIER"&l=[", &m_messageStart) != 1)
++	if (sscanf(ipath.c_str(), "o=" GMIME_OFFSET_MODIFIER "&l=[", &m_messageStart) != 1)
+ 	{
+ 		return false;
+ 	}