diff options
| -rw-r--r-- | deskutils/pinot/Makefile | 22 | ||||
| -rw-r--r-- | deskutils/pinot/distinfo | 4 | ||||
| -rw-r--r-- | deskutils/pinot/pkg-plist | 37 |
3 files changed, 32 insertions, 31 deletions
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile index 6fddeca408b0..c96256a31863 100644 --- a/deskutils/pinot/Makefile +++ b/deskutils/pinot/Makefile @@ -6,8 +6,7 @@ # PORTNAME= pinot -PORTVERSION= 0.98 -PORTREVISION= 3 +PORTVERSION= 1.0 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES= http://colinf.chez.com/pinot/ @@ -21,7 +20,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils LIB_DEPENDS= xapian.26:${PORTSDIR}/databases/xapian-core \ gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ - textcat.0:${PORTSDIR}/textproc/libtextcat \ + exttextcat.0:${PORTSDIR}/textproc/libexttextcat \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \ boost_thread.4:${PORTSDIR}/devel/boost-libs \ @@ -44,10 +43,12 @@ PROJECTHOST= ${PORTNAME}-search LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive +CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive \ + --enable-mempool=no CONFIGURE_ENV= MKDIR_P="${MKDIR}" CPPFLAGS+= -I${LOCALBASE}/include +USE_DOS2UNIX= textcat32_conf.txt USE_XORG= pixman USE_GETTEXT= yes USE_SQLITE= 3 @@ -68,19 +69,14 @@ PLIST_SUB+= CHMLIB="@comment " INSTALLS_ICONS= yes -PLIST_SUB+= DESKBAR_MOD="${LDESKBAR_MOD}" - MAN1= pinot-dbus-daemon.1 pinot-index.1 pinot-label.1 pinot-search.1 pinot.1 PORTDOCS= AUTHORS ChangeLog ChangeLog-dijon INSTALL NEWS README TODO -LM2FIX= textcat_conf.txt textcat3_conf.txt textcat31_conf.txt +LM2FIX= textcat_conf.txt textcat3_conf.txt textcat31_conf.txt textcat32_conf.txt SHR2FIX= Core/pinot-search.1 README UL2FIX= Utils/xdgmime/xdgmime.c -LDESKBAR_MOD= libexec/deskbar-applet/modules-2.20-compatible -DESKBAR_MOD= ${PREFIX}/${LDESKBAR_MOD} - .include <bsd.port.pre.mk> .if ${OSVERSION} < 700041 @@ -112,12 +108,6 @@ pre-configure: post-install: ${TOUCH} ${DATADIR}/stopwords/.empty_file - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DESKBAR_MOD} - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DESKBAR_MOD} - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ - ${PREFIX}/lib/deskbar-applet/handlers - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ - ${PREFIX}/lib/deskbar-applet/handlers .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} diff --git a/deskutils/pinot/distinfo b/deskutils/pinot/distinfo index 1952bafcea9b..804dd2ba7b95 100644 --- a/deskutils/pinot/distinfo +++ b/deskutils/pinot/distinfo @@ -1,2 +1,2 @@ -SHA256 (pinot-0.98.tar.gz) = 8a89a73a48344074aa8f4534ce68fd18e3d84553645cef864c137ab21d8d341c -SIZE (pinot-0.98.tar.gz) = 1100996 +SHA256 (pinot-1.0.tar.gz) = d1f5ac17022014c5a29ba1e6d95fc39bcf254338a4e0bfe84bf16558d219e2e2 +SIZE (pinot-1.0.tar.gz) = 1117465 diff --git a/deskutils/pinot/pkg-plist b/deskutils/pinot/pkg-plist index 2510c448f609..c689c1d612ca 100644 --- a/deskutils/pinot/pkg-plist +++ b/deskutils/pinot/pkg-plist @@ -6,17 +6,33 @@ bin/pinot-prefs bin/pinot-search etc/pinot/external-filters.xml etc/pinot/globalconfig.xml -etc/pinot/textcat3_conf.txt etc/pinot/textcat31_conf.txt +etc/pinot/textcat32_conf.txt +etc/pinot/textcat3_conf.txt etc/pinot/textcat_conf.txt etc/xdg/autostart/pinot-dbus-daemon.desktop -%%DESKBAR_MOD%%/pinot-module.py -%%DESKBAR_MOD%%/pinot-module.pyc -%%DESKBAR_MOD%%/pinot-module.pyo -lib/deskbar-applet/handlers/pinot-live.py -lib/deskbar-applet/handlers/pinot-live.pyc -lib/deskbar-applet/handlers/pinot-live.pyo lib/pinot/backends/libxapianbackend.so +lib/pinot/backends/libxapianbackend.so.1 +lib/pinot/libBasicUtils.a +lib/pinot/libBasicUtils.la +lib/pinot/libCollect.a +lib/pinot/libCollect.la +lib/pinot/libCore.a +lib/pinot/libCore.la +lib/pinot/libFilter.a +lib/pinot/libFilter.la +lib/pinot/libIndex.a +lib/pinot/libIndex.la +lib/pinot/libIndexSearch.a +lib/pinot/libIndexSearch.la +lib/pinot/libMonitor.a +lib/pinot/libMonitor.la +lib/pinot/libSQL.a +lib/pinot/libSQL.la +lib/pinot/libTokenize.a +lib/pinot/libTokenize.la +lib/pinot/libUtils.a +lib/pinot/libUtils.la lib/pinot/filters/libarchivefilter.so %%CHMLIB%%lib/pinot/filters/libchmfilter.so lib/pinot/filters/libexiv2imagefilter.so @@ -47,8 +63,7 @@ share/locale/zh_TW/LC_MESSAGES/pinot.mo %%DATADIR%%/engines/AmazonAPI.src %%DATADIR%%/engines/Bing.src %%DATADIR%%/engines/Clusty.src -%%DATADIR%%/engines/DuckDuckGo.xml -%%DATADIR%%/engines/Freshmeat.src +%%DATADIR%%/engines/Freecode.src %%DATADIR%%/engines/Google.src %%DATADIR%%/engines/KodersDescription.xml %%DATADIR%%/engines/OmegaDescription.xml @@ -74,10 +89,6 @@ share/locale/zh_TW/LC_MESSAGES/pinot.mo @dirrm lib/pinot/filters @dirrm lib/pinot/backends @dirrm lib/pinot -@dirrmtry libexec/deskbar-applet/modules-2.20-compatible -@dirrmtry libexec/deskbar-applet -@dirrmtry lib/deskbar-applet/handlers -@dirrmtry lib/deskbar-applet @dirrmtry etc/xdg/autostart @dirrmtry etc/xdg @dirrm etc/pinot |