From 73931dc2279ad4613e96b47ea12a465a9ab50043 Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Tue, 11 Dec 2007 21:10:13 +0000 Subject: Upgrade to 0.81. Changelog at --- deskutils/pinot/Makefile | 35 +++++++--- deskutils/pinot/distinfo | 6 +- .../pinot/files/patch-dbusxapianindex_reload03 | 77 ---------------------- deskutils/pinot/pkg-plist | 5 +- 4 files changed, 34 insertions(+), 89 deletions(-) delete mode 100644 deskutils/pinot/files/patch-dbusxapianindex_reload03 (limited to 'deskutils/pinot') diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile index d554dba643d0..b62aad1998e8 100644 --- a/deskutils/pinot/Makefile +++ b/deskutils/pinot/Makefile @@ -6,8 +6,7 @@ # PORTNAME= pinot -PORTVERSION= 0.76 -PORTREVISION= 3 +PORTVERSION= 0.81 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_BERLIOS} #MASTER_SITES= http://www.chez.com/colinf/pinot/ \ @@ -33,19 +32,22 @@ RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info \ antiword:${PORTSDIR}/textproc/antiword \ xdg-open:${PORTSDIR}/devel/xdg-utils \ pdftotext:${PORTSDIR}/graphics/xpdf \ + catppt:${PORTSDIR}/textproc/catdoc \ unzip:${PORTSDIR}/archivers/unzip \ - unrtf:${PORTSDIR}/textproc/unrtf + unrtf:${PORTSDIR}/textproc/unrtf \ + catdvi:${PORTSDIR}/print/catdvi +LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-http=curl -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ - MKDIR_P="mkdir -p" +CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" MKDIR_P="${MKDIR}" USE_GETTEXT= yes USE_XLIB= yes #USE_SQLITE= 3 # Replaced by sqlite3-threads USE_PYTHON= yes +USE_OPENSSL= yes USE_LDCONFIG= ${PREFIX}/lib/pinot/filters .if defined(WITH_SOAP) @@ -62,7 +64,7 @@ SQ3THOL= ${LOCALBASE}/share/sqlite3/sqlite3_with_threads-override-locks INSTALLS_ICONS= yes SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message +PLIST_SUB= DESKBAR_MOD="${LDESKBAR_MOD}" MAN1= pinot-dbus-daemon.1 pinot-index.1 pinot-search.1 pinot.1 @@ -72,6 +74,15 @@ LM2FIX= textcat_conf.txt textcat3_conf.txt SHR2FIX= Search/pinot-search.1 README UL2FIX= Utils/xdgmime/xdgmime.c +LDESKBAR_MOD= lib/deskbar-applet/modules-2.20-compatible +DESKBAR_MOD= ${PREFIX}/${LDESKBAR_MOD} + +.include + +.if ${OSVERSION} < 700041 +PKGMESSAGE= ${WRKDIR}/pkg-message +.endif + post-extract: # remove pre-generated messages catalogs ${FIND} ${WRKSRC}/po -name "*.gmo" -delete @@ -88,6 +99,12 @@ pre-configure: ${WRKSRC}/*.desktop post-install: + ${MKDIR} ${DESKBAR_MOD} +.for pyscript in pinot-module + ${INSTALL_DATA} ${WRKSRC}/scripts/python/${pyscript}.py ${DESKBAR_MOD} +.endfor + @${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 \ @@ -96,8 +113,10 @@ post-install: ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif +.if ${OSVERSION} < 700041 @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} +.endif -.include +.include diff --git a/deskutils/pinot/distinfo b/deskutils/pinot/distinfo index 6adfc44bc61a..d418716a9333 100644 --- a/deskutils/pinot/distinfo +++ b/deskutils/pinot/distinfo @@ -1,3 +1,3 @@ -MD5 (pinot-0.76.tar.gz) = 253a75dace38460cb34478f71432c99f -SHA256 (pinot-0.76.tar.gz) = 26e78d341810e9889b2296db931e32a835f8618d01408883c6cbe092f5966067 -SIZE (pinot-0.76.tar.gz) = 881357 +MD5 (pinot-0.81.tar.gz) = c18505716886138a48c766a9b89dcc54 +SHA256 (pinot-0.81.tar.gz) = 5877251710f98b35114d5e8b41496027bb2f507e849da582288d738eb1fc0d45 +SIZE (pinot-0.81.tar.gz) = 925020 diff --git a/deskutils/pinot/files/patch-dbusxapianindex_reload03 b/deskutils/pinot/files/patch-dbusxapianindex_reload03 deleted file mode 100644 index 08db723aeb27..000000000000 --- a/deskutils/pinot/files/patch-dbusxapianindex_reload03 +++ /dev/null @@ -1,77 +0,0 @@ ---- Index/DBusXapianIndex.cpp 2007-08-22 21:58:20.000000000 +0800 -+++ Index/DBusXapianIndex.cpp 2007-09-01 11:23:26.000000000 +0800 -@@ -17,15 +17,6 @@ - */ - - #include --extern "C" --{ --#if DBUS_VERSION < 1000000 --#define DBUS_API_SUBJECT_TO_CHANGE --#endif --#include --#include --#include --} - - #include "Languages.h" - #include "XapianDatabaseFactory.h" -@@ -302,7 +293,7 @@ - /// Asks the D-Bus service to reload its configuration. - bool DBusXapianIndex::reload(void) - { -- bool reloading = false; -+ gboolean reloading = FALSE; - - DBusGConnection *pBus = getBusConnection(); - if (pBus == NULL) -@@ -333,7 +324,12 @@ - g_object_unref(pBusProxy); - // FIXME: don't we have to call dbus_g_connection_unref(pBus); ? - -- return reloading; -+ if (reloading == TRUE) -+ { -+ return true; -+ } -+ -+ return false; - } - - ---- Index/DBusXapianIndex.h 2007-08-22 21:54:40.000000000 +0800 -+++ Index/DBusXapianIndex.h 2007-09-01 11:23:37.000000000 +0800 -@@ -21,12 +21,15 @@ - - #include - #include -+#include "config.h" - extern "C" - { - #if DBUS_VERSION < 1000000 - #define DBUS_API_SUBJECT_TO_CHANGE - #endif - #include -+#include -+#include - } - - #include "XapianIndex.h" ---- UI/GTK2/src/pinot.cc 2007-08-22 22:01:28.000000000 +0800 -+++ UI/GTK2/src/pinot.cc 2007-09-01 10:55:10.000000000 +0800 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include "config.h" - extern "C" - { - #if DBUS_VERSION < 1000000 -@@ -50,7 +51,6 @@ - #include "ViewHistory.h" - #include "DownloaderInterface.h" - #include "XapianIndex.h" --#include "config.h" - #include "NLS.h" - #include "PinotSettings.h" - #include "mainWindow.hh" diff --git a/deskutils/pinot/pkg-plist b/deskutils/pinot/pkg-plist index 344980ebf893..370bf2aca6e8 100644 --- a/deskutils/pinot/pkg-plist +++ b/deskutils/pinot/pkg-plist @@ -7,6 +7,9 @@ etc/pinot/globalconfig.xml 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 @@ -52,7 +55,6 @@ share/locale/zh_TW/LC_MESSAGES/pinot.mo %%DATADIR%%/engines/Wikipedia.src %%DATADIR%%/engines/WiseNut.src %%DATADIR%%/engines/Yahoo.src -%%DATADIR%%/engines/YahooAPI.src %%DATADIR%%/metase-gtk2.glade %%DATADIR%%/metase-gtk2.gladep %%DATADIR%%/pinot-dbus-daemon.xml @@ -66,6 +68,7 @@ share/locale/zh_TW/LC_MESSAGES/pinot.mo @dirrmtry share/applications @dirrm lib/pinot/filters @dirrm lib/pinot +@dirrmtry lib/deskbar-applet/modules-2.20-compatible @dirrmtry lib/deskbar-applet/handlers @dirrmtry lib/deskbar-applet @dirrmtry etc/xdg/autostart -- cgit v1.2.3