Date: Fri, 25 Apr 2014 07:34:15 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352092 - in head/sysutils: tracker tracker-client tracker-gnome tracker-libtrackergtk Message-ID: <201404250734.s3P7YF7U097160@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Apr 25 07:34:14 2014 New Revision: 352092 URL: http://svnweb.freebsd.org/changeset/ports/352092 QAT: https://qat.redports.org/buildarchive/r352092/ Log: Convert to stage Use USES=libtool Fix build with libinotity installed Properly set rpath for tracker-gnome to find the libtracker-* libs Modified: head/sysutils/tracker-client/Makefile head/sysutils/tracker-client/pkg-plist head/sysutils/tracker-gnome/Makefile head/sysutils/tracker-gnome/pkg-plist head/sysutils/tracker-libtrackergtk/Makefile head/sysutils/tracker-libtrackergtk/pkg-plist head/sysutils/tracker/Makefile Modified: head/sysutils/tracker-client/Makefile ============================================================================== --- head/sysutils/tracker-client/Makefile Fri Apr 25 07:33:11 2014 (r352091) +++ head/sysutils/tracker-client/Makefile Fri Apr 25 07:34:14 2014 (r352092) @@ -12,57 +12,58 @@ PKGNAMESUFFIX?= -client MAINTAINER= gnome@FreeBSD.org COMMENT= Object database, tag/metadata database, search tool and indexer -LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ - dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ +LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \ - exif.12:${PORTSDIR}/graphics/libexif \ - wv-1.2.4:${PORTSDIR}/textproc/wv \ - gmime-2.0.4:${PORTSDIR}/mail/gmime2 \ - qdbm.14:${PORTSDIR}/databases/qdbm \ - exempi.3:${PORTSDIR}/textproc/exempi \ - hal.1:${PORTSDIR}/sysutils/hal \ - totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ - raptor.3:${PORTSDIR}/textproc/raptor \ - ogg:${PORTSDIR}/audio/libogg \ - iptcdata.3:${PORTSDIR}/graphics/libiptcdata + libexif.so:${PORTSDIR}/graphics/libexif \ + libwv-1.2.so:${PORTSDIR}/textproc/wv \ + libgmime-2.0.so:${PORTSDIR}/mail/gmime2 \ + libqdbm.so:${PORTSDIR}/databases/qdbm \ + libexempi.so:${PORTSDIR}/textproc/exempi \ + libhal.so:${PORTSDIR}/sysutils/hal \ + libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser \ + libraptor.so:${PORTSDIR}/textproc/raptor \ + libogg.so:${PORTSDIR}/audio/libogg \ + libiptcdata.so:${PORTSDIR}/graphics/libiptcdata RUN_DEPENDS= xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \ o3totxt:${PORTSDIR}/converters/o3read \ pdftotext:${PORTSDIR}/graphics/poppler-utils \ w3m:${PORTSDIR}/www/w3m -USE_BZIP2= yes INSTALLS_ICONS= yes -USE_GNOME= gnomehack gnomeprefix ltasneededhack intltool ltverhack -USES= fam:gamin gettext gmake pkgconfig +USE_GNOME= gnomeprefix intltool +USES= fam:gamin gettext gmake libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_GSTREAMER= core INSTALLS_ICONS= yes -USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker +INSTALL_TARGET= install-strip +GNU_CONFIGURE= yes +CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no CONFIGURE_ARGS= --enable-video-extractor=gstreamer \ --enable-file-monitoring=fam \ --with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \ --enable-external-qdbm --enable-libexif --enable-libvorbis \ --enable-libiptcdata -NO_STAGE= yes .include <bsd.port.pre.mk> .if defined(TRACKER_SLAVE) -LIB_DEPENDS+= trackerclient:${PORTSDIR}/sysutils/tracker-client +LIB_DEPENDS+= libtrackerclient.so:${PORTSDIR}/sysutils/tracker-client . if ${TRACKER_SLAVE}=="gnome" PKGNAMESUFFIX= -gnome -LIB_DEPENDS+= tracker-gtk:${PORTSDIR}/sysutils/tracker-libtrackergtk +LIB_DEPENDS+= libtracker-gtk.so:${PORTSDIR}/sysutils/tracker-libtrackergtk BUILD_WRKSRC= ${WRKSRC}/src/tracker-applet INSTALL_WRKSRC= ${WRKSRC}/src/tracker-applet EXTRA_WRKSRC= src/tracker-preferences src/tracker-search-tool BUILD_DEPENDS+= ${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet RUN_DEPENDS+= ${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet USE_GNOME+= gnomedesktop libgsf -MAN1+= tracker-applet.1 tracker-search-tool.1 tracker-preferences.1 +MAN= tracker-applet.1 tracker-search-tool.1 tracker-preferences.1 CONFIGURE_ARGS+=--enable-deskbar-applet \ --with-deskbar-applet-handler-dir=${LOCALBASE}/libexec/deskbar-applet/handlers +LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/tracker . endif . if defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="libtrackergtk" PKGNAMESUFFIX= -libtrackergtk @@ -71,13 +72,6 @@ BUILD_WRKSRC= ${WRKSRC}/src/libtracker-g INSTALL_WRKSRC= ${BUILD_WRKSRC} . endif .else -MAN1+= tracker-extract.1 tracker-files.1 \ - tracker-info.1 \ - tracker-meta-folder.1 tracker-query.1 \ - tracker-search.1 tracker-services.1 tracker-stats.1 \ - tracker-status.1 tracker-tag.1 tracker-thumbnailer.1 tracker-unique.1 trackerd.1 - -MAN5+= tracker.cfg.5 CONFIGURE_ARGS+= --disable-libtrackergtk --disable-gui \ --disable-trackerapplet --disable-gsf \ --disable-preferences --disable-deskbar-applet \ @@ -99,16 +93,15 @@ post-build: post-install: .if defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="libtrackergtk" - ${MKDIR} ${PREFIX}/lib/tracker/extract-modules - @(cd ${WRKSRC}/src/tracker-extract && for f in .a .la .so ; \ - do ${INSTALL_DATA} .libs/libextract-msoffice$${f} \ - ${PREFIX}/lib/tracker/extract-modules ; done) + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tracker/extract-modules + ${INSTALL_LIB} ${WRKSRC}/src/tracker-extract/.libs/libextract-msoffice.so \ + ${STAGEDIR}${PREFIX}/lib/tracker/extract-modules .elif defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="gnome" . for dir in ${EXTRA_WRKSRC} @(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) . endfor -. for man in ${MAN1} - @(cd ${WRKSRC} && ${INSTALL_DATA} docs/manpages/${man} ${PREFIX}/man/man1/${man}) +. for man in ${MAN} + @(cd ${WRKSRC} && ${INSTALL_DATA} docs/manpages/${man} ${STAGEDIR}${MAN1PREFIX}/man/man1/${man}) . endfor .endif Modified: head/sysutils/tracker-client/pkg-plist ============================================================================== --- head/sysutils/tracker-client/pkg-plist Fri Apr 25 07:33:11 2014 (r352091) +++ head/sysutils/tracker-client/pkg-plist Fri Apr 25 07:34:14 2014 (r352092) @@ -32,48 +32,21 @@ include/tracker-keywords-glue.h include/tracker-metadata-glue.h include/tracker-search-glue.h include/tracker.h -lib/libtrackerclient.a -lib/libtrackerclient.la lib/libtrackerclient.so lib/libtrackerclient.so.0 -lib/tracker/extract-modules/libextract-abw.a -lib/tracker/extract-modules/libextract-abw.la +lib/libtrackerclient.so.0.695.0 lib/tracker/extract-modules/libextract-abw.so -lib/tracker/extract-modules/libextract-gstreamer.a -lib/tracker/extract-modules/libextract-gstreamer.la lib/tracker/extract-modules/libextract-gstreamer.so -lib/tracker/extract-modules/libextract-html.a -lib/tracker/extract-modules/libextract-html.la lib/tracker/extract-modules/libextract-html.so -lib/tracker/extract-modules/libextract-jpeg.a -lib/tracker/extract-modules/libextract-jpeg.la lib/tracker/extract-modules/libextract-jpeg.so -lib/tracker/extract-modules/libextract-mp3.a -lib/tracker/extract-modules/libextract-mp3.la lib/tracker/extract-modules/libextract-mp3.so -lib/tracker/extract-modules/libextract-oasis.a -lib/tracker/extract-modules/libextract-oasis.la lib/tracker/extract-modules/libextract-oasis.so -lib/tracker/extract-modules/libextract-pdf.a -lib/tracker/extract-modules/libextract-pdf.la lib/tracker/extract-modules/libextract-pdf.so -lib/tracker/extract-modules/libextract-playlist.a -lib/tracker/extract-modules/libextract-playlist.la lib/tracker/extract-modules/libextract-playlist.so -lib/tracker/extract-modules/libextract-png.a -lib/tracker/extract-modules/libextract-png.la lib/tracker/extract-modules/libextract-png.so -lib/tracker/extract-modules/libextract-ps.a -lib/tracker/extract-modules/libextract-ps.la lib/tracker/extract-modules/libextract-ps.so -lib/tracker/extract-modules/libextract-tiff.a -lib/tracker/extract-modules/libextract-tiff.la lib/tracker/extract-modules/libextract-tiff.so -lib/tracker/extract-modules/libextract-vorbis.a -lib/tracker/extract-modules/libextract-vorbis.la lib/tracker/extract-modules/libextract-vorbis.so -lib/tracker/extract-modules/libextract-xmp.a -lib/tracker/extract-modules/libextract-xmp.la lib/tracker/extract-modules/libextract-xmp.so lib/tracker/filters/application/csv_filter lib/tracker/filters/application/msword_filter @@ -104,43 +77,44 @@ lib/tracker/filters/text/tab-separated-v lib/tracker/filters/text/x-comma-separated-values_filter lib/tracker/filters/text/x-tex_filter lib/tracker/filters/text/xml_filter -lib/tracker/indexer-modules/libtracker-module-applications.a -lib/tracker/indexer-modules/libtracker-module-applications.la lib/tracker/indexer-modules/libtracker-module-applications.so -lib/tracker/indexer-modules/libtracker-module-evolution.a -lib/tracker/indexer-modules/libtracker-module-evolution.la lib/tracker/indexer-modules/libtracker-module-evolution.so -lib/tracker/indexer-modules/libtracker-module-files.a -lib/tracker/indexer-modules/libtracker-module-files.la lib/tracker/indexer-modules/libtracker-module-files.so -lib/tracker/indexer-modules/libtracker-module-gaim-conversations.a -lib/tracker/indexer-modules/libtracker-module-gaim-conversations.la lib/tracker/indexer-modules/libtracker-module-gaim-conversations.so -lib/tracker/libstemmer.a -lib/tracker/libstemmer.la lib/tracker/libstemmer.so lib/tracker/libstemmer.so.0 -lib/tracker/libtracker-common.a -lib/tracker/libtracker-common.la +lib/tracker/libstemmer.so.0.695.0 lib/tracker/libtracker-common.so lib/tracker/libtracker-common.so.0 -lib/tracker/libtracker-data.a -lib/tracker/libtracker-data.la +lib/tracker/libtracker-common.so.0.695.0 lib/tracker/libtracker-data.so lib/tracker/libtracker-data.so.0 -lib/tracker/libtracker-db.a -lib/tracker/libtracker-db.la +lib/tracker/libtracker-data.so.0.695.0 lib/tracker/libtracker-db.so lib/tracker/libtracker-db.so.0 -lib/tracker/libtracker-module.a -lib/tracker/libtracker-module.la +lib/tracker/libtracker-db.so.0.695.0 lib/tracker/libtracker-module.so lib/tracker/libtracker-module.so.0 +lib/tracker/libtracker-module.so.0.0.0 libdata/pkgconfig/tracker-module-1.0.pc libdata/pkgconfig/tracker.pc libexec/tracker-extract libexec/tracker-indexer libexec/trackerd +man/man1/tracker-extract.1.gz +man/man1/tracker-files.1.gz +man/man1/tracker-info.1.gz +man/man1/tracker-meta-folder.1.gz +man/man1/tracker-query.1.gz +man/man1/tracker-search.1.gz +man/man1/tracker-services.1.gz +man/man1/tracker-stats.1.gz +man/man1/tracker-status.1.gz +man/man1/tracker-tag.1.gz +man/man1/tracker-thumbnailer.1.gz +man/man1/tracker-unique.1.gz +man/man1/trackerd.1.gz +man/man5/tracker.cfg.5.gz share/dbus-1/services/org.freedesktop.Tracker.Extract.service share/dbus-1/services/org.freedesktop.Tracker.Indexer.service share/dbus-1/services/org.freedesktop.Tracker.service Modified: head/sysutils/tracker-gnome/Makefile ============================================================================== --- head/sysutils/tracker-gnome/Makefile Fri Apr 25 07:33:11 2014 (r352091) +++ head/sysutils/tracker-gnome/Makefile Fri Apr 25 07:34:14 2014 (r352092) @@ -10,5 +10,4 @@ TRACKER_SLAVE= gnome PLIST= ${.CURDIR}/pkg-plist MASTERDIR= ${.CURDIR}/../../sysutils/tracker-client -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/sysutils/tracker-gnome/pkg-plist ============================================================================== --- head/sysutils/tracker-gnome/pkg-plist Fri Apr 25 07:33:11 2014 (r352091) +++ head/sysutils/tracker-gnome/pkg-plist Fri Apr 25 07:34:14 2014 (r352092) @@ -2,6 +2,9 @@ bin/tracker-applet bin/tracker-preferences bin/tracker-search-tool etc/xdg/autostart/tracker-applet.desktop +man/man1/tracker-applet.1.gz +man/man1/tracker-preferences.1.gz +man/man1/tracker-search-tool.1.gz share/applications/tracker-preferences.desktop share/applications/tracker-search-tool.desktop %%DATADIR%%/icons/thumbnail_frame.png Modified: head/sysutils/tracker-libtrackergtk/Makefile ============================================================================== --- head/sysutils/tracker-libtrackergtk/Makefile Fri Apr 25 07:33:11 2014 (r352091) +++ head/sysutils/tracker-libtrackergtk/Makefile Fri Apr 25 07:34:14 2014 (r352092) @@ -11,5 +11,4 @@ PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../../sysutils/tracker-client -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/sysutils/tracker-libtrackergtk/pkg-plist ============================================================================== --- head/sysutils/tracker-libtrackergtk/pkg-plist Fri Apr 25 07:33:11 2014 (r352091) +++ head/sysutils/tracker-libtrackergtk/pkg-plist Fri Apr 25 07:34:14 2014 (r352092) @@ -4,11 +4,8 @@ include/libtracker-gtk/tracker-metadata- include/libtracker-gtk/tracker-tag-bar.h include/libtracker-gtk/tracker-ui.h include/libtracker-gtk/tracker-utils.h -lib/libtracker-gtk.a -lib/libtracker-gtk.la lib/libtracker-gtk.so lib/libtracker-gtk.so.0 -lib/tracker/extract-modules/libextract-msoffice.a -lib/tracker/extract-modules/libextract-msoffice.la +lib/libtracker-gtk.so.0.695.0 lib/tracker/extract-modules/libextract-msoffice.so @dirrm include/libtracker-gtk Modified: head/sysutils/tracker/Makefile ============================================================================== --- head/sysutils/tracker/Makefile Fri Apr 25 07:33:11 2014 (r352091) +++ head/sysutils/tracker/Makefile Fri Apr 25 07:34:14 2014 (r352092) @@ -16,22 +16,14 @@ COMMENT= Tracker search tool and indexer RUN_DEPENDS= ${LOCALBASE}/libexec/trackerd:${PORTSDIR}/sysutils/tracker-client NO_BUILD= yes +NO_INSTALL= yes +NO_MTREE= yes OPTIONS_DEFINE= GNOME MSOFFICE OPTIONS_DEFAULT=GNOME MSOFFICE GNOME_DESC= Gnome preferences, panel applet, and search tool MSOFFICE_DESC= Search support for Microsoft Office Docs (uses gtk) -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGNOME} -RUN_DEPENDS+= tracker-applet:${PORTSDIR}/sysutils/tracker-gnome -.endif - -.if ${PORT_OPTIONS:MMSOFFICE} -RUN_DEPENDS+= ${LOCALBASE}/lib/tracker/extract-modules/libextract-msoffice.so:${PORTSDIR}/sysutils/tracker-libtrackergtk -.endif - -do-install: +GNOME_RUN_DEPENDS= tracker-applet:${PORTSDIR}/sysutils/tracker-gnome +MSOFFICE_RUN_DEPENDS= ${LOCALBASE}/lib/tracker/extract-modules/libextract-msoffice.so:${PORTSDIR}/sysutils/tracker-libtrackergtk .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404250734.s3P7YF7U097160>