freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflicts and dependencies for legacy ports

Browse Source
This commit is contained in:
Timur I. Bakeyev
2019-06-19 22:37:11 +00:00
parent 9ad59fa37c
commit 20c2cbf7fb
6 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
databases/ldb/Makefile
View File

@@ -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_SUFFIX} to be build with
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

10
databases/ldb12/Makefile
View File

@@ -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_SUFFIX} to be build with
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

10
databases/ldb13/Makefile
View File

@@ -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_SUFFIX} to be build with
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

2
databases/tdb1/Makefile
View File

@@ -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

2
devel/talloc1/Makefile
View File

@@ -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

6
devel/tevent1/Makefile
View File

@@ -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