Date: Sun, 1 Dec 2013 15:36:26 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335397 - in head/deskutils/pinot: . files Message-ID: <201312011536.rB1FaQvI091870@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sun Dec 1 15:36:26 2013 New Revision: 335397 URL: http://svnweb.freebsd.org/changeset/ports/335397 Log: - Fix on -CURRENT - Fix shebang - Stagify Added: head/deskutils/pinot/files/patch-Utils_TimeConverter.h (contents, props changed) Deleted: head/deskutils/pinot/files/pkg-message.in Modified: head/deskutils/pinot/Makefile head/deskutils/pinot/pkg-plist Modified: head/deskutils/pinot/Makefile ============================================================================== --- head/deskutils/pinot/Makefile Sun Dec 1 15:32:42 2013 (r335396) +++ head/deskutils/pinot/Makefile Sun Dec 1 15:36:26 2013 (r335397) @@ -3,7 +3,7 @@ PORTNAME= pinot PORTVERSION= 1.06 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES= http://colinf.chez.com/pinot/ @@ -15,18 +15,18 @@ COMMENT= Personal search and metasearch LICENSE= GPLv2 BUILD_DEPENDS= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils -LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core \ - gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ - exttextcat-2.0:${PORTSDIR}/textproc/libexttextcat \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \ - boost_thread:${PORTSDIR}/devel/boost-libs \ - execinfo.1:${PORTSDIR}/devel/libexecinfo \ - exif.12:${PORTSDIR}/graphics/libexif \ - exiv2.12:${PORTSDIR}/graphics/exiv2 \ - gmime-2.4:${PORTSDIR}/mail/gmime24 \ - tag.1:${PORTSDIR}/audio/taglib \ - curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libxapian.so:${PORTSDIR}/databases/xapian-core \ + libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \ + libexttextcat-2.0.so:${PORTSDIR}/textproc/libexttextcat \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ + libxml\+\+-2.6.so:${PORTSDIR}/textproc/libxml++26 \ + libboost_thread.so:${PORTSDIR}/devel/boost-libs \ + libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ + libexif.so:${PORTSDIR}/graphics/libexif \ + libexiv2.so:${PORTSDIR}/graphics/exiv2 \ + libgmime-2.4.so:${PORTSDIR}/mail/gmime24 \ + libtag.so:${PORTSDIR}/audio/taglib \ + libcurl.so:${PORTSDIR}/ftp/curl RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info \ antiword:${PORTSDIR}/textproc/antiword \ xdg-open:${PORTSDIR}/devel/xdg-utils \ @@ -45,13 +45,14 @@ CONFIGURE_ARGS= --with-http=curl --with- CONFIGURE_ENV= MKDIR_P="${MKDIR}" CPPFLAGS+= -I${LOCALBASE}/include -USE_DOS2UNIX= textcat32_conf.txt USE_XORG= pixman -USES= gettext pkgconfig +USES= gettext pkgconfig shebangfix USE_SQLITE= 3 USE_PYTHON= yes USE_OPENSSL= yes USE_LDCONFIG= ${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters +SHEBANG_LANG= bash +SHEBANG_FILES= scripts/bash/*.sh .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug=yes @@ -59,7 +60,7 @@ CONFIGURE_ARGS+= --enable-debug=yes .if defined(WITH_CHMLIB) CONFIGURE_ARGS+= --enable-chmlib=yes -LIB_DEPENDS+= chm:${PORTSDIR}/misc/chmlib +LIB_DEPENDS+= libchm.so:${PORTSDIR}/misc/chmlib PLIST_SUB+= CHMLIB="" .else CONFIGURE_ARGS+= --disable-chmlib @@ -68,22 +69,12 @@ PLIST_SUB+= CHMLIB="@comment " INSTALLS_ICONS= yes -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 +DOCS= AUTHORS ChangeLog ChangeLog-dijon INSTALL NEWS README TODO LM2FIX= textcat_conf.txt textcat3_conf.txt textcat31_conf.txt textcat32_conf.txt SHR2FIX= Core/pinot-search.1 README UL2FIX= Utils/xdgmime/xdgmime.c -NO_STAGE= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 700041 -SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message -.endif - post-extract: # remove pre-generated messages catalogs ${FIND} ${WRKSRC}/po -name "*.gmo" -delete @@ -107,15 +98,10 @@ pre-configure: ${WRKSRC}/*.desktop post-install: - ${TOUCH} ${DATADIR}/stopwords/.empty_file + ${TOUCH} ${STAGEDIR}${DATADIR}/stopwords/.empty_file .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif -.if ${OSVERSION} < 700041 - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/deskutils/pinot/files/patch-Utils_TimeConverter.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/pinot/files/patch-Utils_TimeConverter.h Sun Dec 1 15:36:26 2013 (r335397) @@ -0,0 +1,10 @@ +--- Utils/TimeConverter.h.orig 2013-04-24 14:28:21.000000000 +0200 ++++ Utils/TimeConverter.h 2013-12-01 15:39:50.000000000 +0100 +@@ -19,6 +19,7 @@ + #ifndef _TIME_CONVERTER_H + #define _TIME_CONVERTER_H + ++#include <time.h> + #include <string> + + #include "Visibility.h" Modified: head/deskutils/pinot/pkg-plist ============================================================================== --- head/deskutils/pinot/pkg-plist Sun Dec 1 15:32:42 2013 (r335396) +++ head/deskutils/pinot/pkg-plist Sun Dec 1 15:36:26 2013 (r335397) @@ -70,19 +70,12 @@ include/pinot/filters/HtmlFilter.h include/pinot/filters/HtmlParser.h include/pinot/filters/TextFilter.h include/pinot/filters/XmlFilter.h -include/pinot/xdgmime/xdgmime.c include/pinot/xdgmime/xdgmime.h -include/pinot/xdgmime/xdgmimealias.c include/pinot/xdgmime/xdgmimealias.h -include/pinot/xdgmime/xdgmimecache.c include/pinot/xdgmime/xdgmimecache.h -include/pinot/xdgmime/xdgmimeglob.c include/pinot/xdgmime/xdgmimeglob.h -include/pinot/xdgmime/xdgmimeint.c include/pinot/xdgmime/xdgmimeint.h -include/pinot/xdgmime/xdgmimemagic.c include/pinot/xdgmime/xdgmimemagic.h -include/pinot/xdgmime/xdgmimeparent.c include/pinot/xdgmime/xdgmimeparent.h lib/pinot/backends/libxapianbackend.so lib/pinot/backends/libxapianbackend.so.1 @@ -112,9 +105,21 @@ lib/pinot/filters/libexiv2imagefilter.so lib/pinot/filters/libexternalfilter.so lib/pinot/filters/libmboxfilter.so lib/pinot/filters/libtaglibfilter.so +man/man1/pinot-dbus-daemon.1.gz +man/man1/pinot-index.1.gz +man/man1/pinot-label.1.gz +man/man1/pinot-search.1.gz +man/man1/pinot.1.gz share/applications/pinot.desktop share/applications/pinot-prefs.desktop share/dbus-1/services/de.berlios.Pinot.service +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog-dijon +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO share/icons/hicolor/16x16/apps/pinot.png share/icons/hicolor/22x22/apps/pinot.png share/icons/hicolor/24x24/apps/pinot.png @@ -159,6 +164,7 @@ share/locale/zh_TW/LC_MESSAGES/pinot.mo @dirrmtry share/icons/hicolor/48x48 @dirrmtry share/icons/hicolor @dirrmtry share/icons +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/pinot/filters @dirrm lib/pinot/backends @dirrm lib/pinot
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312011536.rB1FaQvI091870>