Index: head/ftp/curl/Makefile =================================================================== --- head/ftp/curl/Makefile (revision 468779) +++ head/ftp/curl/Makefile (revision 468780) @@ -1,178 +1,176 @@ # Created by: Neil Blakey-Milner # $FreeBSD$ PORTNAME= curl PORTVERSION= 7.59.0 CATEGORIES= ftp net www MASTER_SITES= https://curl.haxx.se/download/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Command line tool and library for transferring data with URLs LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= BROTLI CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 METALINK PROXY PSL TLS_SRP OPTIONS_GROUP= PROTOCOL OPTIONS_RADIO= SSL OPTIONS_SINGLE= GSSAPI RESOLV OPTIONS_GROUP_PROTOCOL= DICT FTP GOPHER HTTP HTTP2 IMAP LDAP LDAPS LIBSSH2 POP3 RTMP RTSP SMB SMTP TELNET TFTP -OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL POLARSSL WOLFSSL +OPTIONS_RADIO_SSL= GNUTLS NSS OPENSSL WOLFSSL OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SINGLE_RESOLV= CARES THREADED_RESOLVER OPTIONS_DEFAULT= CA_BUNDLE COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IMAP OPENSSL POP3 PROXY RESOLV RTSP SMTP TELNET TFTP THREADED_RESOLVER TLS_SRP CA_BUNDLE_DESC= Enable CA bundle for OpenSSL/GnuTLS/mbedTLS COOKIES_DESC= Cookies support CURL_DEBUG_DESC= cURL debug memory tracking DICT_DESC= DICT (RFC 2229) support HTTP_DESC= HTTP/HTTPS support HTTP2_DESC= HTTP/2 support (requires HTTP) HTTP2_IMPLIES= HTTP IMAP_DESC= IMAP/IMAPS support LDAPS_IMPLIES= LDAP LIBSSH2_DESC= SCP/SFTP support via libssh2 LIBSSH2_IMPLIES= OPENSSL POP3_DESC= POP3/POP3S support PROXY_IMPLIES= HTTP RESOLV_DESC= DNS resolving options RTSP_IMPLIES= HTTP SMB_DESC= SMB/CIFS support SMTP_DESC= SMTP/SMTPS support THREADED_RESOLVER_DESC= Threaded DNS resolver TLS_SRP_DESC= TLS-SRP (Secure Remote Password) support CONFIGURE_ARGS= --disable-werror \ --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \ --without-axtls CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ ac_cv_func_SSLv2_client_method=no GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_TARGET= test USE_LDCONFIG= yes USE_PERL5= build USES= cpe gmake libtool localbase pathfix perl5 shebangfix tar:xz PORTDOCS= * PORTEXAMPLES= * CPE_VENDOR= haxx DOCS= BUGS CODE_OF_CONDUCT.md CODE_STYLE.md CONTRIBUTE.md FAQ \ FEATURES HISTORY.md HTTP-COOKIES.md HTTP2.md INSTALL \ INTERNALS.md KNOWN_BUGS LICENSE-MIXING.md MAIL-ETIQUETTE \ MANUAL RELEASE-PROCEDURE RESOURCES ROADMAP.md \ SECURITY-PROCESS.md SSL-PROBLEMS.md SSLCERTS.md THANKS TODO \ TheArtOfHttpScripting VERSIONS SHEBANG_FILES= */*.pl BROTLI_CONFIGURE_WITH= brotli BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli CA_BUNDLE_CONFIGURE_WITH= ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss CARES_CONFIGURE_ENABLE= ares CARES_LIB_DEPENDS= libcares.so:dns/c-ares COOKIES_CONFIGURE_ENABLE= cookies CURL_DEBUG_CONFIGURE_ENABLE= curldebug DEBUG_CONFIGURE_ENABLE= debug DICT_CONFIGURE_ENABLE= dict FTP_CONFIGURE_ENABLE= ftp GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GOPHER_CONFIGURE_ENABLE=gopher GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS} GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_BASE_LIBS= ${GSSAPILIBS} GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS} GSSAPI_HEIMDAL_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_HEIMDAL_LIBS= ${GSSAPILIBS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CONFIGURE_ON=--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_CPPFLAGS= ${GSSAPICPPFLAGS} GSSAPI_MIT_LDFLAGS= ${GSSAPILDFLAGS} GSSAPI_MIT_LIBS= ${GSSAPILIBS} GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi HTTP_CONFIGURE_ENABLE= http HTTP2_CONFIGURE_WITH= nghttp2 HTTP2_LIB_DEPENDS= libnghttp2.so:www/libnghttp2 HTTP2_USES= pkgconfig IDN_CONFIGURE_WITH= libidn2 IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IMAP_CONFIGURE_ENABLE= imap IPV6_CATEGORIES= ipv6 IPV6_CONFIGURE_ENABLE= ipv6 LDAP_CONFIGURE_ENABLE= ldap LDAP_USE= OPENLDAP=yes LDAPS_CONFIGURE_ENABLE= ldaps LIBSSH2_CONFIGURE_WITH= libssh2 LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 METALINK_CONFIGURE_WITH=libmetalink METALINK_LIB_DEPENDS= libmetalink.so:misc/libmetalink METALINK_LIBS= -lcrypto NSS_CONFIGURE_WITH= nss NSS_LIB_DEPENDS= libnss3.so:security/nss NSS_USES= pkgconfig OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} OPENSSL_USES= ssl -POLARSSL_CONFIGURE_WITH=polarssl -POLARSSL_LIB_DEPENDS= libmbedtls.so.9:security/polarssl13 POP3_CONFIGURE_ENABLE= pop3 PROXY_CONFIGURE_ENABLE= proxy PSL_CONFIGURE_WITH= libpsl PSL_LIB_DEPENDS= libpsl.so:dns/libpsl RTMP_CONFIGURE_WITH= librtmp RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp RTMP_USES= pkgconfig RTSP_ENABLE= rtsp SMB_CONFIGURE_ENABLE= smb SMTP_CONFIGURE_ENABLE= smtp TELNET_CONFIGURE_ENABLE=telnet TFTP_CONFIGURE_ENABLE= tftp THREADED_RESOLVER_CONFIGURE_ENABLE= pthreads threaded-resolver TLS_SRP_CONFIGURE_ENABLE= tls-srp WOLFSSL_CONFIGURE_WITH= cyassl WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl .include .if ((!${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}) || (${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mlibressl*})) && ${PORT_OPTIONS:MTLS_SRP} IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS .endif -.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MPOLARSSL} && !${PORT_OPTIONS:MWOLFSSL} +.if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MNSS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL} IGNORE= only supports LDAPS with SSL .endif post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs scripts|; /^DIST_SUBDIRS = / s| docs scripts||; /cd docs &&/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|include |include |' ${WRKSRC}/lib/curl_gssapi.h ${WRKSRC}/lib/urldata.h post-install: ${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${STAGEDIR}${PREFIX}/share/aclocal/ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/libcurl/ cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.m4 ${STAGEDIR}${DOCSDIR}/libcurl/ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cpp ${STAGEDIR}${EXAMPLESDIR}/ pre-test-PROXY-off: @${ECHO_MSG} "******************************************" @${ECHO_MSG} "* You have disabled curl proxy support. *" @${ECHO_MSG} "* Some tests SHALL FAIL! *" @${ECHO_MSG} "* This is being addressed. *" @${ECHO_MSG} "******************************************" .include Index: head/net-mgmt/zabbix3-server/Makefile =================================================================== --- head/net-mgmt/zabbix3-server/Makefile (revision 468779) +++ head/net-mgmt/zabbix3-server/Makefile (revision 468780) @@ -1,214 +1,211 @@ # Created by: Pakhom Golynga # $FreeBSD$ PORTNAME= zabbix3 PORTVERSION= 3.0.16 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server DISTNAME= zabbix-${PORTVERSION} MAINTAINER= pg@pakhom.spb.ru COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LTS LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS= zabbix[0-9][0-9]${PKGNAMESUFFIX} zabbix[0-24-9]${PKGNAMESUFFIX} IGNORE_WITH_MYSQL= 41 ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif USES= pkgconfig iconv USERS= zabbix GROUPS= zabbix .if ${ZABBIX_BUILD} != "proxy" PLIST_SUB= PROXY="@comment " .else PLIST_SUB= PROXY="" .endif .if ${ZABBIX_BUILD} == "server" PLIST_SUB+= SERVER="" .else PLIST_SUB+= SERVER="@comment " .endif PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE} MAKE_ARGS+= ARCH=freebsd GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \ --sysconfdir=${ETCDIR} \ --datadir=${ETCDIR} \ --with-iconv=${ICONV_PREFIX} .if ${ZABBIX_BUILD} != "agent" LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp CPPFLAGS+= -I${LOCALBASE}/include SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \ LIBXML2 OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL OPTIONS_SUB= yes CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks JABBER_DESC= Support for Jabber media type LDAP_DESC= Support for LDAP server checks NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks ODBC_DESC= Support for database checks via ODBC JAVAGW_DESC= Support for Java gateway LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) OPTIONS_SINGLE= DB ODBC SSL OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS MYSQL_CONFIGURE_WITH= mysql MYSQL_USES+= mysql PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES+= pgsql SQLITE_CONFIGURE_WITH= sqlite3 SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle CURL_CONFIGURE_WITH= libcurl CURL_LIB_DEPENDS= libcurl.so:ftp/curl LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi JABBER_CONFIGURE_WITH= jabber JABBER_LIB_DEPENDS= libiksemel.so:textproc/iksemel FPING_RUN_DEPENDS= fping:net/fping SSH_CONFIGURE_WITH= ssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 IODBC_CONFIGURE_WITH= iodbc IODBC_LIB_DEPENDS= libiodbc.so:databases/libiodbc UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .else OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo JAVAGW_CONFIGURE_ENABLE=java JAVAGW_USE= JAVA=yes LIBXML2_CONFIGURE_WITH= libxml2 LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 OPENSSL_CONFIGURE_WITH= openssl OPENSSL_USES= ssl OPENSSL_VARS= BROKEN_SSL="libressl libressl-devel" \ BROKEN_SSL_REASON="PSK is not provided by LibreSSL" GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls - -POLARSSL_CONFIGURE_WITH=mbedtls -POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13 .include post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ ${WRKSRC}/conf/zabbix_*.conf \ ${WRKSRC}/src/zabbix_proxy/proxy.c \ ${WRKSRC}/src/zabbix_server/server.c .if ${ZABBIX_BUILD} == "server" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \ ${WRKSRC}/conf/zabbix_server*.conf @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ ${WRKSRC}/conf/zabbix_server*.conf .endif .if ${ZABBIX_BUILD} == "proxy" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_proxy.pid#PidFile=/var/run/zabbix/zabbix_proxy.pid#g' \ ${WRKSRC}/conf/zabbix_proxy*.conf @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ ${WRKSRC}/conf/zabbix_proxy*.conf .endif .if ${ZABBIX_BUILD} == "agent" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_agentd.pid#PidFile=/var/run/zabbix/zabbix_agentd.pid#g' \ ${WRKSRC}/conf/zabbix_agentd*.conf @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ ${WRKSRC}/conf/zabbix_agentd*.conf .endif .if ${ZABBIX_BUILD} != "agent" . for d in mysql oracle postgresql sqlite3 @${REINPLACE_CMD} \ -e 's|/bin/ping|/sbin/ping|g' \ -e 's|/usr/bin/traceroute|/usr/sbin/traceroute|g' \ -e 's|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g' \ ${WRKSRC}/database/${d}/data.sql . endfor .endif @${REINPLACE_CMD} \ -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \ ${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + post-install: .if ${PORT_OPTIONS:MJAVAGW} ${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \ ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample .endif .if ${ZABBIX_BUILD} != "agent" ${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database (cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches \ ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/upgrades/) (cd ${WRKSRC}/database/ && \ ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \ ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/) .endif .else # frontend .include .endif .include Index: head/net-mgmt/zabbix32-server/Makefile =================================================================== --- head/net-mgmt/zabbix32-server/Makefile (revision 468779) +++ head/net-mgmt/zabbix32-server/Makefile (revision 468780) @@ -1,217 +1,214 @@ # Created by: Pakhom Golynga # $FreeBSD$ PORTNAME= zabbix32 PORTVERSION= 3.2.11 PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server DISTNAME= zabbix-${PORTVERSION} MAINTAINER= pg@pakhom.spb.ru COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS= zabbix[0-24-9][0-9]${PKGNAMESUFFIX} \ zabbix3[0-13-9]${PKGNAMESUFFIX} \ zabbix[0-9]${PKGNAMESUFFIX} IGNORE_WITH_MYSQL= 41 ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif USES= pkgconfig iconv USERS= zabbix GROUPS= zabbix .if ${ZABBIX_BUILD} != "proxy" PLIST_SUB= PROXY="@comment " .else PLIST_SUB= PROXY="" .endif .if ${ZABBIX_BUILD} == "server" PLIST_SUB+= SERVER="" .else PLIST_SUB+= SERVER="@comment " .endif PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE} MAKE_ARGS+= ARCH=freebsd GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \ --sysconfdir=${ETCDIR} \ --datadir=${ETCDIR} \ --with-iconv=${ICONV_PREFIX} .if ${ZABBIX_BUILD} != "agent" LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp CPPFLAGS+= -I${LOCALBASE}/include SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \ LIBXML2 OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL OPTIONS_SUB= yes CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks JABBER_DESC= Support for Jabber media type LDAP_DESC= Support for LDAP server checks NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks ODBC_DESC= Support for database checks via ODBC JAVAGW_DESC= Support for Java gateway LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) OPTIONS_SINGLE= DB ODBC SSL OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS MYSQL_CONFIGURE_WITH= mysql MYSQL_USES+= mysql PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES+= pgsql SQLITE_CONFIGURE_WITH= sqlite3 SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle CURL_CONFIGURE_WITH= libcurl CURL_LIB_DEPENDS= libcurl.so:ftp/curl LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi JABBER_CONFIGURE_WITH= jabber JABBER_LIB_DEPENDS= libiksemel.so:textproc/iksemel FPING_RUN_DEPENDS= fping:net/fping SSH_CONFIGURE_WITH= ssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 IODBC_CONFIGURE_WITH= iodbc IODBC_LIB_DEPENDS= libiodbc.so:databases/libiodbc UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .else OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo JAVAGW_CONFIGURE_ENABLE=java JAVAGW_USE= JAVA=yes LIBXML2_CONFIGURE_WITH= libxml2 LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 OPENSSL_CONFIGURE_WITH= openssl OPENSSL_USES= ssl OPENSSL_VARS= BROKEN_SSL="libressl libressl-devel" \ BROKEN_SSL_REASON="PSK is not provided by LibreSSL" GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls - -POLARSSL_CONFIGURE_WITH=mbedtls -POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13 .include post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ ${WRKSRC}/conf/zabbix_*.conf \ ${WRKSRC}/src/zabbix_proxy/proxy.c \ ${WRKSRC}/src/zabbix_server/server.c .if ${ZABBIX_BUILD} == "server" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \ ${WRKSRC}/conf/zabbix_server*.conf @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ ${WRKSRC}/conf/zabbix_server*.conf .endif .if ${ZABBIX_BUILD} == "proxy" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_proxy.pid#PidFile=/var/run/zabbix/zabbix_proxy.pid#g' \ ${WRKSRC}/conf/zabbix_proxy*.conf @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ ${WRKSRC}/conf/zabbix_proxy*.conf .endif .if ${ZABBIX_BUILD} == "agent" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_agentd.pid#PidFile=/var/run/zabbix/zabbix_agentd.pid#g' \ ${WRKSRC}/conf/zabbix_agentd*.conf @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ ${WRKSRC}/conf/zabbix_agentd*.conf .endif .if ${ZABBIX_BUILD} != "agent" . for d in mysql oracle postgresql sqlite3 @${REINPLACE_CMD} \ -e 's|/bin/ping|/sbin/ping|g' \ -e 's|/usr/bin/traceroute|/usr/sbin/traceroute|g' \ -e 's|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g' \ ${WRKSRC}/database/${d}/data.sql . endfor .endif @${REINPLACE_CMD} \ -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \ ${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + post-install: .if ${PORT_OPTIONS:MJAVAGW} ${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \ ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample .endif .if ${ZABBIX_BUILD} != "agent" ${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database (cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches \ ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/upgrades/) (cd ${WRKSRC}/database/ && \ ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \ ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/) .endif .else # frontend .include .endif .include Index: head/net-mgmt/zabbix34-server/Makefile =================================================================== --- head/net-mgmt/zabbix34-server/Makefile (revision 468779) +++ head/net-mgmt/zabbix34-server/Makefile (revision 468780) @@ -1,220 +1,217 @@ # Created by: Pakhom Golynga # $FreeBSD$ PORTNAME= zabbix34 PORTVERSION= 3.4.8 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server DISTNAME= zabbix-${PORTVERSION} MAINTAINER= pg@pakhom.spb.ru COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:devel/pcre CONFLICTS= zabbix[0-24-9][0-9]${PKGNAMESUFFIX} \ zabbix3[0-35-9]${PKGNAMESUFFIX} \ zabbix[0-9]${PKGNAMESUFFIX} IGNORE_WITH_MYSQL= 41 ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} LIB_DEPENDS+= libevent.so:devel/libevent USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif USES= pkgconfig iconv USERS= zabbix GROUPS= zabbix .if ${ZABBIX_BUILD} != "proxy" PLIST_SUB= PROXY="@comment " .else PLIST_SUB= PROXY="" .endif .if ${ZABBIX_BUILD} == "server" PLIST_SUB+= SERVER="" .else PLIST_SUB+= SERVER="@comment " .endif PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} MAKE_ARGS+= ARCH=freebsd GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \ --sysconfdir=${ETCDIR} \ --datadir=${ETCDIR} \ --with-iconv=${ICONV_PREFIX} .if ${ZABBIX_BUILD} != "agent" LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp CPPFLAGS+= -I${LOCALBASE}/include SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \ LIBXML2 OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL OPTIONS_SUB= yes CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks JABBER_DESC= Support for Jabber media type LDAP_DESC= Support for LDAP server checks NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks ODBC_DESC= Support for database checks via ODBC JAVAGW_DESC= Support for Java gateway LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) OPTIONS_SINGLE= DB ODBC SSL OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS MYSQL_CONFIGURE_WITH= mysql MYSQL_USES+= mysql PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES+= pgsql SQLITE_CONFIGURE_WITH= sqlite3 SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle CURL_CONFIGURE_WITH= libcurl CURL_LIB_DEPENDS= libcurl.so:ftp/curl LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi JABBER_CONFIGURE_WITH= jabber JABBER_LIB_DEPENDS= libiksemel.so:textproc/iksemel FPING_RUN_DEPENDS= fping:net/fping SSH_CONFIGURE_WITH= ssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 IODBC_CONFIGURE_WITH= iodbc IODBC_LIB_DEPENDS= libiodbc.so:databases/libiodbc UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .else OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= OPENSSL GNUTLS POLARSSL +OPTIONS_SINGLE_SSL= OPENSSL GNUTLS .endif # if ${ZABBIX_BUILD} != "agent" IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo JAVAGW_CONFIGURE_ENABLE=java JAVAGW_USE= JAVA=yes LIBXML2_CONFIGURE_WITH= libxml2 LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 OPENSSL_CONFIGURE_WITH= openssl OPENSSL_USES= ssl OPENSSL_VARS= BROKEN_SSL="libressl libressl-devel" \ BROKEN_SSL_REASON="PSK is not provided by LibreSSL" GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls - -POLARSSL_CONFIGURE_WITH=mbedtls -POLARSSL_LIB_DEPENDS= libmbedtls.so:security/polarssl13 .include post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' \ ${WRKSRC}/conf/zabbix_*.conf \ ${WRKSRC}/src/zabbix_proxy/proxy.c \ ${WRKSRC}/src/zabbix_server/server.c .if ${ZABBIX_BUILD} == "server" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \ ${WRKSRC}/conf/zabbix_server*.conf @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ ${WRKSRC}/conf/zabbix_server*.conf .endif .if ${ZABBIX_BUILD} == "proxy" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_proxy.pid#PidFile=/var/run/zabbix/zabbix_proxy.pid#g' \ ${WRKSRC}/conf/zabbix_proxy*.conf @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ ${WRKSRC}/conf/zabbix_proxy*.conf .endif .if ${ZABBIX_BUILD} == "agent" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_agentd.pid#PidFile=/var/run/zabbix/zabbix_agentd.pid#g' \ ${WRKSRC}/conf/zabbix_agentd*.conf @${REINPLACE_CMD} -e 's#Include=/usr/local/usr/local/etc/zabbix3#Include=/usr/local/etc/zabbix3/zabbix#g' \ ${WRKSRC}/conf/zabbix_agentd*.conf .endif .if ${ZABBIX_BUILD} != "agent" . for d in mysql oracle postgresql sqlite3 @${REINPLACE_CMD} \ -e 's|/bin/ping|/sbin/ping|g' \ -e 's|/usr/bin/traceroute|/usr/sbin/traceroute|g' \ -e 's|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g' \ ${WRKSRC}/database/${d}/data.sql . endfor .endif @${REINPLACE_CMD} \ -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \ ${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + post-install: .if ${PORT_OPTIONS:MJAVAGW} ${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \ ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample .endif .if ${ZABBIX_BUILD} != "agent" ${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database (cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches \ ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/upgrades/) (cd ${WRKSRC}/database/ && \ ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \ ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/) .endif .else # frontend .include .endif .include Index: head/net-p2p/transmission-cli/Makefile =================================================================== --- head/net-p2p/transmission-cli/Makefile (revision 468779) +++ head/net-p2p/transmission-cli/Makefile (revision 468780) @@ -1,119 +1,116 @@ # $FreeBSD$ PORTNAME= transmission PORTVERSION= 2.93 PORTREVISION?= 0 CATEGORIES?= net-p2p MASTER_SITES= https://github.com/transmission/transmission-releases/raw/master/ \ http://transmission.cachefly.net/ PKGNAMESUFFIX?= -cli MAINTAINER?= crees@FreeBSD.org COMMENT?= Lightweight CLI (command line) BitTorrent client and utilities SLAVEPORT?= cli LICENSE= GPLv2+ .if ${SLAVEPORT} == cli LICENSE+= MIT LICENSE_COMB= multi .endif LICENSE_FILE= ${WRKSRC}/COPYING USES+= cpe tar:xz CPE_VENDOR= transmissionbt CONFLICTS_INSTALL= ${PORTNAME}${PKGNAMESUFFIX}-2.5* EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party .if ${SLAVEPORT} != web LIB_DEPENDS?= ${GEN_LIB_DEPENDS} # General dependencies GEN_LIB_DEPENDS=libb64.so:converters/libb64 \ libcurl.so:ftp/curl \ libdht.so:devel/jech-dht \ libminiupnpc.so:net/miniupnpc \ libnatpmp.so:net/libnatpmp \ libutp.so:net/libutp \ libevent.so:devel/libevent GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:www/transmission-web # This is master port of transmission-*, so don't override USES definition USES+= gmake iconv libtool localbase pkgconfig GNU_CONFIGURE= yes LIBS+= ${ICONV_LIB} CONFIGURE_ENV= ${ICONV_LIB:C@.+@ac_cv_func_iconv=yes@} CONFIGURE_ARGS= --without-inotify \ --enable-external-b64 \ --enable-external-dht \ --enable-external-natpmp \ ${EXTRA_CONF_ARGS} EXTRA_CONF_ARGS?=--enable-cli \ --disable-daemon \ --without-gtk \ --disable-mac \ --disable-nls EXTRA_PATCHES= ${PATCHDIR}/disable-web OPTIONS_DEFINE+= DOCS LITE OPTIONS_DEFAULT+= OPENSSL OPTIONS_SINGLE+= SSL -OPTIONS_SINGLE_SSL+= OPENSSL POLARSSL WOLFSSL +OPTIONS_SINGLE_SSL+= OPENSSL WOLFSSL LITE_CONFIGURE_ENABLE= lightweight OPENSSL_USES= ssl OPENSSL_CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" OPENSSL_CONFIGURE_ON= --with-crypto=openssl - -POLARSSL_LIB_DEPENDS= libpolarssl.so:security/polarssl13 -POLARSSL_CONFIGURE_ON= --with-crypto=polarssl WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl WOLFSSL_CONFIGURE_ON= --with-crypto=cyassl WOLFSSL_BROKEN= Requires security/wolfssl built with --enable-arc4 .endif DOCS= AUTHORS NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} general-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g' .if ${SLAVEPORT} != gtk @${REINPLACE_CMD} -e '/#define DISABLE_GETTEXT/s,/\* \(.*\) \*/,\1,' \ ${WRKSRC}/libtransmission/utils.h .endif @${REINPLACE_CMD} -e \ 's|rt_clock_gettime=yes|rt_clock_gettime=no|g ; \ s|" == "|" = "|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|doc \\| \\|g' \ ${WRKSRC}/Makefile.in .if ${SLAVEPORT} != cli @${REINPLACE_CMD} -e 's|utils \\|\\|g' \ ${WRKSRC}/Makefile.in .endif # Don't conflict with patches but force system libraries @${REINPLACE_CMD} -e 's|third-party \\|\\|g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} \ -e 's|third-party/[^ ]*Makefile||g' \ ${WRKSRC}/configure post-patch: general-patch general-install: .if ${SLAVEPORT} != web (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${DOCS}" ${STAGEDIR}${DOCSDIR}) .endif post-install: general-install .include