svn commit: r308267 - head/deskutils/recoll
Jason E. Hale
jhale at freebsd.org
Thu Dec 6 01:09:22 UTC 2012
On Tuesday, December 04, 2012 20:22:10 Wesley Shields wrote:
> Author: wxs
> Date: Tue Dec 4 20:22:10 2012
> New Revision: 308267
> URL: http://svnweb.freebsd.org/changeset/ports/308267
>
> Log:
> Update to 1.18.1.
> Assign maintainer to submitter.
> Fix COMMENT.
>
> PR: ports/173918
> Submitted by: nemysis <nemysis at gmx.ch>
> Feature safe: yes
>
> Modified:
> head/deskutils/recoll/Makefile (contents, props changed)
> head/deskutils/recoll/distinfo (contents, props changed)
> head/deskutils/recoll/pkg-plist (contents, props changed)
>
> Modified: head/deskutils/recoll/Makefile
> ============================================================================
> == --- head/deskutils/recoll/Makefile Tue Dec 4 20:19:22 2012 (r308266)
+++
> head/deskutils/recoll/Makefile Tue Dec 4 20:22:10 2012 (r308267) @@ -6,24
> +6,17 @@
> #
Should trim header while here.
>
> PORTNAME= recoll
> -PORTVERSION= 1.17.3
> -PORTREVISION= 1
> +PORTVERSION= 1.18.1
> CATEGORIES= deskutils
> MASTER_SITES= http://www.lesbonscomptes.com/recoll/
>
> -MAINTAINER= ports at FreeBSD.org
> -COMMENT= A personal full text search package, based on Xapian
> +MAINTAINER= nemysis at gmx.ch
> +COMMENT= Personal full text search package, based on Xapian
>
> LICENSE= GPLv2
> -LICENSE_FILE= ${WRKSRC}/COPYING
>
> LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core
>
> -OPTIONS_DEFINE= QT4 ASPELL PYTHON X11MON
> -OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
> -ASPELL_DESC= Enable ASpell support
> -X11MON_DESC= Enable X11 session monitoring support
> -
> USE_ICONV= yes
> USE_GMAKE= yes
> GNU_CONFIGURE= yes
> @@ -32,9 +25,14 @@ MAKE_JOBS_SAFE= yes
> CPPFLAGS+= -I${LOCALBASE}/include
> LDFLAGS+= -L${LOCALBASE}/lib
>
> -MAN1= recollindex.1
> +MAN1= recollindex.1 recollq.1
recollq.1 seems to only be installed if the QT4 option is enabled...I don't
know if that is the desired behavior or not. This manpage is also listed
again below.
> MAN5= recoll.conf.5
>
> +OPTIONS_DEFINE= QT4 ASPELL PYTHON X11MON
> +OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
> +ASPELL_DESC= Enable ASpell support
> +X11MON_DESC= Enable X11 session monitoring support
> +
> .include <bsd.port.options.mk>
>
> .if ${PORT_OPTIONS:MQT4}
> @@ -47,10 +45,11 @@ MAN1+= recoll.1
> .else
> CONFIGURE_ARGS+=--disable-qtgui
> PLIST_SUB+= QT="@comment "
> +MAN1+= recollq.1
Second listing for recollq.1, but it seems to only be installed if the QT
option is enabled, not disabled as it is here.
> .endif
>
> .if ${PORT_OPTIONS:MASPELL}
> -LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell
> +LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
> .else
> CONFIGURE_ARGS+=--without-aspell
> .endif
> @@ -74,18 +73,21 @@ CONFIGURE_ARGS+=--disable-x11mon
> .endif
>
> post-patch:
> - @${REINPLACE_CMD} -e \
> - 's|@QMAKE@|${TRUE}|' ${WRKSRC}/Makefile.in
> - @${REINPLACE_CMD} -e \
> - 's|/usr/local/lib|${LOCALBASE}/lib|' ${WRKSRC}/configure
> - @${REINPLACE_CMD} -e \
> - 's|= -g -O2|=|' ${WRKSRC}/mk/localdefs.in
> - @${REINPLACE_CMD} -e \
> - 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/mk/${OPSYS}
> + @${REINPLACE_CMD} \
> + -e 's|$${MAKE} -C query recollq|@NOQTMAKE@$${MAKE} -C query
recollq|'
> ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} \
> + -e 's|/usr/local/lib|${LOCALBASE}/lib|' ${WRKSRC}/configure
> + @${REINPLACE_CMD} \
> + -e 's|= -g -O2|=|' ${WRKSRC}/mk/localdefs.in
> + @${REINPLACE_CMD} \
> + -e 's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/mk/${OPSYS}
> + @${REINPLACE_CMD} -e 's|@NOCMDLINE@|@NOQTMAKE@|g' \
> + ${WRKSRC}/recollinstall.in
>
> post-configure:
> .if ${PORT_OPTIONS:MQT4}
> - @(cd ${WRKSRC}/qtgui && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})
> + @cd ${WRKSRC}/qtgui && ${SETENV} ${CONFIGURE_ENV} \
> + ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
> .endif
>
> .include <bsd.port.mk>
>
> Modified: head/deskutils/recoll/pkg-plist
> ============================================================================
> == --- head/deskutils/recoll/pkg-plist Tue Dec 4 20:19:22 2012 (r308266)
> +++ head/deskutils/recoll/pkg-plist Tue Dec 4 20:22:10 2012 (r308267) @@
> -1,6 +1,7 @@
> %%QT%%bin/recoll
> +bin/recollq
bin/recollq seems to be only installed when the QT4 option is enabled.
> bin/recollindex
> -%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll.so
> +%%PYTHON_SITELIBDIR%%/recoll.so
This is only installed if PYTHON option is enabled, so %%PYTHON%% sub should
remain.
> %%QT%%share/applications/recoll-searchgui.desktop
> %%QT%%share/icons/hicolor/48x48/apps/recoll.png
> %%QT%%share/pixmaps/recoll.png
> @@ -23,6 +24,7 @@ bin/recollindex
> %%DATADIR%%/filters/rcldjvu
> %%DATADIR%%/filters/rcldoc
> %%DATADIR%%/filters/rcldvi
> +%%DATADIR%%/filters/rclepub
> %%DATADIR%%/filters/rclexecm.py
> %%DATADIR%%/filters/rclfb2
> %%DATADIR%%/filters/rclgaim
> @@ -51,16 +53,21 @@ bin/recollindex
> %%DATADIR%%/filters/rclsiduxman
> %%DATADIR%%/filters/rclsoff
> %%DATADIR%%/filters/rclsvg
> +%%DATADIR%%/filters/rcltar
> %%DATADIR%%/filters/rcltex
> %%DATADIR%%/filters/rcltext
> %%DATADIR%%/filters/rcluncomp
> %%DATADIR%%/filters/rclwar
> %%DATADIR%%/filters/rclwpd
> %%DATADIR%%/filters/rclxls
> +%%DATADIR%%/filters/rclxml
> %%DATADIR%%/filters/rclzip
> %%DATADIR%%/filters/xdg-open
> %%DATADIR%%/images/aptosid-book.png
> %%DATADIR%%/images/aptosid-manual.png
> +%%DATADIR%%/images/archive.png
> +%%DATADIR%%/images/book.png
> +%%DATADIR%%/images/bookchap.png
> %%DATADIR%%/images/document.png
> %%DATADIR%%/images/drawing.png
> %%DATADIR%%/images/folder.png
> @@ -82,6 +89,7 @@ bin/recollindex
> %%DATADIR%%/images/wordprocessing.png
> %%DATADIR%%/translations/recoll_cs.qm
> %%DATADIR%%/translations/recoll_de.qm
> +%%DATADIR%%/translations/recoll_el.qm
> %%DATADIR%%/translations/recoll_es.qm
> %%DATADIR%%/translations/recoll_fr.qm
> %%DATADIR%%/translations/recoll_it.qm
> @@ -103,3 +111,5 @@ bin/recollindex
> @dirrmtry share/icons/hicolor
> @dirrmtry share/icons
> @dirrmtry share/applications
> + at dirrmtry %%PYTHON_SITELIBDIR%%
> + at dirrmtry %%PYTHON_LIBDIR%%
Shouldn't try to remove PYTHON_SITELIBDIR or PYTHON_LIBDIR
--
Jason E. Hale - jhale@
FreeBSD Ports Committer
KDE/FreeBSD Team
More information about the svn-ports-all
mailing list