Index: head/databases/libcouchbase/Makefile =================================================================== --- head/databases/libcouchbase/Makefile (revision 448139) +++ head/databases/libcouchbase/Makefile (revision 448140) @@ -1,26 +1,26 @@ # $FreeBSD$ PORTNAME= libcouchbase -DISTVERSION= 2.7.6 +DISTVERSION= 2.7.7 CATEGORIES= databases MASTER_SITES= http://packages.couchbase.com/clients/c/ MAINTAINER= sergey@couchbase.com COMMENT= Multithreaded noSQL database (client and library) LICENSE= APACHE20 LIB_DEPENDS= libevent.so:devel/libevent \ libev.so:devel/libev \ libuv.so:devel/libuv USES= cmake perl5 ssl USE_LDCONFIG= yes USE_PERL5= build run CMAKE_ARGS= -DLCB_NO_TESTS=1 BROKEN_aarch64= Fails to link: error adding symbols: File in wrong format BROKEN_mips64= Fails to link: ld: failed to merge target specific data .include Index: head/databases/libcouchbase/distinfo =================================================================== --- head/databases/libcouchbase/distinfo (revision 448139) +++ head/databases/libcouchbase/distinfo (revision 448140) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499972390 -SHA256 (libcouchbase-2.7.6.tar.gz) = 9b0c2a4de38963ec3314d19e50d63cc34a5990a4f6e0a81973c019d5ad83c411 -SIZE (libcouchbase-2.7.6.tar.gz) = 1149912 +TIMESTAMP = 1502963775 +SHA256 (libcouchbase-2.7.7.tar.gz) = 2d4a912efde1c96e7361cd374ae18e7e25c892a2d53a55d25602cd97e6d5de3c +SIZE (libcouchbase-2.7.7.tar.gz) = 1178826 Index: head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl =================================================================== --- head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl (revision 448139) +++ head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl (nonexistent) @@ -1,51 +0,0 @@ ---- cmake/dtrace-instr-link.pl.orig 2016-08-05 21:38:44 UTC -+++ cmake/dtrace-instr-link.pl -@@ -3,7 +3,7 @@ use strict; - use warnings; - use Digest::MD5 qw(md5_hex); - --my $HDR = "** $0:"; -+my $HDR = "** $0 ($$):"; - $\="\n"; - - my $DT_SRC = shift @ARGV; -@@ -16,23 +16,36 @@ if (!scalar @O_FILES) { - exec($CMD,@ARGV); - } - -+# Copy .o files to a temporary location before DTrace messes with them -+chomp(my $tmpdir = `mktemp -d -t $$`); -+if (system("tar cf - @O_FILES | tar xf - -C $tmpdir") != 0) { -+ system("rm -r $tmpdir"); -+ exit(1); -+} -+ - my $ss = join('_', @O_FILES); - my $hexstr = md5_hex($ss); - --my $INSTRUMENTED = "generated/probes_${hexstr}.o"; -+# From now, we work with files in the temporary location, update @ARGV -+map { $_ =~ s,.+\.o$,$tmpdir/$&, } @ARGV; -+ -+my $INSTRUMENTED = "generated/probes_${hexstr}_$$.o"; - # Run DTrace instrumentation. Assuming running from build directory: - my @args = ( - 'dtrace', '-C', '-G', - '-s', $DT_SRC, - '-o', $INSTRUMENTED, -- @O_FILES); -+ grep { $_ =~ /\.o$/ } @ARGV); - - print "$HDR: Creating instrumented DTrace object: @args"; - if (system(@args) != 0) { -+ system("rm -r $tmpdir"); - exit(1); - } - - unshift @ARGV, $CMD; - push @ARGV, $INSTRUMENTED; - print "$HDR: Linking with instrumented DTrace object: @ARGV"; --exit(system(@ARGV)); -+my $rc = system(@ARGV); -+system("rm -r $tmpdir"); -+exit($rc); Property changes on: head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/libcouchbase/pkg-plist =================================================================== --- head/databases/libcouchbase/pkg-plist (revision 448139) +++ head/databases/libcouchbase/pkg-plist (revision 448140) @@ -1,97 +1,101 @@ bin/cbc bin/cbc-admin bin/cbc-bucket-create bin/cbc-bucket-delete bin/cbc-bucket-flush bin/cbc-cat bin/cbc-connstr bin/cbc-create bin/cbc-decr bin/cbc-hash bin/cbc-incr bin/cbc-lock bin/cbc-mcflush bin/cbc-n1ql bin/cbc-n1qlback bin/cbc-observe bin/cbc-observe-seqno bin/cbc-pillowfight +bin/cbc-ping bin/cbc-rm +bin/cbc-role-list bin/cbc-stats bin/cbc-strerror +bin/cbc-subdoc bin/cbc-touch bin/cbc-unlock +bin/cbc-user-delete +bin/cbc-user-list +bin/cbc-user-upsert bin/cbc-verbosity bin/cbc-version bin/cbc-view bin/cbc-write-config -bin/cbc-role-list -bin/cbc-user-delete -bin/cbc-user-list -bin/cbc-user-upsert include/libcouchbase/_cxxwrap.h include/libcouchbase/api-legacy.h include/libcouchbase/api3.h include/libcouchbase/assert.h include/libcouchbase/auth.h include/libcouchbase/cbft.h include/libcouchbase/cntl-private.h include/libcouchbase/cntl.h include/libcouchbase/configuration.h include/libcouchbase/couchbase.h include/libcouchbase/deprecated.h include/libcouchbase/error.h include/libcouchbase/http.h include/libcouchbase/iops.h include/libcouchbase/ixmgmt.h include/libcouchbase/kvbuf.h include/libcouchbase/libev_io_opts.h include/libcouchbase/libevent_io_opts.h include/libcouchbase/libuv_io_opts.h include/libcouchbase/n1ql.h include/libcouchbase/pktfwd.h include/libcouchbase/plugins/io/bsdio-inl.c include/libcouchbase/plugins/io/libuv/libuv_compat.h include/libcouchbase/plugins/io/libuv/plugin-internal.h include/libcouchbase/plugins/io/libuv/plugin-libuv.c include/libcouchbase/plugins/io/wsaerr-inl.c include/libcouchbase/plugins/io/wsaerr.h include/libcouchbase/select_io_opts.h include/libcouchbase/subdoc.h include/libcouchbase/sysdefs.h include/libcouchbase/vbucket.h include/libcouchbase/views.h include/libcouchbase/visibility.h lib/libcouchbase.so lib/libcouchbase.so.2 -lib/libcouchbase.so.2.0.46 +lib/libcouchbase.so.2.0.47 lib/libcouchbase_libev.so lib/libcouchbase_libevent.so lib/libcouchbase_libuv.so libdata/pkgconfig/libcouchbase.pc man/man1/cbc-admin.1.gz man/man1/cbc-bucket-create.1.gz man/man1/cbc-bucket-delete.1.gz man/man1/cbc-cat.1.gz man/man1/cbc-connstr.1.gz man/man1/cbc-cp.1.gz man/man1/cbc-create.1.gz man/man1/cbc-dsn.1.gz man/man1/cbc-flush.1.gz man/man1/cbc-hash.1.gz man/man1/cbc-lock.1.gz man/man1/cbc-n1qlback.1.gz man/man1/cbc-observe.1.gz man/man1/cbc-pillowfight.1.gz +man/man1/cbc-ping.1.gz man/man1/cbc-rm.1.gz +man/man1/cbc-role-list.1.gz man/man1/cbc-stats.1.gz +man/man1/cbc-subdoc.1.gz man/man1/cbc-unlock.1.gz +man/man1/cbc-user-delete.1.gz +man/man1/cbc-user-list.1.gz +man/man1/cbc-user-upsert.1.gz man/man1/cbc-verbosity.1.gz man/man1/cbc-version.1.gz man/man1/cbc-view.1.gz man/man1/cbc.1.gz -man/man1/cbc-role-list.1.gz -man/man1/cbc-user-delete.1.gz -man/man1/cbc-user-list.1.gz -man/man1/cbc-user-upsert.1.gz man/man4/cbcrc.4.gz