svn commit: r309101 - head/deskutils/recoll

[Wesley Shields]

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 at 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
- at dirrmtry %%PYTHON_SITELIBDIR%%
- at dirrmtry %%PYTHON_LIBDIR%%