svn commit: r367782 - head/deskutils/pinot

[Tijl Coosemans]

Author: tijl
Date: Tue Sep  9 21:09:29 2014
New Revision: 367782
URL: http://svnweb.freebsd.org/changeset/ports/367782
QAT: https://qat.redports.org/buildarchive/r367782/

Log:
  - Add explicit build dependency on misc/shared-mime-info
  - Add USES=libtool and convert to USES=python

Modified:
  head/deskutils/pinot/Makefile
  head/deskutils/pinot/pkg-plist

Modified: head/deskutils/pinot/Makefile
==============================================================================
--- head/deskutils/pinot/Makefile	Tue Sep  9 21:05:28 2014	(r367781)
+++ head/deskutils/pinot/Makefile	Tue Sep  9 21:09:29 2014	(r367782)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pinot
 PORTVERSION=	1.06
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	deskutils
 MASTER_SITES=	GOOGLE_CODE
 #MASTER_SITES=	http://colinf.chez.com/pinot/
@@ -14,7 +14,8 @@ COMMENT=	Personal search and metasearch 
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
+BUILD_DEPENDS=	desktop-file-install:${PORTSDIR}/devel/desktop-file-utils \
+		update-mime-database:${PORTSDIR}/misc/shared-mime-info
 LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core		\
 		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24	\
 		libexttextcat-2.0.so:${PORTSDIR}/textproc/libexttextcat	\
@@ -38,16 +39,15 @@ RUN_DEPENDS=	update-mime-database:${PORT
 
 PROJECTHOST=	${PORTNAME}-search
 
-LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive	\
 		--enable-mempool=no
 CONFIGURE_ENV=	MKDIR_P="${MKDIR}"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
-USES=		gettext pkgconfig shebangfix
+USES=		gettext libtool pkgconfig python shebangfix
 USE_OPENSSL=	yes
-USE_PYTHON=	yes
 USE_SQLITE=	3
 USE_XORG=	pixman
 USE_LDCONFIG=	${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters
@@ -81,7 +81,6 @@ post-patch:
 		${WRKSRC}/Tokenize/filters/external-filters.xml
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|-lthr|${PTHREAD_LIBS}|' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|'	\
 		${LM2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|libtextcat/|libtextcat/LM/|'	\

Modified: head/deskutils/pinot/pkg-plist
==============================================================================
--- head/deskutils/pinot/pkg-plist	Tue Sep  9 21:05:28 2014	(r367781)
+++ head/deskutils/pinot/pkg-plist	Tue Sep  9 21:09:29 2014	(r367782)
@@ -79,26 +79,17 @@ include/pinot/xdgmime/xdgmimemagic.h
 include/pinot/xdgmime/xdgmimeparent.h
 lib/pinot/backends/libxapianbackend.so
 lib/pinot/backends/libxapianbackend.so.1
+lib/pinot/backends/libxapianbackend.so.1.0.0
 lib/pinot/libBasicUtils.a
-lib/pinot/libBasicUtils.la
 lib/pinot/libCollect.a
-lib/pinot/libCollect.la
 lib/pinot/libCore.a
-lib/pinot/libCore.la
 lib/pinot/libFilter.a
-lib/pinot/libFilter.la
 lib/pinot/libIndex.a
-lib/pinot/libIndex.la
 lib/pinot/libIndexSearch.a
-lib/pinot/libIndexSearch.la
 lib/pinot/libMonitor.a
-lib/pinot/libMonitor.la
 lib/pinot/libSQL.a
-lib/pinot/libSQL.la
 lib/pinot/libTokenize.a
-lib/pinot/libTokenize.la
 lib/pinot/libUtils.a
-lib/pinot/libUtils.la
 lib/pinot/filters/libarchivefilter.so
 %%CHMLIB%%lib/pinot/filters/libchmfilter.so
 lib/pinot/filters/libexiv2imagefilter.so