aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--multimedia/cheese/Makefile9
-rw-r--r--multimedia/cheese/distinfo6
-rw-r--r--multimedia/cheese/files/patch-configure99
-rw-r--r--multimedia/cheese/pkg-plist2
4 files changed, 52 insertions, 64 deletions
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index ea3c7fd8b705..89e616b98a8d 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -3,12 +3,12 @@
# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/cheese/Makefile,v 1.55 2010/04/17 22:01:34 marcus Exp $
+# $MCom: ports/multimedia/cheese/Makefile,v 1.58 2010/04/27 15:51:59 kwm Exp $
#
PORTNAME= cheese
-PORTVERSION= 2.30.0
-PORTREVISION= 3
+PORTVERSION= 2.30.1
+PORTREVISION= 1
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -17,7 +17,6 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A Photobooth-inspired app for taking pictures and videos from webcam
BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
-
LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
hal.1:${PORTSDIR}/sysutils/hal
@@ -38,12 +37,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
DOCS= AUTHORS COPYING ChangeLog NEWS README
GCONF_SCHEMAS= cheese.schemas
-.ifndef (NOPORTDOCS)
post-install:
@${MKDIR} ${DOCSDIR}
.for i in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
-.endif
.include <bsd.port.mk>
diff --git a/multimedia/cheese/distinfo b/multimedia/cheese/distinfo
index 6a244150f7d0..4208c352ab0d 100644
--- a/multimedia/cheese/distinfo
+++ b/multimedia/cheese/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/cheese-2.30.0.tar.bz2) = bdcd6f220749ec7ec1a7d4b4726cac78
-SHA256 (gnome2/cheese-2.30.0.tar.bz2) = 7eab2c736abc1a333eb3dd7fb5c888c08f2dc0f34443b5801a7dfc581101aab9
-SIZE (gnome2/cheese-2.30.0.tar.bz2) = 5275469
+MD5 (gnome2/cheese-2.30.1.tar.bz2) = 1599fded8a1797ea51fb010af4e6c45b
+SHA256 (gnome2/cheese-2.30.1.tar.bz2) = 48f03470c6f527caa0e3b269d3afcff86ae0939a74f66ce030d4eed3bc3cbd9a
+SIZE (gnome2/cheese-2.30.1.tar.bz2) = 5266128
diff --git a/multimedia/cheese/files/patch-configure b/multimedia/cheese/files/patch-configure
index f0bc10f9740d..8befb947b861 100644
--- a/multimedia/cheese/files/patch-configure
+++ b/multimedia/cheese/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2010-04-16 22:54:43.000000000 -0400
-+++ configure 2010-04-16 22:56:36.000000000 -0400
-@@ -800,8 +800,8 @@ HAVE_XTEST_FALSE
+--- configure.orig 2010-04-27 17:32:36.000000000 +0200
++++ configure 2010-04-27 17:32:36.000000000 +0200
+@@ -756,8 +756,8 @@ HAVE_XTEST_FALSE
HAVE_XTEST_TRUE
XTEST_LIBS
OS_LINUX
@@ -11,7 +11,7 @@
HAVE_GNOME_DOC_UTILS_FALSE
HAVE_GNOME_DOC_UTILS_TRUE
DISTCHECK_CONFIGURE_FLAGS
-@@ -1008,8 +1008,8 @@ LIBS
+@@ -975,8 +975,8 @@ LIBS
CPPFLAGS
CPP
PKG_CONFIG
@@ -22,7 +22,7 @@
CHEESE_CFLAGS
CHEESE_LIBS'
-@@ -1688,8 +1688,8 @@ Some influential environment variables:
+@@ -1646,8 +1646,8 @@ Some influential environment variables:
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
@@ -33,7 +33,7 @@
CHEESE_CFLAGS
C compiler flags for CHEESE, overriding pkg-config
CHEESE_LIBS linker flags for CHEESE, overriding pkg-config
-@@ -15729,38 +15729,38 @@ LIBRSVG_REQUIRED=2.18.0
+@@ -13843,38 +13843,38 @@ LIBRSVG_REQUIRED=2.18.0
# Check for udev
#*******************************************************************************
@@ -41,9 +41,9 @@
+HAL_PKG=
pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for UDEV" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
-$as_echo_n "checking for UDEV... " >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for HAL" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
+$as_echo_n "checking for HAL... " >&6; }
-if test -n "$UDEV_CFLAGS"; then
@@ -52,13 +52,13 @@
+ pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gudev-1.0\"") >&5
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gudev-1.0") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "hal") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0" 2>/dev/null`
+ pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal" 2>/dev/null`
else
@@ -73,19 +73,19 @@
+ pkg_cv_HAL_LIBS="$HAL_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gudev-1.0\"") >&5
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gudev-1.0") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal\"") >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "hal") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0" 2>/dev/null`
+ pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal" 2>/dev/null`
else
pkg_failed=yes
fi
-@@ -15778,29 +15778,29 @@ else
+@@ -13892,27 +13892,27 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -99,7 +99,7 @@
- echo "$UDEV_PKG_ERRORS" >&5
+ echo "$HAL_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- UDEV_PKG=
+ HAL_PKG=
@@ -111,47 +111,45 @@
- UDEV_LIBS=$pkg_cv_UDEV_LIBS
+ HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
+ HAL_LIBS=$pkg_cv_HAL_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_UDEV 1
-+#define HAVE_HAL 1
- _ACEOF
+-$as_echo "#define HAVE_UDEV 1" >>confdefs.h
++$as_echo "#define HAVE_HAL 1" >>confdefs.h
- UDEV_PKG=gudev-1.0
+ HAL_PKG=hal
fi
- { $as_echo "$as_me:$LINENO: checking operating system" >&5
-@@ -15815,7 +15815,7 @@ _ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking operating system" >&5
+@@ -13925,7 +13925,7 @@ $as_echo "#define OS_LINUX /**/" >>confd
- { $as_echo "$as_me:$LINENO: result: Linux" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5
$as_echo "Linux" >&6; }
- if test x$UDEV_PKG = "x" ; then
+ if test x$HAL_PKG = "x" ; then
- { { $as_echo "$as_me:$LINENO: error: libgudev is required under Linux and not installed" >&5
- $as_echo "$as_me: error: libgudev is required under Linux and not installed" >&2;}
- { (exit 1); exit 1; }; }
-@@ -16213,7 +16213,7 @@ if test -n "$CHEESE_CFLAGS"; then
+ as_fn_error "libgudev is required under Linux and not installed" "$LINENO" 5
+ fi
+ ;;
+@@ -14034,7 +14034,7 @@ if test -n "$CHEESE_CFLAGS"; then
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED \\
pangocairo >= \$PANGOCAIRO_REQUIRED \\
librsvg-2.0 >= \$LIBRSVG_REQUIRED
-- libcanberra-gtk \$UDEV_PKG\"") >&5
-+ libcanberra-gtk \$HAL_PKG\"") >&5
+- libcanberra-gtk \$UDEV_PKG\""; } >&5
++ libcanberra-gtk \$HAL_PKG\""; } >&5
($PKG_CONFIG --exists --print-errors "\
glib-2.0 >= $GLIB_REQUIRED \
gobject-2.0 >= $GOBJECT_REQUIRED \
-@@ -16229,7 +16229,7 @@ if test -n "$CHEESE_CFLAGS"; then
+@@ -14050,7 +14050,7 @@ if test -n "$CHEESE_CFLAGS"; then
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED
- libcanberra-gtk $UDEV_PKG") 2>&5
+ libcanberra-gtk $HAL_PKG") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -16248,7 +16248,7 @@ if test -n "$CHEESE_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+@@ -14069,7 +14069,7 @@ if test -n "$CHEESE_CFLAGS"; then
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED
@@ -160,25 +158,25 @@
else
pkg_failed=yes
fi
-@@ -16274,7 +16274,7 @@ if test -n "$CHEESE_LIBS"; then
+@@ -14095,7 +14095,7 @@ if test -n "$CHEESE_LIBS"; then
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED \\
pangocairo >= \$PANGOCAIRO_REQUIRED \\
librsvg-2.0 >= \$LIBRSVG_REQUIRED
-- libcanberra-gtk \$UDEV_PKG\"") >&5
-+ libcanberra-gtk \$HAL_PKG\"") >&5
+- libcanberra-gtk \$UDEV_PKG\""; } >&5
++ libcanberra-gtk \$HAL_PKG\""; } >&5
($PKG_CONFIG --exists --print-errors "\
glib-2.0 >= $GLIB_REQUIRED \
gobject-2.0 >= $GOBJECT_REQUIRED \
-@@ -16290,7 +16290,7 @@ if test -n "$CHEESE_LIBS"; then
+@@ -14111,7 +14111,7 @@ if test -n "$CHEESE_LIBS"; then
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED
- libcanberra-gtk $UDEV_PKG") 2>&5
+ libcanberra-gtk $HAL_PKG") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -16309,7 +16309,7 @@ if test -n "$CHEESE_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+@@ -14130,7 +14130,7 @@ if test -n "$CHEESE_LIBS"; then
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED
@@ -187,7 +185,7 @@
else
pkg_failed=yes
fi
-@@ -16342,7 +16342,7 @@ fi
+@@ -14163,7 +14163,7 @@ fi
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED
@@ -196,7 +194,7 @@
else
CHEESE_PKG_ERRORS=`$PKG_CONFIG --print-errors "\
glib-2.0 >= $GLIB_REQUIRED \
-@@ -16359,7 +16359,7 @@ fi
+@@ -14180,7 +14180,7 @@ fi
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED
@@ -205,16 +203,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$CHEESE_PKG_ERRORS" >&5
-@@ -16379,7 +16379,7 @@ fi
- dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
- pangocairo >= $PANGOCAIRO_REQUIRED \
- librsvg-2.0 >= $LIBRSVG_REQUIRED
-- libcanberra-gtk $UDEV_PKG) were not met:
-+ libcanberra-gtk $HAL_PKG) were not met:
-
- $CHEESE_PKG_ERRORS
-
-@@ -16405,7 +16405,7 @@ $as_echo "$as_me: error: Package require
+@@ -14200,7 +14200,7 @@ fi
dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
pangocairo >= $PANGOCAIRO_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED
diff --git a/multimedia/cheese/pkg-plist b/multimedia/cheese/pkg-plist
index 53ee71925ee2..fd9436aef99f 100644
--- a/multimedia/cheese/pkg-plist
+++ b/multimedia/cheese/pkg-plist
@@ -219,6 +219,7 @@ share/locale/he/LC_MESSAGES/cheese.mo
share/locale/hi/LC_MESSAGES/cheese.mo
share/locale/hr/LC_MESSAGES/cheese.mo
share/locale/hu/LC_MESSAGES/cheese.mo
+share/locale/id/LC_MESSAGES/cheese.mo
share/locale/it/LC_MESSAGES/cheese.mo
share/locale/ja/LC_MESSAGES/cheese.mo
share/locale/kn/LC_MESSAGES/cheese.mo
@@ -230,6 +231,7 @@ share/locale/mai/LC_MESSAGES/cheese.mo
share/locale/mk/LC_MESSAGES/cheese.mo
share/locale/ml/LC_MESSAGES/cheese.mo
share/locale/mr/LC_MESSAGES/cheese.mo
+share/locale/ms/LC_MESSAGES/cheese.mo
share/locale/nb/LC_MESSAGES/cheese.mo
share/locale/nds/LC_MESSAGES/cheese.mo
share/locale/nl/LC_MESSAGES/cheese.mo
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 10:22:52 +0000