From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 17 15:17:49 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E888ECF1;
 Mon, 17 Dec 2012 15:17:49 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B10CB8FC0A;
 Mon, 17 Dec 2012 15:17:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHFHn8U012894;
 Mon, 17 Dec 2012 15:17:49 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHFHnlj012890;
 Mon, 17 Dec 2012 15:17:49 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201212171517.qBHFHnlj012890@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Mon, 17 Dec 2012 15:17:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309101 - head/deskutils/recoll
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Dec 2012 15:17:50 -0000

Author: wxs
Date: Mon Dec 17 15:17:48 2012
New Revision: 309101
URL: http://svnweb.freebsd.org/changeset/ports/309101

Log:
  Fixup plist and USE_QT4 to be more accurate.
  
  Submitted by:	nemysis <nemysis@gmx.ch> (maintainer, private mail)

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

Modified: head/deskutils/recoll/Makefile
==============================================================================
--- head/deskutils/recoll/Makefile	Mon Dec 17 15:10:35 2012	(r309100)
+++ head/deskutils/recoll/Makefile	Mon Dec 17 15:17:48 2012	(r309101)
@@ -25,7 +25,7 @@ MAKE_JOBS_SAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		recollindex.1 recollq.1
+MAN1=		recollindex.1
 MAN5=		recoll.conf.5
 
 OPTIONS_DEFINE=	QT4 ASPELL PYTHON X11MON
@@ -35,16 +35,17 @@ X11MON_DESC=	X11 session monitoring supp
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT4}
-USE_QT4=	webkit moc_build qmake_build rcc_build uic_build
+USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
+		corelib gui xml webkit
 QT_NONSTANDARD=	yes
 CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}"
+CONFIGURE_ARGS+=--enable-qtgui
 INSTALLS_ICONS=	yes
 PLIST_SUB+=	QT=""
-MAN1+=		recoll.1
+MAN1+=		recollq.1 recoll.1
 .else
 CONFIGURE_ARGS+=--disable-qtgui
 PLIST_SUB+=	QT="@comment "
-MAN1+=		recollq.1
 .endif
 
 .if ${PORT_OPTIONS:MASPELL}

Modified: head/deskutils/recoll/pkg-plist
==============================================================================
--- head/deskutils/recoll/pkg-plist	Mon Dec 17 15:10:35 2012	(r309100)
+++ head/deskutils/recoll/pkg-plist	Mon Dec 17 15:17:48 2012	(r309101)
@@ -1,7 +1,7 @@
 %%QT%%bin/recoll
-bin/recollq
 bin/recollindex
-%%PYTHON_SITELIBDIR%%/recoll.so
+%%QT%%bin/recollq
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll.so
 %%QT%%share/applications/recoll-searchgui.desktop
 %%QT%%share/icons/hicolor/48x48/apps/recoll.png
 %%QT%%share/pixmaps/recoll.png
@@ -111,5 +111,3 @@ bin/recollindex
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/applications
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%