Update to 3.0.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15904 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 33 insertions, 32 deletions

diff --git a/multimedia/cheese3/Makefile b/multimedia/cheese3/Makefile
index 3be399f79..545561e10 100644
--- a/multimedia/cheese3/Makefile
+++ b/multimedia/cheese3/Makefile
@@ -3,12 +3,11 @@
 # Whom:					FreeBSD GNOME Team <gnome@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/multimedia/cheese3/Makefile,v 1.6 2011/04/15 15:35:21 kwm Exp $
+#   $MCom: ports/multimedia/cheese3/Makefile,v 1.7 2011/04/25 19:18:47 mezz Exp $
 #
 
 PORTNAME=	cheese
-PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTVERSION=	3.0.1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/multimedia/cheese3/distinfo b/multimedia/cheese3/distinfo
index 949789aae..8674c37ff 100644
--- a/multimedia/cheese3/distinfo
+++ b/multimedia/cheese3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cheese-3.0.0.tar.bz2) = 006df646d7141d455b95621fe99ef351aa88754239d28a27b2f57887449a8746
-SIZE (gnome3/cheese-3.0.0.tar.bz2) = 5344850
+SHA256 (gnome3/cheese-3.0.1.tar.bz2) = a2e947146c83d60db2e4f858917c906733037f77067a7081de7a2ff3716fbe7a
+SIZE (gnome3/cheese-3.0.1.tar.bz2) = 5360976
diff --git a/multimedia/cheese3/files/patch-configure b/multimedia/cheese3/files/patch-configure
index 767841350..9162c8443 100644
--- a/multimedia/cheese3/files/patch-configure
+++ b/multimedia/cheese3/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2011-04-13 11:06:34.000000000 +0200
-+++ configure	2011-04-13 11:07:44.000000000 +0200
-@@ -854,7 +723,10 @@ CHEESE_CFLAGS
+--- configure.orig	2011-04-26 00:51:10.000000000 +0200
++++ configure	2011-04-27 18:08:02.000000000 +0200
+@@ -715,7 +715,10 @@ CHEESE_CFLAGS
  HAVE_XTEST_FALSE
  HAVE_XTEST_TRUE
  XTEST_LIBS
@@ -11,7 +11,7 @@
  UDEV_LIBS
  UDEV_CFLAGS
  PKG_CONFIG_LIBDIR
-@@ -1059,6 +934,8 @@ PKG_CONFIG_PATH
+@@ -923,6 +926,8 @@ PKG_CONFIG_PATH
  PKG_CONFIG_LIBDIR
  UDEV_CFLAGS
  UDEV_LIBS
@@ -20,7 +20,7 @@
  CHEESE_CFLAGS
  CHEESE_LIBS
  CHEESE_GTK_CFLAGS
-@@ -1739,6 +1618,8 @@ Some influential environment variables:
+@@ -1605,6 +1610,8 @@ Some influential environment variables:
                path overriding pkg-config's built-in search path
    UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
    UDEV_LIBS   linker flags for UDEV, overriding pkg-config
@@ -29,11 +29,12 @@
    CHEESE_CFLAGS
                C compiler flags for CHEESE, overriding pkg-config
    CHEESE_LIBS linker flags for CHEESE, overriding pkg-config
-@@ -14255,6 +15037,80 @@ $as_echo "#define HAVE_UDEV 1" >>confdef
+@@ -15039,6 +15046,82 @@ $as_echo "#define HAVE_UDEV 1" >>confdef
                    UDEV_PKG=gudev-1.0
  fi
  
 +HAL_PKG=
++if test x$UDEV_PKG = "x" ; then
 +
 +pkg_failed=no
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
@@ -106,11 +107,12 @@
 +
 +                  HAL_PKG=hal
 +fi
++fi
 +
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking operating system" >&5
  $as_echo_n "checking operating system... " >&6; }
  case $host in
-@@ -14269,6 +15125,17 @@ $as_echo "Linux" >&6; }
+@@ -15053,6 +15136,17 @@ $as_echo "Linux" >&6; }
              as_fn_error $? "libgudev is required under Linux and not installed" "$LINENO" 5
      fi
      ;;
