From owner-svn-ports-head@freebsd.org Wed Jul 3 23:16:34 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A5C215E379A for ; Wed, 3 Jul 2019 23:16:34 +0000 (UTC) (envelope-from timur@bat.ru) Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E51746F50E for ; Wed, 3 Jul 2019 23:16:33 +0000 (UTC) (envelope-from timur@bat.ru) Received: by mail-ot1-f53.google.com with SMTP id z23so4119965ote.13 for ; Wed, 03 Jul 2019 16:16:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=OOORZg5yTx283rKGHwGs3M14qJySGMK0JvB6vEE/VD4=; b=HC6wEzEKepVpixquCAn/WPFiyBACJdmsL2W2WhXH8/0QZS/TjeKmp3qJ8MCrBrg6s2 DtZZ50hYBg2ySX7loMnP4DpjlkI3pFl5lI9HwqUgfXbYPbgc4LMEN19Fp+duKCG7bIY5 DD1/i+3OiswJMf4Wztdxorda3DmmSsZzKYOjLNSc/6q7B6nZmxh0qykCczgyVzmkhC8I 6WWkC86lJo4Nrz2mNs/XeCdbMks96IIzHJRPtgNRDK0iXgrYEphAbTW50qWYfmjHe65e b6mfSXcng79K+y+akBLoPK9WaF00cX1l8HCNjpevDqInJddbQBloTDjkLjmbeaCC8pU0 Sg5A== X-Gm-Message-State: APjAAAWiKH0wwHTAvhuRxxV4l6Qpokoo0inpB2as5B1MIptUYWveFkb9 uK5B1P/lJY4GMjDQj1Wx9sSneZty0Va57BDbaV96rw== X-Google-Smtp-Source: APXvYqyU/IrS3RywwIXr4ripL1Gycd3G7N73k+Nmj5JfD04jY7+70rKznldmCWHmmlsnVp81kMDwc/hSxXUUDP9TwPw= X-Received: by 2002:a05:6830:105a:: with SMTP id b26mr29975520otp.351.1562195785858; Wed, 03 Jul 2019 16:16:25 -0700 (PDT) MIME-Version: 1.0 References: <201907031652.x63GqolG081167@repo.freebsd.org> In-Reply-To: From: "Timur I. Bakeyev" Date: Thu, 4 Jul 2019 01:15:57 +0200 Message-ID: Subject: Re: svn commit: r505764 - in head/net/samba48: . files To: Antoine Brodin Cc: ports-committers , svn-ports-all , svn-ports-head X-Rspamd-Queue-Id: E51746F50E X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Wed, 03 Jul 2019 23:16:34 -0000 On Wed, 3 Jul 2019 at 21:36, Antoine Brodin wrote: > On Wed, Jul 3, 2019 at 6:53 PM Timur I. Bakeyev wrote: > > > > Author: timur > > Date: Wed Jul 3 16:52:50 2019 > > New Revision: 505764 > > URL: https://svnweb.freebsd.org/changeset/ports/505764 > > > > Log: > > Mark the conflict between samb48 and tdb1 in case of using bundled > libs. Bumped version number to reflect pkg-plist changes. > > > > The use of bundled libs is the default now. Hope that would resolve > the conflicts with talloc/tdb/tevent{1} while this port > > is still active. > > Hi, > > There is still a conflict: > > tdb-1.4.0,1 conflicts with samba48-4.8.12_2 (installs files into the > same place). Problematic file: /usr/local/man/man8/tdbbackup.8.gz > Ok, I hope I nailed this one as well with the latest commit. Ad-hoc fixes build on a slow notebook are nether a good idea... With regards, Timur.