From nemysis@gmx.ch  Wed May 22 21:01:39 2013
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 7F03216AA
	for <freebsd-gnats-submit@freebsd.org>; Wed, 22 May 2013 21:01:39 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.18])
	by mx1.freebsd.org (Postfix) with ESMTP id 27A7B289
	for <freebsd-gnats-submit@freebsd.org>; Wed, 22 May 2013 21:01:38 +0000 (UTC)
Received: from mailout-de.gmx.net ([10.1.76.2]) by mrigmx.server.lan
 (mrigmx002) with ESMTP (Nemesis) id 0Lur0x-1UWMJX0rKr-0104ak for
 <FreeBSD-gnats-submit@freebsd.org>; Wed, 22 May 2013 23:01:38 +0200
Received: (qmail invoked by alias); 22 May 2013 21:01:37 -0000
Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5]
  by mail.gmx.net (mp002) with SMTP; 22 May 2013 23:01:37 +0200
Received: by something.email.com (sSMTP sendmail emulation); Wed, 22 May 2013 23:01:36 +0200
Message-Id: <20130522210139.7F03216AA@hub.freebsd.org>
Date: Wed, 22 May 2013 23:01:36 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: miwi@FreeBSD.org
Subject: [MAINTAINER] deskutils/recoll: update to 1.18.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         178843
>Category:       ports
>Synopsis:       [MAINTAINER] deskutils/recoll: update to 1.18.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 22 21:10:00 UTC 2013
>Closed-Date:    Fri Jun 07 15:39:47 UTC 2013
>Last-Modified:  Fri Jun  7 15:40:00 UTC 2013
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0: Tue Jan 29 15:02:50 EST 2013
>Description:
- Update to 1.18.2
- Shorten header
- Trim dependency for databases/xapian-core
- Add Portscout
- Trim pkg-plist, remove mtree

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

Version 1.19.2 can't be builded.

Build log

https://redports.org/buildarchive/20130418154100-2543/

>Fix:

--- recoll-1.18.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/deskutils/recoll/Makefile ./Makefile
--- /usr/ports/deskutils/recoll/Makefile	2013-04-29 12:53:42.000000000 +0200
+++ ./Makefile	2013-05-22 22:51:40.000000000 +0200
@@ -1,24 +1,19 @@
-# New ports collection makefile for:   recoll
-# Date created:        5 December 2005
-# Whom:                J.F. Dockes <jean-francois.dockes@wanadoo.fr>
-#
+# Created by: J.F. Dockes <jean-francois.dockes@wanadoo.fr>
 # $FreeBSD: head/deskutils/recoll/Makefile 316654 2013-04-27 08:50:46Z mva $
-#
 
 PORTNAME=	recoll
-PORTVERSION=	1.18.1
-PORTREVISION=	1
+PORTVERSION=	1.18.2
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
+MASTER_SITES=	http://www.lesbonscomptes.com/${PORTNAME}/
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Personal full text search package, based on Xapian
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	xapian:${PORTSDIR}/databases/xapian-core
+BUILD_DEPENDS=	xapian-core>=0:${PORTSDIR}/databases/xapian-core
 
-USES=		iconv
+USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -30,8 +25,11 @@
 MAN5=		recoll.conf.5
 
 OPTIONS_DEFINE=	QT4 ASPELL PYTHON X11MON
-OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
 X11MON_DESC=	X11 session monitoring support
+OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
+
+# Wrong versioning upstream
+PORTSCOUT=	skipv:1.19
 
 .include <bsd.port.options.mk>
 
diff -ruN --exclude=CVS /usr/ports/deskutils/recoll/distinfo ./distinfo
--- /usr/ports/deskutils/recoll/distinfo	2013-01-14 17:54:27.000000000 +0100
+++ ./distinfo	2013-05-22 22:52:29.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (recoll-1.18.1.tar.gz) = 8ea01dc64002b594b7ca08cf40c5581963bd98617d8ab5554164a8af4a9fd933
-SIZE (recoll-1.18.1.tar.gz) = 2026276
+SHA256 (recoll-1.18.2.tar.gz) = 4729785354bd0d465c92e7d2a6fced688d8c08f1342a9bef2f040e7b10b1f510
+SIZE (recoll-1.18.2.tar.gz) = 1969421
diff -ruN --exclude=CVS /usr/ports/deskutils/recoll/pkg-plist ./pkg-plist
--- /usr/ports/deskutils/recoll/pkg-plist	2013-01-14 17:54:27.000000000 +0100
+++ ./pkg-plist	2013-04-18 16:47:19.000000000 +0200
@@ -86,6 +86,7 @@
 %%DATADIR%%/images/spreadsheet.png
 %%DATADIR%%/images/text-x-python.png
 %%DATADIR%%/images/txt.png
+%%DATADIR%%/images/video.png
 %%DATADIR%%/images/wordprocessing.png
 %%DATADIR%%/translations/recoll_cs.qm
 %%DATADIR%%/translations/recoll_de.qm
