--- configure.orig	2008-03-28 17:23:44.000000000 -0400
+++ configure	2008-03-28 17:24:02.000000000 -0400
@@ -24617,7 +24617,7 @@ if test "x$enable_http" != "xno"; then
   msg_http=yes
 fi
 
-  if test "x$msg_http" == "xyes"; then
+  if test "x$msg_http" = "xyes"; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for HTTP" >&5
@@ -24885,7 +24885,7 @@ if test "x$enable_fuse" != "xno"; then
   msg_fuse=yes
 fi
 
-  if test "x$msg_fuse" == "xyes"; then
+  if test "x$msg_fuse" = "xyes"; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for FUSE" >&5
@@ -25036,7 +25036,7 @@ if test "x$enable_gconf" != "xno"; then
   msg_gconf=yes
 fi
 
-  if test "x$msg_gconf" == "xyes"; then
+  if test "x$msg_gconf" = "xyes"; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for GCONF" >&5
@@ -25189,7 +25189,7 @@ if test "x$enable_hal" != "xno"; then
   msg_hal=yes
 fi
 
-  if test "x$msg_hal" == "xyes"; then
+  if test "x$msg_hal" = "xyes"; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for HAL" >&5
@@ -25371,7 +25371,7 @@ if test $ac_cv_lib_hal_libhal_get_all_de
   have_hal_fast_init=yes
 fi
 
-    if test "x$have_hal_fast_init" == "xyes"; then
+    if test "x$have_hal_fast_init" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_HAL_FAST_INIT 1
@@ -25412,7 +25412,7 @@ if test "x$enable_cdda" != "xno"; then
   msg_cdda=yes
 fi
 
-  if test "x$msg_cdda" == "xyes"; then
+  if test "x$msg_cdda" = "xyes"; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for CDDA" >&5
@@ -25772,7 +25772,7 @@ else
 fi
 
 
-  if test "x$msg_obexftp" == "xyes" -a "x$have_expat" == "xtrue"; then
+  if test "x$msg_obexftp" = "xyes" -a "x$have_expat" = "xtrue"; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for OBEXFTP" >&5
@@ -25936,13 +25936,16 @@ fi
     *-linux*)
       use_gphoto2=yes
       ;;
+    *-freebsd*)
+      use_gphoto2=yes
+      ;;
     *)
       use_gphoto2=no
       ;;
   esac
 
-  if test "x$msg_gphoto2" == "xyes"; then
-    if test "x$use_gphoto2" == "xyes"; then
+  if test "x$msg_gphoto2" = "xyes"; then
+    if test "x$use_gphoto2" = "xyes"; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for GPHOTO2" >&5
@@ -26098,7 +26101,7 @@ if test "x$enable_keyring" != "xno"; the
   msg_keyring=yes
 fi
 
-  if test "x$msg_keyring" == "xyes"; then
+  if test "x$msg_keyring" = "xyes"; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for KEYRING" >&5