- Update to 1.8.1

PR:				ports/151351
Submitted by:	Nikos Ntarmos <ntarmos@cs.uoi.gr>

1 files changed, 9 insertions, 70 deletions

diff --git a/sysutils/conky/files/patch-configure b/sysutils/conky/files/patch-configure
index 7d02cd40a805..97e4645d6745 100644
--- a/sysutils/conky/files/patch-configure
+++ b/sysutils/conky/files/patch-configure
@@ -1,55 +1,5 @@
---- configure.orig	2010-05-01 05:57:07.000000000 +0300
-+++ configure	2010-05-01 06:00:45.000000000 +0300
-@@ -11233,12 +11233,12 @@
-         pkg_cv_Audacious_CFLAGS="$Audacious_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_Audacious_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0" 2>/dev/null`
-+  pkg_cv_Audacious_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -11251,12 +11251,12 @@
-         pkg_cv_Audacious_LIBS="$Audacious_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_Audacious_LIBS=`$PKG_CONFIG --libs "audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0" 2>/dev/null`
-+  pkg_cv_Audacious_LIBS=`$PKG_CONFIG --libs "audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -11275,14 +11275,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        Audacious_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0"`
-+	        Audacious_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0"`
-         else
--	        Audacious_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0"`
-+	        Audacious_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$Audacious_PKG_ERRORS" >&5
- 
--	as_fn_error "Package requirements (audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0) were not met:
-+	as_fn_error "Package requirements (audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0) were not met:
- 
- $Audacious_PKG_ERRORS
- 
+--- configure.orig
++++ configure
 @@ -11645,7 +11645,7 @@
  
  
@@ -59,23 +9,12 @@
        { $as_echo "$as_me:${as_lineno-$LINENO}: apcupsd not supported on $uname... disabling" >&5
  $as_echo "$as_me: apcupsd not supported on $uname... disabling" >&6;}
        want_apcupsd="not supported on $uname"
-@@ -15950,11 +15950,6 @@
- fi
+@@ -11675,7 +11675,7 @@
  
- fi
--if test x$want_alsa = xyes; then
--
--$as_echo "#define MIXER_IS_ALSA 1" >>confdefs.h
--
--fi
  
- for ac_header in signal.h unistd.h sys/utsname.h sys/stat.h linux/soundcard.h alsa/asoundlib.h dirent.h mcheck.h \
-       sys/statfs.h sys/param.h pthread.h semaphore.h assert.h errno.h time.h
-@@ -18905,6 +18900,7 @@
-   ALSA mixer:       $want_alsa
-   apcupsd:          $want_apcupsd
-   I/O stats:        $want_iostats
-+  ncurses:          $want_ncurses
- 
-  * Lua ($want_lua) bindings:
-   Cairo:            $want_lua_cairo
+ if test x$want_iostats = xyes; then
+-  if test x"$uname" != xLinux; then
++  if test x"$uname" != xLinux -a x"$uname" != xFreeBSD; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: iostats not supported on $uname... disabling" >&5
+ $as_echo "$as_me: iostats not supported on $uname... disabling" >&6;}
+       want_iostats="not supported on $uname"