Index: head/deskutils/recoll/Makefile =================================================================== --- head/deskutils/recoll/Makefile (revision 392316) +++ head/deskutils/recoll/Makefile (revision 392317) @@ -1,108 +1,108 @@ # Created by: J.F. Dockes # $FreeBSD$ PORTNAME= recoll -PORTVERSION= 1.20.2 +PORTVERSION= 1.21.0 CATEGORIES= deskutils MASTER_SITES= http://www.lesbonscomptes.com/${PORTNAME}/ -MAINTAINER= arved@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Personal full text search package, based on Xapian LICENSE= GPLv2 BUILD_DEPENDS= xapian-core>=0:${PORTSDIR}/databases/xapian-core RUN_DEPENDS:= ${BUILD_DEPENDS} \ antiword:${PORTSDIR}/textproc/antiword \ catdoc:${PORTSDIR}/textproc/catdoc \ wpd2html:${PORTSDIR}/textproc/libwpd010 \ xsltproc:${PORTSDIR}/textproc/libxslt \ unrar:${PORTSDIR}/archivers/unrar \ unrtf:${PORTSDIR}/textproc/unrtf -USES= gmake iconv shebangfix +USES= bison gmake iconv shebangfix SHEBANG_FILES= filters/rclimg desktop/hotrecoll.py GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-pic CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION="${PORTVERSION}" OPTIONS_DEFINE= ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS PYTHON \ SOUND QT4 X11MON OPTIONS_DEFAULT= ASPELL IMAGE PDF PS PYTHON SOUND QT4 X11MON OPTIONS_SUB= yes ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell ASPELL_CONFIGURE_WITH= aspell CHM_DESC= CHM via CHMLIB CHM_RUN_DEPENDS= pychm:${PORTSDIR}/textproc/pychm DJVU_RUN_DEPENDS= djvutxt:${PORTSDIR}/graphics/djvulibre IMAGE_DESC= Store personal tags or textual descriptions in images IMAGE_RUN_DEPENDS= exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool-devel KONQUEROR_DESC= Konqueror webarchive format with Python KONQUEROR_RUN_DEPENDS= kwebkitpart:${PORTSDIR}/www/kwebkitpart LATEX_RUN_DEPENDS= detex:${PORTSDIR}/print/detex \ dvips:${PORTSDIR}/print/tex-dvipsk PDF_RUN_DEPENDS= xpdf:${PORTSDIR}/graphics/xpdf PS_RUN_DEPENDS= pstotext:${PORTSDIR}/print/pstotext PYTHON_USES= python PYTHON_CONFIGURE_ENABLE= python-module QT4_USE= qt4=moc_build,qmake_build,rcc_build,uic_build \ qt4=iconengines_run,imageformats_run \ qt4=corelib,gui,xml,webkit QT4_CONFIGURE_ENABLE= qtgui SOUND_RUN_DEPENDS= mutagen-pony:${PORTSDIR}/audio/py-mutagen \ pykaraoke:${PORTSDIR}/audio/py-karaoke X11MON_DESC= X11 session monitoring support X11MON_USES= fam X11MON_USE= xorg=ice,sm,x11 X11MON_CONFIGURE_ENABLE= x11mon X11MON_CONFIGURE_WITH= fam .include .if ${PORT_OPTIONS:MPYTHON} PYDISTUTILS_PKGNAME= Recoll PYDISTUTILS_PKGVERSION= 1.0 PLIST_SUB+= PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}" .endif .if ${PORT_OPTIONS:MQT4} QT_NONSTANDARD= yes CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" INSTALLS_ICONS= yes .endif post-patch: @${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|@NOCMDLINE@||g ; \ s|@prefix@|${PREFIX}| ; \ s|REALPREFIX=$$PREFIX|REALPREFIX=$$DESTDIR$$PREFIX| ; \ s|python setup.py|${PYTHON_CMD} setup.py| ; \ s|$${ROOTFORPYTHON}||' \ ${WRKSRC}/recollinstall.in @${REINPLACE_CMD} -e \ 's|python setup.py|${PYTHON_CMD} setup.py|' \ ${WRKSRC}/python/recoll/Makefile post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/recoll/librecoll.so.[0-9].* .if ${PORT_OPTIONS:MPYTHON} .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}/;;}) .endif .include Index: head/deskutils/recoll/distinfo =================================================================== --- head/deskutils/recoll/distinfo (revision 392316) +++ head/deskutils/recoll/distinfo (revision 392317) @@ -1,2 +1,2 @@ -SHA256 (recoll-1.20.2.tar.gz) = 28f5e8d7e9bef41932b26fe48ee2718bcc800a294a0066eb202f8978cb27380c -SIZE (recoll-1.20.2.tar.gz) = 2156597 +SHA256 (recoll-1.21.0.tar.gz) = 0450d85d5065d22e87ae600571e3be23a5ff2000f533c15f819a5bd77164a1be +SIZE (recoll-1.21.0.tar.gz) = 2234834 Index: head/deskutils/recoll/files/patch-mk-commondefs =================================================================== --- head/deskutils/recoll/files/patch-mk-commondefs (nonexistent) +++ head/deskutils/recoll/files/patch-mk-commondefs (revision 392317) @@ -0,0 +1,11 @@ +--- mk/commondefs.orig 2015-07-16 19:52:37 UTC ++++ mk/commondefs +@@ -15,7 +15,7 @@ COMMONCXXFLAGS = -I. \ + # the sys file or localdefs + SYSPICFLAGS = -fPIC -DPIC + +-LIBRECOLL = -L$(depth)/lib -lrecoll -Wl,-rpath=$(libdir)/recoll ++LIBRECOLL = -L$(depth)/lib -lrecoll -liconv -Wl,-rpath=$(libdir)/recoll + + RANLIB = test -f + AR=ar Property changes on: head/deskutils/recoll/files/patch-mk-commondefs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/deskutils/recoll/files/patch-query-Makefile =================================================================== --- head/deskutils/recoll/files/patch-query-Makefile (nonexistent) +++ head/deskutils/recoll/files/patch-query-Makefile (revision 392317) @@ -0,0 +1,11 @@ +--- query/Makefile.orig 2015-07-16 19:59:24 UTC ++++ query/Makefile +@@ -13,7 +13,7 @@ wasaparse.tab.cpp : wasaparse.y + XADUMP_OBJS= xadump.o + xadump : $(XADUMP_OBJS) + $(CXX) $(ALL_CXXFLAGS) -o xadump $(XADUMP_OBJS) \ +- $(depth)/lib/librecoll.a $(LIBICONV) $(LIBXAPIAN) $(LIBSYS) ++ $(depth)/lib/librecoll.a -liconv $(LIBICONV) $(LIBXAPIAN) $(LIBSYS) + xadump.o : xadump.cpp + $(CXX) $(ALL_CXXFLAGS) -c xadump.cpp + Property changes on: head/deskutils/recoll/files/patch-query-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/deskutils/recoll/files/patch-utils-Makefile =================================================================== --- head/deskutils/recoll/files/patch-utils-Makefile (nonexistent) +++ head/deskutils/recoll/files/patch-utils-Makefile (revision 392317) @@ -0,0 +1,11 @@ +--- utils/Makefile.orig 2015-07-16 19:56:54 UTC ++++ utils/Makefile +@@ -4,7 +4,7 @@ include $(depth)/mk/sysconf + # Use a static link for some of the utility programs so that they can be + # executed independantly of the installed version of recoll. None of them + # are part of the official distrib anyway +-LIBRECOLL = ../lib/librecoll.a ++LIBRECOLL = ../lib/librecoll.a -liconv + + PROGS = pxattr trclosefrom trecrontab \ + trnetcon trcopyfile trcircache trmd5 trreadfile trfileudi \ Property changes on: head/deskutils/recoll/files/patch-utils-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/deskutils/recoll/files/patch-utils-md5.h =================================================================== --- head/deskutils/recoll/files/patch-utils-md5.h (nonexistent) +++ head/deskutils/recoll/files/patch-utils-md5.h (revision 392317) @@ -0,0 +1,13 @@ +--- utils/md5.h.orig 2015-07-16 19:46:26 UTC ++++ utils/md5.h +@@ -19,6 +19,10 @@ + #define MD5_DIGEST_LENGTH 16 + #define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) + ++typedef uint32_t u_int32_t; ++typedef uint64_t u_int64_t; ++typedef uint8_t u_int8_t; ++ + typedef struct MD5Context { + u_int32_t state[4]; /* state */ + u_int64_t count; /* number of bits, mod 2^64 */ Property changes on: head/deskutils/recoll/files/patch-utils-md5.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/deskutils/recoll/pkg-plist =================================================================== --- head/deskutils/recoll/pkg-plist (revision 392316) +++ head/deskutils/recoll/pkg-plist (revision 392317) @@ -1,124 +1,127 @@ %%QT4%%bin/recoll bin/recollindex bin/recollq %%PYTHON%%%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclconfig.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/rclextract.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll/recoll.so lib/recoll/librecoll.so.%%VERSION%% %%QT4%%man/man1/recoll.1.gz man/man1/recollindex.1.gz man/man1/recollq.1.gz man/man5/recoll.conf.5.gz %%QT4%%share/appdata/recoll.appdata.xml %%QT4%%share/applications/recoll-searchgui.desktop %%QT4%%share/icons/hicolor/48x48/apps/recoll.png %%QT4%%share/pixmaps/recoll.png -%%DATADIR%%/doc/docbook.css +%%DATADIR%%/doc/docbook-xsl.css %%DATADIR%%/doc/usermanual.html %%DATADIR%%/examples/fields %%DATADIR%%/examples/fragbuts.xml %%DATADIR%%/examples/mimeconf %%DATADIR%%/examples/mimemap %%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/msodump.zip %%DATADIR%%/filters/ppt-dump.py +%%DATADIR%%/filters/rcl7z %%DATADIR%%/filters/rclabw %%DATADIR%%/filters/rclaptosidman %%DATADIR%%/filters/rclaudio +%%DATADIR%%/filters/rclcheckneedretry.sh %%DATADIR%%/filters/rclchm %%DATADIR%%/filters/rclconfig.py %%DATADIR%%/filters/rcldia %%DATADIR%%/filters/rcldjvu %%DATADIR%%/filters/rcldoc %%DATADIR%%/filters/rcldvi %%DATADIR%%/filters/rclepub %%DATADIR%%/filters/rclexecm.py %%DATADIR%%/filters/rclfb2 %%DATADIR%%/filters/rclgaim %%DATADIR%%/filters/rclgnm %%DATADIR%%/filters/rclics %%DATADIR%%/filters/rclimg %%DATADIR%%/filters/rclinfo %%DATADIR%%/filters/rclkar %%DATADIR%%/filters/rclkwd %%DATADIR%%/filters/rcllatinclass.py %%DATADIR%%/filters/rcllatinstops.zip %%DATADIR%%/filters/rcllyx %%DATADIR%%/filters/rclman %%DATADIR%%/filters/rclmpdf %%DATADIR%%/filters/rclnull %%DATADIR%%/filters/rclokulnote %%DATADIR%%/filters/rclopxml %%DATADIR%%/filters/rclpdf %%DATADIR%%/filters/rclppt %%DATADIR%%/filters/rclps %%DATADIR%%/filters/rclpurple %%DATADIR%%/filters/rclpython %%DATADIR%%/filters/rclrar %%DATADIR%%/filters/rclrtf %%DATADIR%%/filters/rclscribus %%DATADIR%%/filters/rclshowinfo %%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%%/filters/xls-dump.py %%DATADIR%%/filters/xlsxmltocsv.py %%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/emblem-symbolic-link.png %%DATADIR%%/images/folder.png %%DATADIR%%/images/html.png %%DATADIR%%/images/image.png %%DATADIR%%/images/message.png %%DATADIR%%/images/mozilla_doc.png %%DATADIR%%/images/pdf.png %%DATADIR%%/images/pidgin.png %%DATADIR%%/images/postscript.png %%DATADIR%%/images/presentation.png %%DATADIR%%/images/sidux-book.png %%DATADIR%%/images/soffice.png %%DATADIR%%/images/source.png %%DATADIR%%/images/sownd.png %%DATADIR%%/images/spreadsheet.png %%DATADIR%%/images/text-x-python.png %%DATADIR%%/images/txt.png %%DATADIR%%/images/video.png %%DATADIR%%/images/wordprocessing.png %%DATADIR%%/translations/recoll_cs.qm +%%DATADIR%%/translations/recoll_da.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 %%DATADIR%%/translations/recoll_lt.qm %%DATADIR%%/translations/recoll_pl.qm %%DATADIR%%/translations/recoll_ru.qm %%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