- Make dependency on python unconditional, as filters always require python

- Make python module installation unconditional, as disabling it no longer brings any profit
- Don't install compiled python files, which fixes installation with python3 as default
- Switch to USES=localbase
- Fix shebangs
- Simplify stripping
- Fix plist for WITHOUT=QT4 case
- Mark BROKEN with X11MON, required libfam is not linked which breaks the installation

1 files changed, 23 insertions, 23 deletions

diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 40e98980f7b9..8637970c2158 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	recoll
 PORTVERSION=	1.23.4
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
 
@@ -19,20 +20,27 @@ RUN_DEPENDS=	unrar:archivers/unrar \
 		wpd2html:textproc/libwpd010 \
 		unrtf:textproc/unrtf
 
-USES=		bison gmake iconv libtool shebangfix
-SHEBANG_FILES=	filters/rclimg filters/rclpdf.py desktop/hotrecoll.py
+USES=		bison gmake iconv libtool localbase python shebangfix
+SHEBANG_FILES=	filters/*.py desktop/hotrecoll.py \
+		filters/rcl7z filters/rclaudio filters/rclchm \
+		filters/rcldia filters/rclepub filters/rclepub1 \
+		filters/rclics filters/rclinfo filters/rclkar \
+		filters/rclpython filters/rclrar filters/rcltar \
+		filters/rclwar filters/rclzip
 USE_GNOME=	libxslt:run
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-pic
+MAKE_ENV=	PYTHON_CMD=${PYTHON_CMD}
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+PYDISTUTILS_PKGNAME=	Recoll
+PYDISTUTILS_PKGVERSION=	1.0
 
-PLIST_SUB=	VERSION="${PORTVERSION}"
+PLIST_SUB=		VERSION="${PORTVERSION}" \
+			PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
 
-OPTIONS_DEFINE=		ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS PYTHON \
+OPTIONS_DEFINE=		ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS \
 			SOUND QT4 X11MON
-OPTIONS_DEFAULT=	ASPELL IMAGE PDF PS PYTHON SOUND QT4
+OPTIONS_DEFAULT=	ASPELL IMAGE PDF PS SOUND QT4
 OPTIONS_SUB=		yes
 
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
@@ -47,11 +55,6 @@ KONQUEROR_RUN_DEPENDS=	kwebkitpart>0:www/kwebkitpart
 LATEX_USE=		tex=dvipsk:run,latex:run
 PDF_RUN_DEPENDS=	pdftotext:graphics/poppler-utils
 PS_RUN_DEPENDS=		pstotext:print/pstotext
-PYTHON_USES=		python:build,run
-PYTHON_CONFIGURE_ENABLE=python-module
-PYTHON_PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
-PYTHON_VARS=		PYDISTUTILS_PKGNAME=Recoll \
-			PYDISTUTILS_PKGVERSION=1.0
 QT4_USE=		qt4=moc_build,qmake_build,rcc_build,uic_build \
 			qt4=iconengines_run,imageformats_run \
 			qt4=corelib,gui,xml,webkit
@@ -66,18 +69,19 @@ X11MON_USES=		fam
 X11MON_USE=		xorg=ice,sm,x11
 X11MON_CONFIGURE_ENABLE=x11mon
 X11MON_CONFIGURE_WITH=	fam
+X11MON_BROKEN=		does not build: index/rclmonrcv.cpp:(.text+0x1f13): undefined reference to `FAMOpen2'
 
 post-patch:
-	${REINPLACE_CMD} -e \
+	@${REINPLACE_CMD} -e \
                 's|@QMAKE@|${TRUE}|' \
                 ${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e \
+	@${REINPLACE_CMD} -e \
 		's|/usr/local/lib|${LOCALBASE}/lib|' \
 		${WRKSRC}/configure
-	${REINPLACE_CMD} -e \
+	@${REINPLACE_CMD} -e \
 		's|python setup.py|${PYTHON_CMD} setup.py|; s|sudo||' \
 		${WRKSRC}/python/recoll/Makefile.in
-	${REINPLACE_CMD} -e \
+	@${REINPLACE_CMD} -e \
 		's|python setup.py|${PYTHON_CMD} setup.py|' \
 		${WRKSRC}/Makefile.in
 
@@ -85,12 +89,8 @@ pre-build-QT4-on:
 	@(cd ${WRKSRC}/qtgui && ${SETENV} ${QMAKE_ENV} ${QMAKE} \
 		${QMAKE_ARGS} recoll.pro)
 
-post-install-PYTHON-on:
-.for l in recoll rclextract
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/${l}.so
-.endfor
-	cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
-		-d ${PYTHONPREFIX_SITELIBDIR} \
-		-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/recoll/*.so \
+		${STAGEDIR}${PREFIX}/lib/recoll/*.so
 
 .include <bsd.port.mk>