@@ -128,7 +130,7 @@
    *)
      { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported operating system" >&5
  $as_echo "unsupported operating system" >&6; }
-@@ -14370,7 +15237,8 @@ if test -n "$CHEESE_CFLAGS"; then
+@@ -15154,7 +15248,8 @@ if test -n "$CHEESE_CFLAGS"; then
    clutter-1.0 >= \$CLUTTER_REQUIRED \\
    clutter-gst-1.0 >= \$CLUTTERGST_REQUIRED \\
    mx-1.0 \\
@@ -138,7 +140,7 @@
    \""; } >&5
    ($PKG_CONFIG --exists --print-errors "\
    glib-2.0 >= $GLIB_REQUIRED \
-@@ -14383,7 +15251,8 @@ if test -n "$CHEESE_CFLAGS"; then
+@@ -15167,7 +15262,8 @@ if test -n "$CHEESE_CFLAGS"; then
    clutter-1.0 >= $CLUTTER_REQUIRED \
    clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \
    mx-1.0 \
@@ -148,7 +150,7 @@
    ") 2>&5
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -14399,7 +15268,8 @@ if test -n "$CHEESE_CFLAGS"; then
+@@ -15183,7 +15279,8 @@ if test -n "$CHEESE_CFLAGS"; then
    clutter-1.0 >= $CLUTTER_REQUIRED \
    clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \
    mx-1.0 \
@@ -158,7 +160,7 @@
    " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -14422,7 +15292,8 @@ if test -n "$CHEESE_LIBS"; then
+@@ -15206,7 +15303,8 @@ if test -n "$CHEESE_LIBS"; then
    clutter-1.0 >= \$CLUTTER_REQUIRED \\
    clutter-gst-1.0 >= \$CLUTTERGST_REQUIRED \\
    mx-1.0 \\
@@ -168,7 +170,7 @@
    \""; } >&5
    ($PKG_CONFIG --exists --print-errors "\
    glib-2.0 >= $GLIB_REQUIRED \
-@@ -14435,7 +15306,8 @@ if test -n "$CHEESE_LIBS"; then
+@@ -15219,7 +15317,8 @@ if test -n "$CHEESE_LIBS"; then
    clutter-1.0 >= $CLUTTER_REQUIRED \
    clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \
    mx-1.0 \
@@ -178,7 +180,7 @@
    ") 2>&5
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -14451,7 +15323,8 @@ if test -n "$CHEESE_LIBS"; then
+@@ -15235,7 +15334,8 @@ if test -n "$CHEESE_LIBS"; then
    clutter-1.0 >= $CLUTTER_REQUIRED \
    clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \
    mx-1.0 \
@@ -188,7 +190,7 @@
    " 2>/dev/null`
  else
    pkg_failed=yes
-@@ -14483,7 +15356,8 @@ fi
+@@ -15267,7 +15367,8 @@ fi
    clutter-1.0 >= $CLUTTER_REQUIRED \
    clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \
    mx-1.0 \
@@ -198,7 +200,7 @@
    " 2>&1`
          else
  	        CHEESE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
-@@ -14497,7 +15371,8 @@ fi
+@@ -15281,7 +15382,8 @@ fi
    clutter-1.0 >= $CLUTTER_REQUIRED \
    clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \
    mx-1.0 \
@@ -208,7 +210,7 @@
    " 2>&1`
          fi
  	# Put the nasty error message in config.log where it belongs
-@@ -14514,7 +15389,8 @@ fi
+@@ -15298,7 +15400,8 @@ fi
    clutter-1.0 >= $CLUTTER_REQUIRED \
    clutter-gst-1.0 >= $CLUTTERGST_REQUIRED \
    mx-1.0 \
@@ -218,7 +220,7 @@
    ) were not met:
  
  $CHEESE_PKG_ERRORS
-@@ -14570,6 +15446,7 @@ if test -n "$CHEESE_GTK_CFLAGS"; then
+@@ -15354,6 +15457,7 @@ if test -n "$CHEESE_GTK_CFLAGS"; then
    gee-1.0 >= \$GEE_REQUIRED \\
    libcanberra-gtk3 >= \$LIBCANBERRA_REQUIRED \\
    \$UDEV_PKG \\
