On 2019/08/30 16:25, Otto Moerbeek wrote:
> Hi,
>
> just released. This is s strightforward port, I left some new features out
> for the moment.
s/recursor/auth/ :)
> Al local patches have been upstreamed.
It now picks up libcurl if present (used by sdig). Here's a diff on top of
yours to fix up the library dependencies (the -mysql and -ldap ones also
changed slightly due to other changes in the ports tree). OK sthen with that
applied on top; otherwise if you prefer it looks like the curl support could
be disabled via autoconf.
"make port-lib-depends-check" still complains about the heimdal libraries,
but that is a limitation of the checker which doesn't correctly handle
libraries in subdirs and can be ignored.
--- Makefile- Fri Aug 30 17:24:25 2019
+++ Makefile Fri Aug 30 17:24:08 2019
@@ -27,10 +27,11 @@ MULTI_PACKAGES= -main -mysql -pgsql -ldap
# GPLv2 only, OpenSSL exemption
PERMIT_PACKAGE= Yes
-WANTLIB += m pthread ${COMPILER_LIBCXX}
+WANTLIB += crypto m pthread ssl ${COMPILER_LIBCXX}
WANTLIB-main += ${WANTLIB}
-WANTLIB-main += boost_program_options-mt c crypto sodium sqlite3 z
+WANTLIB-main += boost_program_options-mt c curl nghttp2 sodium
+WANTLIB-main += sqlite3 z
MASTER_SITES= https://downloads.powerdns.com/releases/
MAINTAINER= Otto Moerbeek <[email protected]>
@@ -42,6 +43,7 @@ NO_TEST= Yes
LIB_DEPENDS-main= ${LIB_DEPENDS} \
databases/sqlite3 \
devel/boost \
+ net/curl \
security/libsodium
PSEUDO_FLAVORS+= no_mysql no_pgsql no_ldap
@@ -79,7 +81,7 @@ CONFIGURE_ARGS+= --without-mysql
LIB_DEPENDS-mysql= ${LIB_DEPENDS} \
databases/mariadb
RUN_DEPENDS-mysql= net/powerdns
-WANTLIB-mysql+= ${WANTLIB} crypto lib/mysql/mysqlclient ssl z
+WANTLIB-mysql+= ${WANTLIB} iconv mariadb z
# PostgreSQL
.if ${BUILD_PACKAGES:M-pgsql}
@@ -91,7 +93,7 @@ CONFIGURE_ARGS+= --without-pg-config
LIB_DEPENDS-pgsql= ${LIB_DEPENDS} \
databases/postgresql,-main
RUN_DEPENDS-pgsql= net/powerdns
-WANTLIB-pgsql= ${WANTLIB} crypto pq>=2 ssl
+WANTLIB-pgsql= ${WANTLIB} pq>=2
# LDAP
.if ${BUILD_PACKAGES:M-ldap}
@@ -104,7 +106,7 @@ LIB_DEPENDS-ldap= ${LIB_DEPENDS} \
security/heimdal,-libs
RUN_DEPENDS-ldap= net/powerdns
WANTLIB-ldap= ${WANTLIB} ldap_r
-WANTLIB-ldap+= c com_err crypto lber-2.4 ldap_r-2.4 sasl2 ssl util
+WANTLIB-ldap+= c com_err lber sasl2 util
WANTLIB-ldap+= heimdal/lib/asn1 heimdal/lib/hcrypto
heimdal/lib/heimbase
WANTLIB-ldap+= heimdal/lib/heimsqlite heimdal/lib/hx509
heimdal/lib/krb5
WANTLIB-ldap+= heimdal/lib/roken heimdal/lib/wind
