Page MenuHomeFreeBSD
Files F176043510

D60726.id189922.diff
No OneTemporary
Actions

D60726.id189922.diff
View Options

diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,15 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20261014:
+ AFFECTS: users of dns/knot3, dns/knot-resolver{,6}
+ AUTHOR: nxjoseph@FreeBSD.org
+
+ The ports now have flavors that depend on either lmdb0 or lmdb1.
+ The default is lmdb1.
+
+ If you want/need to use lmdb0, you will need to install the lmdb0 flavor.
+
20261011:
AFFECTS: users of devel/maven
AUTHOR: michaelo@FreeBSD.org
diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -1,11 +1,12 @@
PORTNAME= knot-resolver
DISTVERSION= 5.7.8
+PORTREVISION= 1
CATEGORIES= dns
MASTER_SITES= https://knot-resolver.nic.cz/release/ \
https://dns.company/downloads/knot-resolver/
MAINTAINER= freebsd@dns.company
-COMMENT= Caching full resolver implementation
+COMMENT= Caching full resolver implementation ${${FLAVOR}_COMMENT}
WWW= https://www.knot-resolver.cz/
LICENSE= GPLv3+
@@ -17,12 +18,20 @@
luacheck:devel/lua-luacheck
LIB_DEPENDS= libgnutls.so:security/gnutls \
libknot.so:dns/knot3 \
- liblmdb.so:databases/lmdb \
libnghttp2.so:www/libnghttp2 \
libuv.so:devel/libuv \
libzscanner.so:dns/knot3
RUN_DEPENDS= lua51-cqueues>=20200726_1:devel/lua-cqueues@lua51
+FLAVORS= lmdb1 lmdb0
+FLAVOR?= ${FLAVORS:[1]}
+
+lmdb0_PKGNAMESUFFIX= -lmdb0
+lmdb0_COMMENT= (LMDB 0.9 database)
+
+lmdb0_LIB_DEPENDS= liblmdb.so:databases/lmdb0
+lmdb1_LIB_DEPENDS= liblmdb.so.1:databases/lmdb
+
USES= cmake:indirect compiler:c11 libedit luajit meson ncurses ninja \
pkgconfig python:build shebangfix tar:xz
USE_CXXSTD= c++11
@@ -62,7 +71,8 @@
LDFLAGS+= -L${LOCALBASE}/lib
-CONFLICTS= knot-1.* knot1-[0-6].*
+CONFLICTS= knot-1.* knot1-[0-6].*
+CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/knot-resolver-/}
SUB_FILES= pkg-message
diff --git a/dns/knot-resolver6/Makefile b/dns/knot-resolver6/Makefile
--- a/dns/knot-resolver6/Makefile
+++ b/dns/knot-resolver6/Makefile
@@ -1,13 +1,13 @@
PORTNAME= knot-resolver
DISTVERSION= 6.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= dns
MASTER_SITES= https://knot-resolver.nic.cz/release/ \
https://dns.company/downloads/knot-resolver/
PKGNAMESUFFIX?= 6
MAINTAINER= freebsd@dns.company
-COMMENT= Caching full resolver implementation
+COMMENT= Caching full resolver implementation ${${FLAVOR}_COMMENT}
WWW= https://www.knot-resolver.cz/
LICENSE= GPLv3+
@@ -19,7 +19,6 @@
luacheck:devel/lua-luacheck
LIB_DEPENDS= libgnutls.so:security/gnutls \
libknot.so:dns/knot3 \
- liblmdb.so:databases/lmdb \
libnghttp2.so:www/libnghttp2 \
libngtcp2.so:net/libngtcp2 \
libngtcp2_crypto_gnutls.so:net/libngtcp2-gnutls \
@@ -27,6 +26,15 @@
libzscanner.so:dns/knot3
RUN_DEPENDS= ${LUA_FLAVOR}-cqueues>=20200726_1:devel/lua-cqueues@${LUA_FLAVOR}
+FLAVORS= lmdb1 lmdb0
+FLAVOR?= ${FLAVORS:[1]}
+
+lmdb0_PKGNAMESUFFIX= -lmdb0
+lmdb0_COMMENT= (LMDB 0.9 database)
+
+lmdb0_LIB_DEPENDS= liblmdb.so:databases/lmdb0
+lmdb1_LIB_DEPENDS= liblmdb.so.1:databases/lmdb
+
USES= cmake:indirect compiler:c11 lua:build,run luajit meson ncurses \
ninja pkgconfig python:build tar:xz
USE_CXXSTD= c++11
@@ -49,7 +57,8 @@
-Duser=${USERS} \
-Dutils=enabled
-CONFLICTS= knot-resolver-[0-5].*
+CONFLICTS= knot-resolver-[0-5].*
+CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/knot-resolver6-/}
SUB_FILES= pkg-message
diff --git a/dns/knot3/Makefile b/dns/knot3/Makefile
--- a/dns/knot3/Makefile
+++ b/dns/knot3/Makefile
@@ -1,21 +1,31 @@
PORTNAME= knot
DISTVERSION= ${KNOT_VERSION}
+PORTREVISION= 1
CATEGORIES= dns
MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \
https://dns.company/downloads/knot-dns/
PKGNAMESUFFIX?= 3
MAINTAINER= freebsd@dns.company
-COMMENT= High performance authoritative-only DNS server
+COMMENT= High performance authoritative-only DNS server ${${FLAVOR}_COMMENT}
WWW= https://www.knot-dns.cz/
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= gsed:textproc/gsed \
- lmdb>=1.0.0:databases/lmdb
-LIB_DEPENDS= libgnutls.so:security/gnutls \
- liblmdb.so:databases/lmdb
+BUILD_DEPENDS= gsed:textproc/gsed
+LIB_DEPENDS= libgnutls.so:security/gnutls
+
+FLAVORS= lmdb1 lmdb0
+FLAVOR?= ${FLAVORS:[1]}
+
+lmdb0_PKGNAMESUFFIX= 3-lmdb0
+lmdb0_COMMENT= (LMDB 0.9 database)
+
+lmdb0_BUILD_DEPENDS= lmdb0<1:databases/lmdb0
+lmdb0_LIB_DEPENDS= liblmdb.so:databases/lmdb0
+lmdb1_BUILD_DEPENDS= lmdb>=1.0.0:databases/lmdb
+lmdb1_LIB_DEPENDS= liblmdb.so:databases/lmdb
USES= compiler:c11 libtool localbase pkgconfig tar:xz
USE_LDCONFIG= yes
@@ -29,7 +39,8 @@
INSTALL_TARGET= install-strip
-CONFLICTS= knot-1.* knot1-[0-6].* knot2-[0-9].*
+CONFLICTS= knot-1.* knot1-[0-6].* knot2-[0-9].*
+CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/knot3-/}
DATADIR= /var/db/${PORTNAME}
RUNDIR= /var/run/${PORTNAME}

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 16, 2:24 PM (5 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40878437
Default Alt Text
D60726.id189922.diff (4 KB)

Event Timeline