svn commit: r332962 - in head/deskutils/recoll: . files

[Rusmir Dusko]

Author: nemysis
Date: Wed Nov  6 10:47:22 2013
New Revision: 332962
URL: http://svnweb.freebsd.org/changeset/ports/332962

Log:
  - Update to 1.19.8
  - Change REINPLACE_CMD, recollq isn't QT
  - Remove obsolete patches
  
  Approved by:	pawel / wg (mentors, implicit)

Deleted:
  head/deskutils/recoll/files/
Modified:
  head/deskutils/recoll/Makefile
  head/deskutils/recoll/distinfo
  head/deskutils/recoll/pkg-plist

Modified: head/deskutils/recoll/Makefile
==============================================================================
--- head/deskutils/recoll/Makefile	Wed Nov  6 09:51:38 2013	(r332961)
+++ head/deskutils/recoll/Makefile	Wed Nov  6 10:47:22 2013	(r332962)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	recoll
-PORTVERSION=	1.19.7
+PORTVERSION=	1.19.8
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.lesbonscomptes.com/${PORTNAME}/
 
@@ -37,7 +37,7 @@ X11MON_CONFIGURE_ENABLE=	x11mon
 
 .include <bsd.port.options.mk>
 
-PLIST_SUB+=	MAJORVER=${PORTVERSION}
+PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
@@ -61,14 +61,12 @@ CONFIGURE_ARGS+=--with-fam
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|$${MAKE} -C query recollq|@NOQTMAKE@$${MAKE} -C query recollq|' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} \
 		-e 's|/usr/local/lib|${LOCALBASE}/lib|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		-e 's|= -g -O2|=|' ${WRKSRC}/mk/localdefs.in
 	@${REINPLACE_CMD} \
 		-e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/mk/${OPSYS}
-	@${REINPLACE_CMD} -e 's|@NOCMDLINE@|@NOQTMAKE@|g' \
+	@${REINPLACE_CMD} -e 's|@NOCMDLINE@||g' \
 		${WRKSRC}/recollinstall.in
 
 post-configure:

Modified: head/deskutils/recoll/distinfo
==============================================================================
--- head/deskutils/recoll/distinfo	Wed Nov  6 09:51:38 2013	(r332961)
+++ head/deskutils/recoll/distinfo	Wed Nov  6 10:47:22 2013	(r332962)
@@ -1,2 +1,2 @@
-SHA256 (recoll-1.19.7.tar.gz) = 6d647f4c17282994cefb37e068cfb571cf9de14a22087701c59ff8c78a4e0b9d
-SIZE (recoll-1.19.7.tar.gz) = 2005198
+SHA256 (recoll-1.19.8.tar.gz) = 90ec363a6267c9a63754f47f09a6fa84e9d47d92956d687e7cb434c8a019f5f7
+SIZE (recoll-1.19.8.tar.gz) = 2012818

Modified: head/deskutils/recoll/pkg-plist
==============================================================================
--- head/deskutils/recoll/pkg-plist	Wed Nov  6 09:51:38 2013	(r332961)
+++ head/deskutils/recoll/pkg-plist	Wed Nov  6 10:47:22 2013	(r332962)
@@ -1,16 +1,16 @@
 %%QT4%%bin/recoll
 bin/recollindex
-%%QT4%%bin/recollq
+bin/recollq
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclconfig.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclextract.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/recoll.so
-lib/recoll/librecoll.so.%%MAJORVER%%
+lib/recoll/librecoll.so.%%VERSION%%
 %%QT4%%man/man1/recoll.1.gz
 man/man1/recollindex.1.gz
-%%QT4%%man/man1/recollq.1.gz
+man/man1/recollq.1.gz
 man/man5/recoll.conf.5.gz
 %%QT4%%share/applications/recoll-searchgui.desktop
 %%QT4%%share/icons/hicolor/48x48/apps/recoll.png