@@ -226,7 +228,7 @@
    gnome-video-effects
    \""; } >&5
    ($PKG_CONFIG --exists --print-errors "\
-@@ -14582,6 +15459,7 @@ if test -n "$CHEESE_GTK_CFLAGS"; then
+@@ -15366,6 +15470,7 @@ if test -n "$CHEESE_GTK_CFLAGS"; then
    gee-1.0 >= $GEE_REQUIRED \
    libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \
    $UDEV_PKG \
@@ -234,7 +236,7 @@
    gnome-video-effects
    ") 2>&5
    ac_status=$?
-@@ -14597,6 +15475,7 @@ if test -n "$CHEESE_GTK_CFLAGS"; then
+@@ -15381,6 +15486,7 @@ if test -n "$CHEESE_GTK_CFLAGS"; then
    gee-1.0 >= $GEE_REQUIRED \
    libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \
    $UDEV_PKG \
@@ -242,7 +244,7 @@
    gnome-video-effects
    " 2>/dev/null`
  else
-@@ -14619,6 +15498,7 @@ if test -n "$CHEESE_GTK_LIBS"; then
+@@ -15403,6 +15509,7 @@ if test -n "$CHEESE_GTK_LIBS"; then
    gee-1.0 >= \$GEE_REQUIRED \\
    libcanberra-gtk3 >= \$LIBCANBERRA_REQUIRED \\
    \$UDEV_PKG \\
@@ -250,7 +252,7 @@
    gnome-video-effects
    \""; } >&5
    ($PKG_CONFIG --exists --print-errors "\
-@@ -14631,6 +15511,7 @@ if test -n "$CHEESE_GTK_LIBS"; then
+@@ -15415,6 +15522,7 @@ if test -n "$CHEESE_GTK_LIBS"; then
    gee-1.0 >= $GEE_REQUIRED \
    libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \
    $UDEV_PKG \
@@ -258,7 +260,7 @@
    gnome-video-effects
    ") 2>&5
    ac_status=$?
-@@ -14646,6 +15527,7 @@ if test -n "$CHEESE_GTK_LIBS"; then
+@@ -15430,6 +15538,7 @@ if test -n "$CHEESE_GTK_LIBS"; then
    gee-1.0 >= $GEE_REQUIRED \
    libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \
    $UDEV_PKG \
@@ -266,7 +268,7 @@
    gnome-video-effects
    " 2>/dev/null`
  else
-@@ -14677,6 +15559,7 @@ fi
+@@ -15461,6 +15570,7 @@ fi
    gee-1.0 >= $GEE_REQUIRED \
    libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \
    $UDEV_PKG \
@@ -274,7 +276,7 @@
    gnome-video-effects
    " 2>&1`
          else
-@@ -14690,6 +15573,7 @@ fi
+@@ -15474,6 +15584,7 @@ fi
    gee-1.0 >= $GEE_REQUIRED \
    libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \
    $UDEV_PKG \
@@ -282,7 +284,7 @@
    gnome-video-effects
    " 2>&1`
          fi
-@@ -14706,6 +15590,7 @@ fi
+@@ -15490,6 +15601,7 @@ fi
    gee-1.0 >= $GEE_REQUIRED \
    libcanberra-gtk3 >= $LIBCANBERRA_REQUIRED \
    $UDEV_PKG \
diff --git a/multimedia/cheese3/pkg-plist b/multimedia/cheese3/pkg-plist
index 9c0db21cb..a772eddfd 100644
--- a/multimedia/cheese3/pkg-plist
+++ b/multimedia/cheese3/pkg-plist
@@ -9,11 +9,11 @@ lib/girepository-1.0/Cheese-3.0.typelib
 lib/libcheese-gtk.a
 lib/libcheese-gtk.la
 lib/libcheese-gtk.so
-lib/libcheese-gtk.so.19
+lib/libcheese-gtk.so.20
 lib/libcheese.a
 lib/libcheese.la
 lib/libcheese.so
-lib/libcheese.so.0
+lib/libcheese.so.1
 libdata/pkgconfig/cheese-gtk.pc
 libdata/pkgconfig/cheese.pc
 share/applications/cheese.desktop