From owner-svn-ports-head@FreeBSD.ORG Fri Jan 17 19:09:20 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0850987; Fri, 17 Jan 2014 19:09:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A04F410CC; Fri, 17 Jan 2014 19:09:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HJ9KqG031513; Fri, 17 Jan 2014 19:09:20 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HJ9JLv031508; Fri, 17 Jan 2014 19:09:19 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201401171909.s0HJ9JLv031508@svn.freebsd.org> From: Koop Mast Date: Fri, 17 Jan 2014 19:09:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340095 - in head/devel/gvfs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 19:09:20 -0000 Author: kwm Date: Fri Jan 17 19:09:19 2014 New Revision: 340095 URL: http://svnweb.freebsd.org/changeset/ports/340095 QAT: https://qat.redports.org/buildarchive/r340095/ Log: Fix build with new gphoto2. [1] While here: Use new LIB_DEPENDS syntax, use USES=pathfix. Add portscout macro, strip and stagify. Obtained from: Gentoo [1] Added: head/devel/gvfs/files/patch-config.h.in (contents, props changed) head/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c (contents, props changed) Modified: head/devel/gvfs/Makefile head/devel/gvfs/files/patch-configure Modified: head/devel/gvfs/Makefile ============================================================================== --- head/devel/gvfs/Makefile Fri Jan 17 18:39:31 2014 (r340094) +++ head/devel/gvfs/Makefile Fri Jan 17 19:09:19 2014 (r340095) @@ -4,7 +4,7 @@ PORTNAME= gvfs PORTVERSION= 1.12.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -12,14 +12,16 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME virtual file system -LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ - soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \ - gcrypt:${PORTSDIR}/security/libgcrypt \ - gnome-keyring:${PORTSDIR}/security/libgnome-keyring +LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ + libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring -USES= gettext gmake pkgconfig +PORTSCOUT= limitw:1,even + +USES= gettext gmake pathfix pkgconfig USE_XZ= yes -USE_GNOME= glib20 gnomehack gnomeprefix intlhack intltool +USE_GNOME= glib20 gnomeprefix intlhack intltool USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -36,7 +38,6 @@ SAMBA_DESC= Samba support GLIB_SCHEMAS= org.gnome.system.gvfs.enums.xml -NO_STAGE= yes .include .if ${PORT_OPTIONS:MFUSE} @@ -48,7 +49,7 @@ PLIST_SUB+= FUSE="@comment " .endif .if ${PORT_OPTIONS:MSAMBA} -LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient +LIB_DEPENDS+= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient GLIB_SCHEMAS+= org.gnome.system.smb.gschema.xml PLIST_SUB+= SMB="" .else @@ -57,7 +58,7 @@ PLIST_SUB+= SMB="@comment " .endif .if ${PORT_OPTIONS:MCDDA} -LIB_DEPENDS+= cdio_paranoia:${PORTSDIR}/sysutils/libcdio +LIB_DEPENDS+= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio PLIST_SUB+= CDDA="" .else CONFIGURE_ARGS+= --disable-cdda @@ -65,7 +66,7 @@ PLIST_SUB+= CDDA="@comment " .endif .if ${PORT_OPTIONS:MGPHOTO2} -LIB_DEPENDS+= gphoto2:${PORTSDIR}/graphics/libgphoto2 +LIB_DEPENDS+= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 PLIST_SUB+= GPHOTO2="" .else CONFIGURE_ARGS+= --disable-gphoto2 @@ -73,7 +74,7 @@ PLIST_SUB+= GPHOTO2="@comment " .endif .if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app +LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app GLIB_SCHEMAS+= org.gnome.system.dns_sd.gschema.xml PLIST_SUB+= AVAHI="" .else @@ -82,7 +83,7 @@ PLIST_SUB+= AVAHI="@comment " .endif .if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA} -LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal +LIB_DEPENDS+= libhal.so:${PORTSDIR}/sysutils/hal RUN_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount PLIST_SUB+= HAL="" .else @@ -90,4 +91,8 @@ CONFIGURE_ARGS+=--disable-hal PLIST_SUB+= HAL="@comment " .endif +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gio/modules/lib*.so + .include Added: head/devel/gvfs/files/patch-config.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gvfs/files/patch-config.h.in Fri Jan 17 19:09:19 2014 (r340095) @@ -0,0 +1,12 @@ +--- config.h.in.orig 2012-05-15 20:07:21.000000000 +0200 ++++ config.h.in 2014-01-17 19:49:23.000000000 +0100 +@@ -51,6 +51,9 @@ + /* Define to 1 if gphoto2 is available */ + #undef HAVE_GPHOTO2 + ++/* define to 1 if gphoto2.5 is available */ ++#undef HAVE_GPHOTO25 ++ + /* Define to 1 if you have the `grantpt' function. */ + #undef HAVE_GRANTPT + Modified: head/devel/gvfs/files/patch-configure ============================================================================== --- head/devel/gvfs/files/patch-configure Fri Jan 17 18:39:31 2014 (r340094) +++ head/devel/gvfs/files/patch-configure Fri Jan 17 19:09:19 2014 (r340095) @@ -1,29 +1,103 @@ ---- configure.orig 2010-05-28 10:24:40.000000000 +0200 -+++ configure 2010-05-28 10:25:59.000000000 +0200 -@@ -16253,7 +16253,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-larchive $LIBS" -+LIBS="-larchive -lcrypto -lmd $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +--- configure.orig 2014-01-17 19:42:49.000000000 +0100 ++++ configure 2014-01-17 19:43:03.000000000 +0100 +@@ -17233,6 +17233,100 @@ -@@ -16298,7 +16298,7 @@ - if test x$with_archive_libs != x/usr/lib; then - ARCHIVE_LIBS="-L$with_archive_libs -larchive" - else -- ARCHIVE_LIBS="-larchive" -+ ARCHIVE_LIBS="-larchive -lcrypto -lmd" - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_entry_filetype in -larchive" >&5 -@@ -16307,7 +16307,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-larchive $LIBS" -+LIBS="-larchive -lcrypto -lmd $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ + $as_echo "#define HAVE_GPHOTO2 1" >>confdefs.h ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPHOTO2" >&5 ++$as_echo_n "checking for GPHOTO2... " >&6; } ++ ++if test -n "$GPHOTO2_CFLAGS"; then ++ pkg_cv_GPHOTO2_CFLAGS="$GPHOTO2_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.5.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.5.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GPHOTO2_CFLAGS=`$PKG_CONFIG --cflags "libgphoto2 >= 2.5.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GPHOTO2_LIBS"; then ++ pkg_cv_GPHOTO2_LIBS="$GPHOTO2_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.5.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.5.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GPHOTO2_LIBS=`$PKG_CONFIG --libs "libgphoto2 >= 2.5.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GPHOTO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgphoto2 >= 2.5.0" 2>&1` ++ else ++ GPHOTO2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgphoto2 >= 2.5.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GPHOTO2_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements (libgphoto2 >= 2.5.0) were not met: ++ ++$GPHOTO2_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables GPHOTO2_CFLAGS ++and GPHOTO2_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details." "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GPHOTO2_CFLAGS ++and GPHOTO2_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ GPHOTO2_CFLAGS=$pkg_cv_GPHOTO2_CFLAGS ++ GPHOTO2_LIBS=$pkg_cv_GPHOTO2_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++$as_echo "#define HAVE_GPHOTO25 1" >>confdefs.h ++ ++ ++fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not building with gphoto2 support. Need OS tweaks in hal volume monitor." >&5 + $as_echo "$as_me: WARNING: Not building with gphoto2 support. Need OS tweaks in hal volume monitor." >&2;} Added: head/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c Fri Jan 17 19:09:19 2014 (r340095) @@ -0,0 +1,44 @@ +--- daemon/gvfsbackendgphoto2.c.orig 2012-05-16 02:01:50.000000000 +0800 ++++ daemon/gvfsbackendgphoto2.c 2014-01-18 01:43:32.000000000 +0800 +@@ -1647,7 +1647,9 @@ + return; + } + ++#ifndef HAVE_GPHOTO25 + DEBUG (" '%s' '%s' '%s'", info.name, info.path, info.library_filename); ++#endif + + /* set port */ + rc = gp_camera_set_port_info (gphoto2_backend->camera, info); +@@ -2590,7 +2592,11 @@ + } + } + ++#ifdef HAVE_GPHOTO25 ++ rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, new_name, GP_FILE_TYPE_NORMAL, file_dest, gphoto2_backend->context); ++#else + rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, file_dest, gphoto2_backend->context); ++#endif + if (rc != 0) + goto out; + +@@ -3222,14 +3228,18 @@ + if (rc != 0) + goto out; + +- gp_file_set_type (file, GP_FILE_TYPE_NORMAL); + gp_file_set_name (file, write_handle->name); + gp_file_set_mtime (file, time (NULL)); + gp_file_set_data_and_size (file, + dup_for_gphoto2 (write_handle->data, write_handle->size), + write_handle->size); + ++#ifdef HAVE_GPHOTO25 ++ rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, write_handle->name, GP_FILE_TYPE_NORMAL, file, gphoto2_backend->context); ++#else ++ gp_file_set_type (file, GP_FILE_TYPE_NORMAL); + rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, file, gphoto2_backend->context); ++#endif + if (rc != 0) + { + gp_file_unref (file);