diff -urN /usr/ports/deskutils/recoll/Makefile deskutils/recoll/Makefile --- /usr/ports/deskutils/recoll/Makefile 2012-03-25 14:56:10.000000000 +0900 +++ deskutils/recoll/Makefile 2012-04-09 23:05:02.000000000 +0900 @@ -6,7 +6,7 @@ # PORTNAME= recoll -PORTVERSION= 1.16.2 +PORTVERSION= 1.17.1 CATEGORIES= deskutils MASTER_SITES= http://www.lesbonscomptes.com/recoll/ @@ -20,6 +20,7 @@ OPTIONS= QT "Enable Qt-based GUI support" on \ ASPELL "Enable ASpell support" on \ + PYTHON "Enable Python module support" on \ X11MON "Enable X11 session monitoring support" on USE_ICONV= yes @@ -54,6 +55,16 @@ LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell .endif +.if defined(WITHOUT_PYTHON) +CONFIGURE_ARGS+=--disable-python-module +PLIST_SUB+= PYTHON="@comment " +.else +USE_PYTHON= yes +INSTALLS_EGGINFO= yes +PYDISTUTILS_EGGINFO= Recoll-1.0-py${PYTHON_VER}.egg-info +PLIST_SUB+= PYTHON="" +.endif + .if defined(WITHOUT_X11MON) CONFIGURE_ARGS+=--disable-x11mon .else @@ -68,6 +79,8 @@ @${REINPLACE_CMD} -e \ 's|/usr/local/lib|${LOCALBASE}/lib|' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ + '/--prefix=/s|^|@NOPYTHON@|' ${WRKSRC}/recollinstall.in + @${REINPLACE_CMD} -e \ 's|= -g -O2|=|' ${WRKSRC}/mk/localdefs.in @${REINPLACE_CMD} -e \ 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/mk/${OPSYS} diff -urN /usr/ports/deskutils/recoll/distinfo deskutils/recoll/distinfo --- /usr/ports/deskutils/recoll/distinfo 2012-03-04 14:26:10.000000000 +0900 +++ deskutils/recoll/distinfo 2012-04-09 13:09:23.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (recoll-1.16.2.tar.gz) = f0f29dff2d82ef8541c51963870f31daf28472f3c8822c81c17c346769b77355 -SIZE (recoll-1.16.2.tar.gz) = 1422148 +SHA256 (recoll-1.17.1.tar.gz) = d9e3c20451d622be5379b0f9e9eef6eed243c4580a779de528726ce9bbd5d77b +SIZE (recoll-1.17.1.tar.gz) = 1751847 diff -urN /usr/ports/deskutils/recoll/pkg-plist deskutils/recoll/pkg-plist --- /usr/ports/deskutils/recoll/pkg-plist 2012-03-25 14:56:11.000000000 +0900 +++ deskutils/recoll/pkg-plist 2012-04-09 22:56:01.000000000 +0900 @@ -1,5 +1,6 @@ %%QT%%bin/recoll bin/recollindex +%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll.so %%QT%%share/applications/recoll-searchgui.desktop %%QT%%share/icons/hicolor/48x48/apps/recoll.png %%QT%%share/pixmaps/recoll.png @@ -11,6 +12,8 @@ %%DATADIR%%/examples/mimeview %%DATADIR%%/examples/rclmon.sh %%DATADIR%%/examples/recoll.conf +%%DATADIR%%/examples/recoll.qss +%%DATADIR%%/examples/recollindex.desktop %%DATADIR%%/filters/hotrecoll.py %%DATADIR%%/filters/rclabw %%DATADIR%%/filters/rclaptosidman @@ -21,10 +24,9 @@ %%DATADIR%%/filters/rcldvi %%DATADIR%%/filters/rclexecm.py %%DATADIR%%/filters/rclfb2 -%%DATADIR%%/filters/rclflac %%DATADIR%%/filters/rclgaim +%%DATADIR%%/filters/rclgnm %%DATADIR%%/filters/rclics -%%DATADIR%%/filters/rclid3 %%DATADIR%%/filters/rclimg %%DATADIR%%/filters/rclinfo %%DATADIR%%/filters/rclkar @@ -34,7 +36,7 @@ %%DATADIR%%/filters/rcllyx %%DATADIR%%/filters/rclman %%DATADIR%%/filters/rclnull -%%DATADIR%%/filters/rclogg +%%DATADIR%%/filters/rclokulnote %%DATADIR%%/filters/rclopxml %%DATADIR%%/filters/rclpdf %%DATADIR%%/filters/rclppt @@ -79,6 +81,7 @@ %%DATADIR%%/images/wordprocessing.png %%DATADIR%%/translations/recoll_cs.qm %%DATADIR%%/translations/recoll_de.qm +%%DATADIR%%/translations/recoll_es.qm %%DATADIR%%/translations/recoll_fr.qm %%DATADIR%%/translations/recoll_it.qm %%DATADIR%%/translations/recoll_lt.qm @@ -86,6 +89,8 @@ %%DATADIR%%/translations/recoll_tr.qm %%DATADIR%%/translations/recoll_uk.qm %%DATADIR%%/translations/recoll_xx.qm +%%DATADIR%%/translations/recoll_zh.qm +%%DATADIR%%/translations/recoll_zh_CN.qm @dirrm %%DATADIR%%/translations @dirrm %%DATADIR%%/images @dirrm %%DATADIR%%/filters