freebsd-ports/sysutils/tracker/files/patch-configure
Koop Mast d129587b5d The FreeBSD GNOME team proudly presents GNOME 3.16 for FreeBSD.
The offical GNOME 3.16 release notes can be found at https://help.gnome.org/misc/release-notes/3.16/

Upgrade instructions for port users:

Delete the old tracker package with:
# pkg delete -f tracker
And user port upgrade tool of choice to upgrade.

Thanks to Antoine Brodin for running the exp-runs.

This release was made possible by the following people:
  Gustau Perez
  Ting-Wei_Lan

PR:		201980
2015-08-05 19:13:24 +00:00

96 lines
4.8 KiB
Text

--- configure.orig 2015-03-16 09:35:17.635124000 +0100
+++ configure 2015-03-16 09:36:55.795920000 +0100
@@ -21333,8 +21333,6 @@
# First test for 3_3_5
TRACKER_MINER_EVOLUTION_3_3_5_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
evolution-shell-3.0 >= 3.1
- evolution-plugin-3.0
- libemail-utils
libemail-engine
evolution-data-server-1.2 >= $EDS_REQUIRED
camel-1.2 >= $CAMEL_REQUIRED"
@@ -21428,7 +21426,6 @@
# Second test for 3_2
TRACKER_MINER_EVOLUTION_3_2_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
evolution-shell-3.0 >= 3.1
- evolution-plugin-3.0
evolution-data-server-1.2 >= $EDS_REQUIRED
camel-1.2 >= $CAMEL_REQUIRED"
@@ -21518,7 +21515,6 @@
# Third test for 2_91
TRACKER_MINER_EVOLUTION_2_91_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
evolution-shell-3.0
- evolution-plugin-3.0
evolution-data-server-1.2 >= $EDS_REQUIRED
camel-1.2 >= $CAMEL_REQUIRED"
@@ -21604,7 +21600,6 @@
# Fourth test others (do we really want support for anything < 3.2)?
TRACKER_MINER_EVOLUTION_LAST_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
evolution-shell >= $EVO_SHELL_REQUIRED
- evolution-plugin >= $EVO_REQUIRED
evolution-data-server-1.2 >= $EDS_REQUIRED
camel-1.2 >= $CAMEL_REQUIRED"
@@ -24317,14 +24312,14 @@
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED
- hal >= \$HAL_REQUIRED\""; } >&5
+ hal >= \$HAL_REQUIRED dbus-glib-1\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED") 2>&5
+ hal >= $HAL_REQUIRED dbus-glib-1"; ) >&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED" 2>/dev/null`
+ hal >= $HAL_REQUIRED dbus-glib-1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -24337,14 +24332,16 @@
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED
- hal >= \$HAL_REQUIRED\""; } >&5
+ hal >= \$HAL_REQUIRED dbus-glib-1\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED") 2>&5
+ hal >= $HAL_REQUIRED
+ dbus-glib-1") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED" 2>/dev/null`
+ hal >= $HAL_REQUIRED
+ dbus-glib-1" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -24366,10 +24363,12 @@
fi
if test $_pkg_short_errors_supported = yes; then
HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED" 2>&1`
+ hal >= $HAL_REQUIRED
+ dbus-glib-1" 2>&1`
else
HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= $DBUS_REQUIRED
- hal >= $HAL_REQUIRED" 2>&1`
+ hal >= $HAL_REQUIRED
+ dbus-glib-1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$HAL_PKG_ERRORS" >&5
@@ -25567,7 +25566,6 @@
if test "${with_evolution_plugin_dir+set}" = set; then :
withval=$with_evolution_plugin_dir;
fi
-,
tracker_miner_evolution_install_dir=$withval,
tracker_miner_evolution_install_dir=`$PKG_CONFIG $evolution_plugin_name --variable=plugindir`,