From owner-svn-ports-head@freebsd.org Wed Jun 19 22:37:14 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 3891F15CBE4C; Wed, 19 Jun 2019 22:37:14 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CDB1F85AD2; Wed, 19 Jun 2019 22:37:13 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A58B02F69; Wed, 19 Jun 2019 22:37:13 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5JMbD9Y016142; Wed, 19 Jun 2019 22:37:13 GMT (envelope-from timur@FreeBSD.org) Received: (from timur@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5JMbCwq016133; Wed, 19 Jun 2019 22:37:12 GMT (envelope-from timur@FreeBSD.org) Message-Id: <201906192237.x5JMbCwq016133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: timur set sender to timur@FreeBSD.org using -f From: "Timur I. Bakeyev" Date: Wed, 19 Jun 2019 22:37:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504589 - in head: databases/ldb databases/ldb12 databases/ldb13 databases/tdb1 devel/talloc1 devel/tevent1 X-SVN-Group: ports-head X-SVN-Commit-Author: timur X-SVN-Commit-Paths: in head: databases/ldb databases/ldb12 databases/ldb13 databases/tdb1 devel/talloc1 devel/tevent1 X-SVN-Commit-Revision: 504589 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CDB1F85AD2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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, 19 Jun 2019 22:37:14 -0000 Author: timur Date: Wed Jun 19 22:37:11 2019 New Revision: 504589 URL: https://svnweb.freebsd.org/changeset/ports/504589 Log: Fix conflicts and dependencies for legacy ports Modified: head/databases/ldb/Makefile head/databases/ldb12/Makefile head/databases/ldb13/Makefile head/databases/tdb1/Makefile head/devel/talloc1/Makefile head/devel/tevent1/Makefile Modified: head/databases/ldb/Makefile ============================================================================== --- head/databases/ldb/Makefile Wed Jun 19 22:19:11 2019 (r504588) +++ head/databases/ldb/Makefile Wed Jun 19 22:37:11 2019 (r504589) @@ -2,7 +2,7 @@ PORTNAME= ldb PORTVERSION= 1.1.29 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 0 CATEGORIES= databases MASTER_SITES= SAMBA @@ -17,12 +17,12 @@ IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON BUILD_DEPENDS= ${LDB_DEPENDS} RUN_DEPENDS= ${LDB_DEPENDS} -LDB_DEPENDS= talloc>=2.1.8:devel/talloc \ - tevent>=0.9.31:devel/tevent \ - tdb>=1.3.12,1:databases/tdb \ +LDB_DEPENDS= talloc1>=2.1.8:devel/talloc1 \ + tevent1>=0.9.31:devel/tevent1 \ + tdb1>=1.3.12,1:databases/tdb1 \ popt>=0:devel/popt -CONFLICTS_INSTALL= ldb1[23]-1.* +CONFLICTS_INSTALL= ldb1[2-6]-1.* #FLAVORS= default nopython #nopython_PKGNAMESUFFIX= -nopython Modified: head/databases/ldb12/Makefile ============================================================================== --- head/databases/ldb12/Makefile Wed Jun 19 22:19:11 2019 (r504588) +++ head/databases/ldb12/Makefile Wed Jun 19 22:37:11 2019 (r504589) @@ -2,7 +2,7 @@ PORTNAME= ldb PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 0 CATEGORIES= databases MASTER_SITES= SAMBA @@ -18,13 +18,13 @@ IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON BUILD_DEPENDS= ${LDB_DEPENDS} RUN_DEPENDS= ${LDB_DEPENDS} -LDB_DEPENDS= talloc>=2.1.10:devel/talloc \ - tevent>=0.9.34:devel/tevent \ - tdb>=1.3.15:databases/tdb \ +LDB_DEPENDS= talloc1>=2.1.10:devel/talloc1 \ + tevent1>=0.9.34:devel/tevent1 \ + tdb1>=1.3.15:databases/tdb1 \ cmocka>=1.1.1:sysutils/cmocka \ popt>=0:devel/popt -CONFLICTS_INSTALL= ldb-1.1.* ldb13-1.3.* +CONFLICTS_INSTALL= ldb-1.1.* ldb1[3-6]-1.* #FLAVORS= default nopython #nopython_PKGNAMESUFFIX= -nopython Modified: head/databases/ldb13/Makefile ============================================================================== --- head/databases/ldb13/Makefile Wed Jun 19 22:19:11 2019 (r504588) +++ head/databases/ldb13/Makefile Wed Jun 19 22:37:11 2019 (r504589) @@ -2,7 +2,7 @@ PORTNAME= ldb PORTVERSION= 1.3.8 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 0 CATEGORIES= databases MASTER_SITES= SAMBA @@ -18,13 +18,13 @@ IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON BUILD_DEPENDS= ${LDB_DEPENDS} RUN_DEPENDS= ${LDB_DEPENDS} -LDB_DEPENDS= talloc>=2.1.14:devel/talloc \ - tevent>=0.9.37:devel/tevent \ - tdb>=1.3.16:databases/tdb \ +LDB_DEPENDS= talloc1>=2.1.14:devel/talloc1 \ + tevent1>=0.9.37:devel/tevent1 \ + tdb1>=1.3.16:databases/tdb1 \ cmocka>=1.1.1:sysutils/cmocka \ popt>=0:devel/popt -CONFLICTS_INSTALL= ldb-1.1.* ldb12-1.2.* +CONFLICTS_INSTALL= ldb-1.1.* ldb1[24-6]-1.* #FLAVORS= default nopython #nopython_PKGNAMESUFFIX= -nopython Modified: head/databases/tdb1/Makefile ============================================================================== --- head/databases/tdb1/Makefile Wed Jun 19 22:19:11 2019 (r504588) +++ head/databases/tdb1/Makefile Wed Jun 19 22:37:11 2019 (r504589) @@ -15,6 +15,8 @@ LICENSE= GPLv3 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support +CONFLICTS_INSTALL= tdb-* + #FLAVORS= default nopython debug #nopython_PKGNAMESUFFIX= -nopython #debug_PKGNAMESUFFIX= -debug Modified: head/devel/talloc1/Makefile ============================================================================== --- head/devel/talloc1/Makefile Wed Jun 19 22:19:11 2019 (r504588) +++ head/devel/talloc1/Makefile Wed Jun 19 22:37:11 2019 (r504589) @@ -14,6 +14,8 @@ LICENSE= LGPL3 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support +CONFLICTS_INSTALL= talloc-* + #FLAVORS= default nopython #nopython_PKGNAMESUFFIX= -nopython #nopython_CONFLICTS= talloc Modified: head/devel/tevent1/Makefile ============================================================================== --- head/devel/tevent1/Makefile Wed Jun 19 22:19:11 2019 (r504588) +++ head/devel/tevent1/Makefile Wed Jun 19 22:37:11 2019 (r504589) @@ -15,8 +15,10 @@ LICENSE= LGPL3 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support -BUILD_DEPENDS= talloc>=2.1.11:devel/talloc -RUN_DEPENDS= talloc>=2.1.11:devel/talloc +BUILD_DEPENDS= talloc1>=2.1.11:devel/talloc1 +RUN_DEPENDS= talloc1>=2.1.11:devel/talloc1 + +CONFLICTS_INSTALL= tevent-* #FLAVORS= default nopython #nopython_PKGNAMESUFFIX= -nopython