@@ -106,8 +107,4 @@
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry share/applications
+%%QT%%@dirrmtry share/applications
--- recoll-1.18.2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed May 22 21:10:08 UTC 2013 
Responsible-Changed-Why:  
beech@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178843 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Jun 7 15:39:47 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178843 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/178843: commit references a PR
Date: Fri,  7 Jun 2013 15:39:39 +0000 (UTC)

 Author: miwi
 Date: Fri Jun  7 15:39:29 2013
 New Revision: 320216
 URL: http://svnweb.freebsd.org/changeset/ports/320216
 
 Log:
   - Update to 1.18.2
   - Shorten header
   - Trim dependency
   - Add Portscout
   - Trim pkg-plist, remove mtree
   
   PR:		178843
   Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)
 
 Modified:
   head/deskutils/recoll/Makefile
   head/deskutils/recoll/distinfo
   head/deskutils/recoll/pkg-plist
 
 Modified: head/deskutils/recoll/Makefile
 ==============================================================================
 --- head/deskutils/recoll/Makefile	Fri Jun  7 15:37:47 2013	(r320215)
 +++ head/deskutils/recoll/Makefile	Fri Jun  7 15:39:29 2013	(r320216)
 @@ -1,24 +1,19 @@
 -# New ports collection makefile for:   recoll
 -# Date created:        5 December 2005
 -# Whom:                J.F. Dockes <jean-francois.dockes@wanadoo.fr>
 -#
 +# Created by: J.F. Dockes <jean-francois.dockes@wanadoo.fr>
  # $FreeBSD$
 -#
  
  PORTNAME=	recoll
 -PORTVERSION=	1.18.1
 -PORTREVISION=	1
 +PORTVERSION=	1.18.2
  CATEGORIES=	deskutils
 -MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
 +MASTER_SITES=	http://www.lesbonscomptes.com/${PORTNAME}/
  
  MAINTAINER=	nemysis@gmx.ch
  COMMENT=	Personal full text search package, based on Xapian
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	xapian:${PORTSDIR}/databases/xapian-core
 +BUILD_DEPENDS=	xapian-core>=0:${PORTSDIR}/databases/xapian-core
  
 -USES=		iconv
 +USE_ICONV=	yes
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  MAKE_JOBS_SAFE=	yes
 @@ -30,8 +25,11 @@ MAN1=		recollindex.1
  MAN5=		recoll.conf.5
  
  OPTIONS_DEFINE=	QT4 ASPELL PYTHON X11MON
 -OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
  X11MON_DESC=	X11 session monitoring support
 +OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
 +
 +# Wrong versioning upstream
 +PORTSCOUT=	skipv:1.19
  
  .include <bsd.port.options.mk>
  
 
 Modified: head/deskutils/recoll/distinfo
 ==============================================================================
 --- head/deskutils/recoll/distinfo	Fri Jun  7 15:37:47 2013	(r320215)
 +++ head/deskutils/recoll/distinfo	Fri Jun  7 15:39:29 2013	(r320216)
 @@ -1,2 +1,2 @@
 -SHA256 (recoll-1.18.1.tar.gz) = 8ea01dc64002b594b7ca08cf40c5581963bd98617d8ab5554164a8af4a9fd933
 -SIZE (recoll-1.18.1.tar.gz) = 2026276
 +SHA256 (recoll-1.18.2.tar.gz) = 4729785354bd0d465c92e7d2a6fced688d8c08f1342a9bef2f040e7b10b1f510
 +SIZE (recoll-1.18.2.tar.gz) = 1969421
 
 Modified: head/deskutils/recoll/pkg-plist
 ==============================================================================
 --- head/deskutils/recoll/pkg-plist	Fri Jun  7 15:37:47 2013	(r320215)
 +++ head/deskutils/recoll/pkg-plist	Fri Jun  7 15:39:29 2013	(r320216)
 @@ -86,6 +86,7 @@ bin/recollindex
  %%DATADIR%%/images/spreadsheet.png
  %%DATADIR%%/images/text-x-python.png
  %%DATADIR%%/images/txt.png
 +%%DATADIR%%/images/video.png
  %%DATADIR%%/images/wordprocessing.png
  %%DATADIR%%/translations/recoll_cs.qm
  %%DATADIR%%/translations/recoll_de.qm
 @@ -106,8 +107,4 @@ bin/recollindex
  @dirrm %%DATADIR%%/examples
  @dirrm %%DATADIR%%/doc
  @dirrm %%DATADIR%%
 -@dirrmtry share/icons/hicolor/48x48/apps
 -@dirrmtry share/icons/hicolor/48x48
 -@dirrmtry share/icons/hicolor
 -@dirrmtry share/icons
 -@dirrmtry share/applications
 +%%QT%%@dirrmtry share/applications
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
