svn commit: r308461 - in head/sysutils/searchmonkey: . files

[Beech Rintoul]

Author: beech
Date: Sat Dec  8 04:04:47 2012
New Revision: 308461
URL: http://svnweb.freebsd.org/changeset/ports/308461

Log:
  - Fix build with clang
  - Support CXXFLAGS properly
  - Add LICENSE
  
  New file:
  files/patch-Utility.h
  
  Feature safe: yes
  
  PR:		ports/174171
  Submitted by:	KATO Tsuguru <tkato432 at yahoo.com>

Added:
  head/sysutils/searchmonkey/files/
  head/sysutils/searchmonkey/files/patch-Utility.h   (contents, props changed)
Modified:
  head/sysutils/searchmonkey/Makefile   (contents, props changed)

Modified: head/sysutils/searchmonkey/Makefile
==============================================================================
--- head/sysutils/searchmonkey/Makefile	Sat Dec  8 03:16:50 2012	(r308460)
+++ head/sysutils/searchmonkey/Makefile	Sat Dec  8 04:04:47 2012	(r308461)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	searchmonkey
-# Date created:		26 August 2006
-# Whom:			Andrew Pantyukhin <infofarmer at FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	searchmonkey
 PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/Searchmonkey2/${PORTVERSION}%20%5Bstable%5D
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
@@ -15,17 +11,20 @@ DISTNAME=	${PORTNAME}_v${PORTVERSION}
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Search using regexes for file names and text
 
+LICENSE=	GPLv3 # (or later)
+
 USE_ZIP=	yes
+USE_DOS2UNIX=	*.cpp *.h
 USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${PORTNAME}_2_0.pro \
-		-spec ${QMAKESPEC}
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${PORTNAME}_2_0.pro \
+		${QMAKEFLAGS})
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin)
 
 .include <bsd.port.mk>

Added: head/sysutils/searchmonkey/files/patch-Utility.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/searchmonkey/files/patch-Utility.h	Sat Dec  8 04:04:47 2012	(r308461)
@@ -0,0 +1,35 @@
+--- Utility.h.orig	2010-05-16 20:37:32.000000000 +0900
++++ Utility.h	2012-10-17 06:41:46.000000000 +0900
+@@ -92,16 +92,6 @@
+     CallEach(observers, searchable, &Subject::Register);
+     here the Subject is the type of Caller
+ */
+-template <typename CalleeContainer, typename Caller, typename Op>
+-void CallEach(const CalleeContainer& container, Caller& caller, Op op)
+-{
+-    for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller));
+-}
+-template <typename T>
+-bool IsValueInRange(T value, T lowerBound, T upperBound)
+-{
+-    return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound);
+-}
+ template <typename T>
+ bool BoundSpecified(T boundValue)
+ {
+@@ -129,5 +119,15 @@
+ 
+     return false;
+ }
++template <typename CalleeContainer, typename Caller, typename Op>
++void CallEach(const CalleeContainer& container, Caller& caller, Op op)
++{
++    for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller));
++}
++template <typename T>
++bool IsValueInRange(T value, T lowerBound, T upperBound)
++{
++    return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound);
++}
+ 
+ #endif