Index: head/archivers/py-attic/Makefile =================================================================== --- head/archivers/py-attic/Makefile (revision 418010) +++ head/archivers/py-attic/Makefile (revision 418011) @@ -1,45 +1,46 @@ # Created by: Thomas Hurst # $FreeBSD$ PORTNAME= attic PORTVERSION= 0.16 CATEGORIES= archivers python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Attic-${PORTVERSION} MAINTAINER= tom@hur.st COMMENT= Deduplicating backup program LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python USES= python:3.3+ USE_PYTHON= autoplist distutils USE_OPENSSL= yes STRIP_FILES= hashindex.so platform_freebsd.so chunker.so crypto.so PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSYS:tl}-${UNAMER}-${ARCH}-${PYTHON_VER} -.include +.include .if ${OSVERSION} < 1000015 -BUILD_DEPENDS+= openssl>=1.0:security/openssl -RUN_DEPENDS+= openssl>=1.0:security/openssl +WITH_OPENSSL_PORT= yes .endif + +.include .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} .endif regression-test: build ${SETENV} PYTHONPATH="${PYDISTUTILS_BUILDPATH}:${PYTHONPATH}" \ ${PYTHON_CMD} -m attic.testsuite.run post-install: ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/attic/,} .include Index: head/dns/ldns/Makefile =================================================================== --- head/dns/ldns/Makefile (revision 418010) +++ head/dns/ldns/Makefile (revision 418011) @@ -1,147 +1,147 @@ # Created by: Konstantin Saurbier # $FreeBSD$ PORTNAME= ldns PORTVERSION= 1.6.17 PORTREVISION= 5 CATEGORIES= dns MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ \ LOCAL/ehaupt MAINTAINER= jaap@NLnetLabs.nl COMMENT= Library for programs conforming to DNS RFCs and drafts LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE GNU_CONFIGURE= yes USES= cpe gmake libtool CPE_VENDOR= nlnetlabs USE_OPENSSL= yes USE_LDCONFIG= yes .if ! (defined(BUILD_PYLDNS) || defined(BUILD_P5PERL)) OPTIONS_DEFINE= DOXYGEN EXAMPLES DRILL OPTIONS_DEFAULT= DRILL DRILL_DESC= With drill program .endif OPTIONS_DEFINE+= GOST \ RRTYPENINFO RRTYPERKEY RRTYPECDS RRTYPEURI RRTYPETA GOST_DESC= GOST signatures enabled, requires openssl >= 1.0.0 RRTYPENINFO_DESC= Enable draft RR type ninfo. RRTYPERKEY_DESC= Enable draft RR type rkey. RRTYPECDS_DESC= Enable draft RR type cds. RRTYPEURI_DESC= Enable draft RR type uri. RRTYPETA_DESC= Enable draft RR type ta. OPTIONS_SUB= yes .include .if defined(BUILD_PYLDNS) USES+= python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} ALL_TARGET= pyldns INSTALL_TARGET= install-pyldns CONFIGURE_ARGS+=--with-pyldns LIB_DEPENDS+= libldns.so:dns/ldns BUILD_DEPENDS+= ${LOCALBASE}/bin/swig:devel/swig13 post-patch: @${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in .elif defined(BUILD_P5PERL) USES+= perl5 USE_PERL5= build run PKGNAMEPREFIX= p5-DNS- ALL_TARGET= p5-dns-ldns INSTALL_TARGET= install-p5-dns-ldns CONFIGURE_ARGS+=--with-p5-dns-ldns LIB_DEPENDS+= libldns.so:dns/ldns post-patch: @${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in .else ALL_TARGET= all INSTALL_TARGET= install-lib install-h install-config .if ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= doxygen:devel/doxygen ALL_TARGET+= doc INSTALL_TARGET+=install-manpages .endif .endif # BUILD_PYLDNS || BUILD_P5PERL .if ${PORT_OPTIONS:MGOST} . if ${OSVERSION} < 1000015 -BUILD_DEPENDS+= openssl>=1.0:security/openssl +WITH_OPENSSL_PORT= yes CONFLICTS+= libressl-* . endif .else NO_GOST= --disable-gost CONFIGURE_ARGS+=${NO_GOST} .endif .if ${PORT_OPTIONS:MRRTYPENINFO} CONFIGURE_ARGS+= --enable-rrtype-ninfo .endif .if ${PORT_OPTIONS:MRRTYPERKEY} CONFIGURE_ARGS+= --enable-rrtype-rkey .endif .if ${PORT_OPTIONS:MRRTYPECDS} CONFIGURE_ARGS+= --enable-rrtype-cds .endif .if ${PORT_OPTIONS:MRRTYPEURI} CONFIGURE_ARGS+= --enable-rrtype-uri .endif .if ${PORT_OPTIONS:MRRTYPETA} CONFIGURE_ARGS+= --enable-rrtype-ta .endif .if ! (defined(BUILD_PYLDNS) || defined(BUILD_P5PERL)) post-configure: # ac_cv_prog_libtool=../libtool => Always use bundled libtool .if ${PORT_OPTIONS:MEXAMPLES} @(cd ${WRKSRC}/examples; ./configure --prefix=${PREFIX} \ --infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man \ --build=${CONFIGURE_TARGET} ${NO_GOST} ${NO_SHA2} \ ac_cv_prog_libtool=../libtool) .endif .if ${PORT_OPTIONS:MDRILL} @(cd ${WRKSRC}/drill; ./configure --prefix=${PREFIX} \ --mandir=${MANPREFIX}/man \ --build=${CONFIGURE_TARGET} \ ac_cv_prog_libtool=../libtool) .endif post-build: .if ${PORT_OPTIONS:MEXAMPLES} @(cd ${WRKSRC}/examples; ${MAKE_CMD}) .endif .if ${PORT_OPTIONS:MDRILL} @(cd ${WRKSRC}/drill; ${MAKE_CMD}) .endif post-install: .if ${PORT_OPTIONS:MEXAMPLES} @(cd ${WRKSRC}/examples; ${MAKE_CMD} ${MAKE_ARGS} install) .endif .if ${PORT_OPTIONS:MDRILL} @(cd ${WRKSRC}/drill; ${MAKE_CMD} ${MAKE_ARGS} install) .endif ${INSTALL_DATA} ${WRKSRC}/packaging/libldns.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .endif # BUILD_PYLDNS || BUILD_P5PERL .include Index: head/net/openntpd/Makefile =================================================================== --- head/net/openntpd/Makefile (revision 418010) +++ head/net/openntpd/Makefile (revision 418011) @@ -1,44 +1,49 @@ # $FreeBSD$ PORTNAME= openntpd PORTVERSION= 6.0p1 PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= OPENBSD/OpenNTPD MAINTAINER= naddy@FreeBSD.org COMMENT= Network Time Protocol (NTP) daemon LICENSE= ISCL USERS= _ntp GROUPS= _ntp USE_RC_SUBR= openntpd GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules OPTIONS_DEFINE= RESSL RESSL_DESC= SSL/TLS support via LibreSSL OPTIONS_DEFAULT= RESSL # Requires libtls from LibreSSL RESSL_USE= openssl=yes RESSL_VARS= with_openssl_port=yes \ - openssl_port=security/libressl RESSL_CONFIGURE_WITH= cacert=${LOCALBASE}/etc/ssl/cert.pem RESSL_CPPFLAGS= -I${LOCALBASE}/include RESSL_LDFLAGS= -L${LOCALBASE}/lib RESSL_RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss pre-build: ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/src/ntpd.conf.5 ${WRKSRC}/src/ntpd.8 post-install: cd ${STAGEDIR}${PREFIX}/etc && ${MV} ntpd.conf ntpd.conf.sample -.include +.include + +.if ${PORT_OPTIONS:MRESSL} && empty(SSL_DEFAULT:Mlibressl*) +IGNORE= Requires LibreSSL from ports, define DEFAULT_VERSIONS+=ssl=libressl in your make.conf and rebuild everything. +.endif + +.include Index: head/security/bro/Makefile =================================================================== --- head/security/bro/Makefile (revision 418010) +++ head/security/bro/Makefile (revision 418011) @@ -1,159 +1,159 @@ # Created by: David O'Brien # $FreeBSD$ PORTNAME= bro PORTVERSION= 2.4.1 CATEGORIES= security MASTER_SITES= http://www.bro.org/downloads/release/ MAINTAINER= leres@ee.lbl.gov COMMENT= System for detecting network intruders in real-time LICENSE= BSD3CLAUSE BROKEN_powerpc64= Does not build BUILD_DEPENDS= ${LOCALBASE}/bin/bison:devel/bison \ ${LOCALBASE}/bin/swig:devel/swig13 LIB_DEPENDS= libGeoIP.so:net/GeoIP USES= cmake:outsource compiler:c++11-lang perl5 python CMAKE_ARGS+= -D PYTHON_EXECUTABLE:PATH=${PYTHON_CMD} CXXFLAGS+= -std=c++11 -Wextra -Wall -pedantic SUB_FILES= pkg-message NO_MTREE= yes .if defined(BRO_PREFIX) PREFIX=${BRO_PREFIX} PLIST_SUB+= CLEANUP_PREFIX="" .else PLIST_SUB+= CLEANUP_PREFIX="@comment " .endif CMAKE_ARGS+= -D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ -D BRO_ROOT_DIR:PATH=${PREFIX} \ -D PY_MOD_INSTALL_DIR:PATH=${PREFIX}/lib/broctl \ -D BRO_SCRIPT_INSTALL_PATH:PATH=${PREFIX}/share/bro \ -D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc \ -D BRO_MAN_INSTALL_PATH=${MANPREFIX}/man \ -D ENABLE_PERFTOOLS:BOOL=false \ -D ENABLE_PERFTOOLS_DEBUG:BOOL=false \ -D BinPAC_SKIP_INSTALL:BOOL=true \ -D INSTALL_AUX_TOOLS:BOOL=true \ -D BUILD_SHARED_LIBS:BOOL=true BROUSER?= bro BROGROUP?= bro PLIST_SUB+= BROUSER=${BROUSER} \ BROGROUP=${BROGROUP} USERS= ${BROUSER} GROUPS= ${BROGROUP} USE_OPENSSL= yes OPTIONS_DEFINE= BROCCOLI BROCTL BROKER DEBUG IPSUMDUMP LBL_CF LBL_HF PERFTOOLS PORTS_SSL OPTIONS_DEFAULT=BROCCOLI BROCTL IPSUMDUMP LBL_CF LBL_HF PORTS_SSL BROCCOLI_DESC= Build support for libbroccoli communications BROCTL_DESC= Build BroControl support (requires BROCCOLI) BROKER_DESC= Enable the Broker communication library DEBUG_DESC= Compile in debugging mode IPSUMDUMP_DESC= Enables traffic summaries LBL_CF_DESC= Unix time to formated time/date filter support LBL_HF_DESC= Address to hostname filter support PERFTOOLS_DESC= Use Perftools to improve memory & CPU usage PORTS_SSL_DESC= Build with OpenSSL from ports (instead of base system) OPTIONS_EXCLUDE=NLS DOCS +PORTS_SSL_VARS= WITH_OPENSSL_PORT=yes + .include .if ${PORT_OPTIONS:MBROCCOLI} LIB_DEPENDS+= libbroccoli.so:security/broccoli .endif .if ${PORT_OPTIONS:MBROCTL} .if empty(PORT_OPTIONS:MBROCCOLI) IGNORE= the BROCTL option requires BROCCOLI .endif .if empty(PORT_OPTIONS:MIPSUMDUMP) IGNORE= the BROCTL option requires IPSUMDUMP .endif BUILD_DEPENDS+= ${LOCALBASE}/bin/bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 RUN_DEPENDS+= ${LOCALBASE}/bin/bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 PLIST_SUB+= BROCTL="" USE_LDCONFIG= yes CMAKE_ARGS+= -D INSTALL_BROCTL:BOOL=true .else CMAKE_ARGS+= -D INSTALL_BROCTL:BOOL=false PLIST_SUB+= BROCTL="@comment " .endif .if ${PORT_OPTIONS:MBROKER} CMAKE_ARGS+= -D ENABLE_BROKER:BOOL=true BUILD_DEPENDS+= caf>=0.14.1:devel/caf PLIST_SUB+= BROKER="" .if ${OSVERSION} < 1001000 # Bro 2.4 with BROKER requires caf, clang and libc++ BUILD_DEPENDS+= ${LOCALBASE}/bin/clang++34:lang/clang34 \ ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ CXXFLAGS+= -stdlib=libc++ -I${LOCALBASE}/include/c++/v1 -L${LOCALBASE}/lib CXX= ${LOCALBASE}/bin/clang++34 .endif .else CMAKE_ARGS+= -D ENABLE_BROKER:BOOL=false PLIST_SUB+= BROKER="@comment " .endif .if ${PORT_OPTIONS:MDEBUG} CMAKE_ARGS+= -D ENABLE_DEBUG:BOOL=true .else CMAKE_ARGS+= -D ENABLE_DEBUG:BOOL=false .endif .if ${PORT_OPTIONS:MLBL_HF} RUN_DEPENDS+= ${LOCALBASE}/bin/hf:sysutils/lbl-hf .endif .if ${PORT_OPTIONS:MLBL_CF} RUN_DEPENDS+= ${LOCALBASE}/bin/cf:sysutils/lbl-cf .endif .if ${PORT_OPTIONS:MPERFTOOLS} CMAKE_ARGS+= -D ENABLE_PERFTOOLS:BOOL=true RUN_DEPENDS+= ${LOCALBASE}/bin/pprof:devel/google-perftools .else CMAKE_ARGS+= -D ENABLE_PERFTOOLS:BOOL=false .endif .if ${PORT_OPTIONS:MPORTS_SSL} CMAKE_ARGS+= -D CMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}" -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:security/openssl -RUN_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so:security/openssl .else .if ${SSL_DEFAULT} != base IGNORE= the SSL option is requred when using SSL from ports .endif .endif .if ${PORT_OPTIONS:MIPSUMDUMP} BUILD_DEPENDS+= ipsumdump:net/ipsumdump RUN_DEPENDS+= ipsumdump:net/ipsumdump .endif post-install-BROCTL-on: @${MKDIR} ${STAGEDIR}${PREFIX}/logs @${MKDIR} ${STAGEDIR}${PREFIX}/spool/tmp @${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/auto @${MKDIR} ${STAGEDIR}${PREFIX}/spool/installed-scripts-do-not-touch/site .for F in broctl.cfg networks.cfg node.cfg @${MV} ${STAGEDIR}${PREFIX}/etc/${F} ${STAGEDIR}${PREFIX}/etc/${F}.example .endfor .include Index: head/www/aws-demos/Makefile =================================================================== --- head/www/aws-demos/Makefile (revision 418010) +++ head/www/aws-demos/Makefile (revision 418011) @@ -1,121 +1,122 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= aws PORTVERSION= 17.0.0 CATEGORIES= www PKGNAMESUFFIX= -demos MAINTAINER= marino@FreeBSD.org COMMENT= Adacore Ada Web Server demos LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi BUILD_DEPENDS= gprbuild:devel/gprbuild \ xmlada>=4.4:textproc/xmlada \ aws>=3.1:www/aws USES= ada gmake python tar:bzip2 USE_GITHUB= yes GH_ACCOUNT= AdaCore GH_PROJECT= aws GH_TAGNAME= 31d491e DISTINFO_FILE= ${PORTSDIR}/www/aws/distinfo CONF_ARGS= PROCESSORS=1 CONF_ARGS+= GCC=ada CONF_ARGS+= prefix=${PREFIX} OPTIONS_DEFINE= SSL LDAP OPTIONS_DEFAULT= SSL OPTIONS_SUB= yes DEMO_DIRS+= auth DEMO_DIRS+= autobahn DEMO_DIRS+= cert DEMO_DIRS+= com DEMO_DIRS+= dispatch DEMO_DIRS+= gSOAP DEMO_DIRS+= dowload_manager DEMO_DIRS+= hello_world DEMO_DIRS+= hello_wsdl DEMO_DIRS+= hotplug DEMO_DIRS+= https DEMO_DIRS+= interoplab DEMO_DIRS+= jabber_demo DEMO_DIRS+= multiple_sessions DEMO_DIRS+= res_demo DEMO_DIRS+= soap_demo DEMO_DIRS+= soap_disp DEMO_DIRS+= soap_vs DEMO_DIRS+= split DEMO_DIRS+= test_mail DEMO_DIRS+= text_input DEMO_DIRS+= upload DEMO_DIRS+= vh_demo DEMO_DIRS+= web_block DEMO_DIRS+= web_block_ajax DEMO_DIRS+= web_block_ajax_templates DEMO_DIRS+= web_elements DEMO_DIRS+= web_mail DEMO_DIRS+= websockets DEMO_DIRS+= wps DEMO_DIRS+= ws DEMO_DIRS+= ws_candy DEMO_DIRS+= zdemo .include .if ${PORT_OPTIONS:MSSL} -LIB_DEPENDS+= libssl.so:security/openssl +USES+= ssl +WITH_OPENSSL_PORT= yes CONF_ARGS+= SOCKET=openssl DEMO_DIRS+= agent DEMO_DIRS+= runme .endif .if ${PORT_OPTIONS:MLDAP} CONF_ARGS+= LDAP=true DEMO_DIRS+= test_ldap .endif post-patch: @${REINPLACE_CMD} -e 's|@PREFIX@|${LOCALBASE}|g' \ ${WRKSRC}/demos/test_ldap/test_ldap.gpr @${REINPLACE_CMD} -e 's| setup_tp | |' ${WRKSRC}/Makefile do-configure: ${MKDIR} ${WRKSRC}/.build/native/debug/static/obj cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${MAKE_CMD} setup ${CONF_ARGS} do-build: .for dd in ${DEMO_DIRS} @${ECHO_MSG} "=== BUILD ${dd} ===" cd ${WRKSRC}/demos/${dd} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} .endfor do-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/templates \ ${STAGEDIR}${EXAMPLESDIR}/images .for dd in ${DEMO_DIRS:Nautobahn} ${FIND} ${WRKSRC}/demos/${dd} -type f -perm -0001 \ -exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${EXAMPLESDIR}/ \; .endfor ${INSTALL_PROGRAM} ${WRKSRC}/demos/autobahn/obj/autobahn \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_SCRIPT} ${WRKSRC}/demos/autobahn/autobahn/run.sh \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/demos/autobahn/autobahn/aws.json \ ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC} && \ ${COPYTREE_SHARE} web_elements ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/demos/runme/aws_*.png \ ${STAGEDIR}${EXAMPLESDIR}/images ${INSTALL_DATA} ${WRKSRC}/demos/web_mail/*html \ ${STAGEDIR}${EXAMPLESDIR}/templates ${INSTALL_DATA} ${FILESDIR}/templates.tads \ ${STAGEDIR}${EXAMPLESDIR}/templates .include