svn commit: r504589 - in head: databases/ldb databases/ldb12 databases/ldb13 databases/tdb1 devel/talloc1 devel/tevent1
Timur I. Bakeyev
timur at FreeBSD.org
Wed Jun 19 22:37:14 UTC 2019
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
More information about the svn-ports-all
mailing list