From owner-svn-ports-head@freebsd.org Wed Jul 3 19:36:51 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 58A1D15DECBC; Wed, 3 Jul 2019 19:36:51 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) (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 D42538D119; Wed, 3 Jul 2019 19:36:50 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by mail-ed1-f66.google.com with SMTP id p15so3178500eds.8; Wed, 03 Jul 2019 12:36:50 -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=byPTBr9GmcVetMPtAgpS/5y4fOZk87TRxHggQUWXCYM=; b=QOo1Ow62yQ/yTrc6AhnlqUO7GbU3oJ7R17f3t1gEsHa0xxsDUdEqGmklcL0KJ0MF+s 6Cn7U0NjCSFkGq7sI8V2L+/XOMxfvdo43TGUEP7P7QcuFm9H7uj6zNnu0Me4UbBk3ERW APa1596r5YpxY6cVuPwuQeRUi1sLu1hQf3+NbjX3Uv+b5HITFuioslAG8WqDL2FQ4y7I REehO9HNmkvdaIn/vvDt6J716EhLNOb/hWnfrfI04N9LTwbr/nv6dp1tP3xT+zA0TjBh c1YAhcv6BwCvVqic5wLdSbufHxb6OK+lTXoOoDXw6PvJIU2Fe4/3Ei1f7mnwODtF0ee4 dwGg== X-Gm-Message-State: APjAAAVMonhXzdnEVYGOa1Qgel9vVytRWYlZ655Z/0VcRsZOT2h45bGY t7xzLemxxO1hNezpR4TboAv9UehxO5Kz4IyFGOIDuvw8 X-Google-Smtp-Source: APXvYqxgzEHIOlsObbcJo/FCSwJIBscyP8qIs82n0euQNGYY0ncbeNFXqsmZHtkYNMMvhAeHUM42HzUYUoppmirX7q0= X-Received: by 2002:a50:ae8f:: with SMTP id e15mr44225812edd.74.1562182157812; Wed, 03 Jul 2019 12:29:17 -0700 (PDT) MIME-Version: 1.0 References: <201907031652.x63GqolG081167@repo.freebsd.org> In-Reply-To: <201907031652.x63GqolG081167@repo.freebsd.org> From: Antoine Brodin Date: Wed, 3 Jul 2019 21:29:06 +0200 Message-ID: Subject: Re: svn commit: r505764 - in head/net/samba48: . files To: "Timur I. Bakeyev" Cc: ports-committers , svn-ports-all , svn-ports-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: D42538D119 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; TAGGED_FROM(0.00)[] 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 19:36:51 -0000 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 Antoine