diff options
| author | Beech Rintoul <beech@FreeBSD.org> | 2012-12-08 04:04:47 +0000 |
|---|---|---|
| committer | Beech Rintoul <beech@FreeBSD.org> | 2012-12-08 04:04:47 +0000 |
| commit | 6a432a3c7f991c3a36cad136eae58661921c2f5a (patch) | |
| tree | e853a09da7ccaa56a6e832926f771fbce8168413 /sysutils | |
| parent | Add RUN_DEPENDS= figlet:${PORTSDIR}/misc/figlet (diff) | |
- 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@yahoo.com>
Notes
Notes:
svn path=/head/; revision=308461
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/searchmonkey/Makefile | 17 | ||||
| -rw-r--r-- | sysutils/searchmonkey/files/patch-Utility.h | 35 |
2 files changed, 43 insertions, 9 deletions
diff --git a/sysutils/searchmonkey/Makefile b/sysutils/searchmonkey/Makefile index 09414c6bea91..0f3622c07e70 100644 --- a/sysutils/searchmonkey/Makefile +++ b/sysutils/searchmonkey/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: searchmonkey -# Date created: 26 August 2006 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# +# Created by: Andrew Pantyukhin <infofarmer@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@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> diff --git a/sysutils/searchmonkey/files/patch-Utility.h b/sysutils/searchmonkey/files/patch-Utility.h new file mode 100644 index 000000000000..18ac07b0b605 --- /dev/null +++ b/sysutils/searchmonkey/files/patch-Utility.h @@ -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 |