svn commit: r504590 - in head/net: samba46 samba47 samba48
Timur I. Bakeyev
timur at FreeBSD.org
Wed Jun 19 22:40:54 UTC 2019
Author: timur
Date: Wed Jun 19 22:40:52 2019
New Revision: 504590
URL: https://svnweb.freebsd.org/changeset/ports/504590
Log:
Make legacy ports use legacy libs.
Modified:
head/net/samba46/Makefile
head/net/samba47/Makefile
head/net/samba48/Makefile
Modified: head/net/samba46/Makefile
==============================================================================
--- head/net/samba46/Makefile Wed Jun 19 22:37:11 2019 (r504589)
+++ head/net/samba46/Makefile Wed Jun 19 22:40:52 2019 (r504590)
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}46
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -131,16 +131,16 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
PLIST_SUB+= PY_ISO8601="@comment "
# talloc
-BUILD_DEPENDS+= talloc>=2.1.9:devel/talloc
-RUN_DEPENDS+= talloc>=2.1.9:devel/talloc
+BUILD_DEPENDS+= talloc1>=2.1.9:devel/talloc1
+RUN_DEPENDS+= talloc1>=2.1.9:devel/talloc1
SAMBA4_BUNDLED_LIBS+= !talloc
# tevent
-BUILD_DEPENDS+= tevent>=0.9.34:devel/tevent
-RUN_DEPENDS+= tevent>=0.9.34:devel/tevent
+BUILD_DEPENDS+= tevent1>=0.9.34:devel/tevent1
+RUN_DEPENDS+= tevent1>=0.9.34:devel/tevent1
SAMBA4_BUNDLED_LIBS+= !tevent
# tdb
-BUILD_DEPENDS+= tdb>=1.3.12:databases/tdb
-RUN_DEPENDS+= tdb>=1.3.12:databases/tdb
+BUILD_DEPENDS+= tdb1>=1.3.12:databases/tdb1
+RUN_DEPENDS+= tdb1>=1.3.12:databases/tdb1
SAMBA4_BUNDLED_LIBS+= !tdb
# ldb
BUILD_DEPENDS+= ldb>=1.1.29:databases/ldb
Modified: head/net/samba47/Makefile
==============================================================================
--- head/net/samba47/Makefile Wed Jun 19 22:37:11 2019 (r504589)
+++ head/net/samba47/Makefile Wed Jun 19 22:40:52 2019 (r504590)
@@ -3,7 +3,7 @@
PORTNAME= ${SAMBA4_BASENAME}47
PORTVERSION= ${SAMBA4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -171,39 +171,39 @@ SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment "
# talloc
.if defined(SAMBA4_BUNDLED_TALLOC)
SAMBA4_BUNDLED_LIBS+= talloc
-CONFLICTS+= talloc-2.*
+CONFLICTS+= talloc1-2.*
PLIST_SUB+= SAMBA4_BUNDLED_TALLOC=""
SUB_LIST+= SAMBA4_BUNDLED_TALLOC=""
.else
SAMBA4_BUNDLED_LIBS+= !talloc
-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
PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment "
.endif
# tevent
.if defined(SAMBA4_BUNDLED_TEVENT)
SAMBA4_BUNDLED_LIBS+= tevent
-CONFLICTS+= tevent-0.*
+CONFLICTS+= tevent1-0.*
PLIST_SUB+= SAMBA4_BUNDLED_TEVENT=""
SUB_LIST+= SAMBA4_BUNDLED_TEVENT=""
.else
SAMBA4_BUNDLED_LIBS+= !tevent
-BUILD_DEPENDS+= tevent>=0.9.36:devel/tevent
-RUN_DEPENDS+= tevent>=0.9.36:devel/tevent
+BUILD_DEPENDS+= tevent1>=0.9.36:devel/tevent1
+RUN_DEPENDS+= tevent1>=0.9.36:devel/tevent1
PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment "
.endif
# tdb
.if defined(SAMBA4_BUNDLED_TDB)
SAMBA4_BUNDLED_LIBS+= tdb
-CONFLICTS+= tdb-1.*
+CONFLICTS+= tdb1-1.*
PLIST_SUB+= SAMBA4_BUNDLED_TDB=""
SUB_LIST+= SAMBA4_BUNDLED_TDB=""
.else
SAMBA4_BUNDLED_LIBS+= !tdb
-BUILD_DEPENDS+= tdb>=1.3.15:databases/tdb
-RUN_DEPENDS+= tdb>=1.3.15:databases/tdb
+BUILD_DEPENDS+= tdb1>=1.3.15:databases/tdb1
+RUN_DEPENDS+= tdb1>=1.3.15:databases/tdb1
PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment "
.endif
Modified: head/net/samba48/Makefile
==============================================================================
--- head/net/samba48/Makefile Wed Jun 19 22:37:11 2019 (r504589)
+++ head/net/samba48/Makefile Wed Jun 19 22:40:52 2019 (r504590)
@@ -3,7 +3,7 @@
PORTNAME= ${SAMBA4_BASENAME}48
PORTVERSION= ${SAMBA4_VERSION}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -178,39 +178,39 @@ SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment "
# talloc
.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
SAMBA4_BUNDLED_LIBS+= talloc
-CONFLICTS+= talloc-2.*
+CONFLICTS+= talloc1-2.*
PLIST_SUB+= SAMBA4_BUNDLED_TALLOC=""
SUB_LIST+= SAMBA4_BUNDLED_TALLOC=""
.else
SAMBA4_BUNDLED_LIBS+= !talloc
-BUILD_DEPENDS+= talloc>=2.1.14:devel/talloc
-RUN_DEPENDS+= talloc>=2.1.14:devel/talloc
+BUILD_DEPENDS+= talloc1>=2.1.14:devel/talloc1
+RUN_DEPENDS+= talloc1>=2.1.14:devel/talloc1
PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment "
.endif
# tevent
.if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
SAMBA4_BUNDLED_LIBS+= tevent
-CONFLICTS+= tevent-0.*
+CONFLICTS+= tevent1-0.*
PLIST_SUB+= SAMBA4_BUNDLED_TEVENT=""
SUB_LIST+= SAMBA4_BUNDLED_TEVENT=""
.else
SAMBA4_BUNDLED_LIBS+= !tevent
-BUILD_DEPENDS+= tevent>=0.9.37:devel/tevent
-RUN_DEPENDS+= tevent>=0.9.37:devel/tevent
+BUILD_DEPENDS+= tevent1>=0.9.37:devel/tevent1
+RUN_DEPENDS+= tevent1>=0.9.37:devel/tevent1
PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment "
.endif
# tdb
.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
SAMBA4_BUNDLED_LIBS+= tdb
-CONFLICTS+= tdb-1.*
+CONFLICTS+= tdb1-1.*
PLIST_SUB+= SAMBA4_BUNDLED_TDB=""
SUB_LIST+= SAMBA4_BUNDLED_TDB=""
.else
SAMBA4_BUNDLED_LIBS+= !tdb
-BUILD_DEPENDS+= tdb>=1.3.15:databases/tdb
-RUN_DEPENDS+= tdb>=1.3.15:databases/tdb
+BUILD_DEPENDS+= tdb1>=1.3.15:databases/tdb1
+RUN_DEPENDS+= tdb1>=1.3.15:databases/tdb1
PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment "
.endif
@@ -499,6 +499,8 @@ MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)
.if ${CHOSEN_COMPILER_TYPE} == clang
CFLAGS+= -fno-color-diagnostics
.endif
+# Allow rpcgen ti find proper CPP
+MAKE_ENV+= RPCGEN_CPP="${CPP}"
#.if ${readline_ARGS} == port
#CFLAGS+= -D_FUNCTION_DEF
#.endif
More information about the svn-ports-head
mailing list