Index: head/Mk/Uses/ssl.mk =================================================================== --- head/Mk/Uses/ssl.mk (revision 438452) +++ head/Mk/Uses/ssl.mk (revision 438453) @@ -1,109 +1,129 @@ # $FreeBSD$ # # Handle dependency on *ssl ports. # # Feature: SSL_DEFAULT # Usage: USES=ssl # Valid ARGS: none (build and run), build, run # # The user can choose which ssl library he wants with: # # DEFAULT_VERSIONS+= ssl= # # Variants being base, openssl, openssl-devel, libressl, and libressl-devel. # # The Makefile sets these variables: # OPENSSLBASE - "/usr" or ${LOCALBASE} # OPENSSLDIR - path to openssl # OPENSSLLIB - path to the libs # OPENSSLINC - path to the matching includes # OPENSSLRPATH - rpath for dynamic linker # # MAKE_ENV - extended with the variables above # BUILD_DEPENDS - are added if needed # RUN_DEPENDS - are added if needed # # MAINTAINER: portmgr@FreeBSD.org # .if !defined(_INCLUDE_USES_SSL_MK) _INCLUDE_USES_SSL_MK= yes .if !empty(ssl_ARGS:Nbuild:Nrun) IGNORE= "USES=ssl invalid arguments ${ssl_ARGS}." .endif .if empty(ssl_ARGS) || (!empty(ssl_ARGS:Mbuild) && !empty(ssl_ARGS:Mrun)) _SSL_BUILD_DEP= 1 _SSL_RUN_DEP= 1 .elif !empty(ssl_ARGS:Mbuild) _SSL_BUILD_DEP= 1 .elif !empty(ssl_ARGS:Mrun) _SSL_RUN_DEP= 1 .endif .if ${SSL_DEFAULT} == base OPENSSLBASE= /usr OPENSSLDIR?= /etc/ssl . if !exists(${DESTDIR}/usr/lib/libcrypto.so) check-depends:: @${ECHO_CMD} "Dependency error: This port requires the OpenSSL library, which is part of" @${ECHO_CMD} "the FreeBSD crypto distribution, but not installed on your" @${ECHO_CMD} "machine. Please see the \"OpenSSL\" section in the handbook" @${ECHO_CMD} "(at \"http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/openssl.html\", for instance)" @${ECHO_CMD} "for instructions on how to obtain and install the FreeBSD" @${ECHO_CMD} "OpenSSL distribution." @${FALSE} . endif . if exists(${LOCALBASE}/lib/libcrypto.so) check-depends:: @${ECHO_CMD} "Dependency error: This port wants the OpenSSL library from the FreeBSD" @${ECHO_CMD} "base system. You can't build against it, while a newer" @${ECHO_CMD} "version is installed by a port." @${ECHO_CMD} "Please deinstall the port, remove DEFAULT_VERSIONS=ssl=base or undefine WITH_OPENSSL_BASE." @${FALSE} . endif .else # ${SSL_DEFAULT} != base OPENSSLBASE= ${LOCALBASE} OPENSSL_PORT= security/${SSL_DEFAULT} # Get OPENSSL_SHLIBVER from the port .sinclude <${PORTSDIR}/${OPENSSL_PORT}/version.mk> . if !defined(OPENSSL_SHLIBVER) .error You are using an unsupported SSL provider ${SSL_DEFAULT} . endif +. if defined(BROKEN_OPENSSL) && ${BROKEN_OPENSSL:M${SSL_DEFAULT}} +. if defined(BROKEN_OPENSSL_REASON_${SSL_DEFAULT}) +BROKEN= ${BROKEN_OPENSSL_REASON_${SSL_DEFAULT}} +. elif defined(BROKEN_OPENSSL_REASON) +BROKEN= ${BROKEN_OPENSSL_REASON} +. else +BROKEN= does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} +. endif +. endif + +. if defined(IGNORE_OPENSSL) && ${IGNORE_OPENSSL:M${SSL_DEFAULT}} +. if defined(IGNORE_OPENSSL_REASON_${SSL_DEFAULT}) +IGNORE= ${IGNORE_OPENSSL_REASON_${SSL_DEFAULT}} +. elif defined(IGNORE_OPENSSL_REASON) +IGNORE= ${IGNORE_OPENSSL_REASON} +. else +IGNORE= not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} +. endif +. endif + OPENSSLDIR?= ${OPENSSLBASE}/openssl .if defined(_SSL_BUILD_DEP) BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT} .endif .if defined(_SSL_RUN_DEP) RUN_DEPENDS+= ${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT} .endif OPENSSLRPATH= ${LOCALBASE}/lib .endif OPENSSLLIB= ${OPENSSLBASE}/lib OPENSSLINC= ${OPENSSLBASE}/include MAKE_ENV+= OPENSSLBASE=${OPENSSLBASE} MAKE_ENV+= OPENSSLDIR=${OPENSSLDIR} MAKE_ENV+= OPENSSLINC=${OPENSSLINC} MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB} .if defined(OPENSSLRPATH) . if defined(USE_OPENSSL_RPATH) CFLAGS+= -Wl,-rpath,${OPENSSLRPATH} . endif MAKE_ENV+= OPENSSLRPATH=${OPENSSLRPATH} OPENSSL_LDFLAGS+= -Wl,-rpath,${OPENSSLRPATH} .endif LDFLAGS+= ${OPENSSL_LDFLAGS} .endif Index: head/www/libwww/Makefile =================================================================== --- head/www/libwww/Makefile (revision 438452) +++ head/www/libwww/Makefile (revision 438453) @@ -1,36 +1,32 @@ # Created by: torstenb # $FreeBSD$ PORTNAME= libwww PORTVERSION= 5.4.0 PORTREVISION= 6 CATEGORIES= www devel MASTER_SITES= http://www.w3.org/Library/Distribution/old/ DISTNAME= w3c-${PORTNAME}-${PORTVERSION} MAINTAINER= dbaio@bsd.com.br COMMENT= W3C Reference Library LICENSE= W3C LICENSE_NAME= W3C IPR SOFTWARE NOTICE LICENSE_FILE= ${WRKSRC}/LICENSE.html LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-zlib --with-ssl=${OPENSSLBASE} USES= gmake libtool perl5 ssl tar:tgz USE_PERL5= build USE_LDCONFIG= yes +BROKEN_OPENSSL= openssl-devel + post-install: ${INSTALL_DATA} ${WRKSRC}/modules/expat/xmlparse/xmlparse.h \ ${STAGEDIR}${PREFIX}/include/w3c-libwww/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so -.include - -.if ${SSL_DEFAULT:Mopenssl-devel} -BROKEN= Does not build with openssl-devel -.endif - -.include +.include Index: head/www/mod_auth_gssapi/Makefile =================================================================== --- head/www/mod_auth_gssapi/Makefile (revision 438452) +++ head/www/mod_auth_gssapi/Makefile (revision 438453) @@ -1,46 +1,43 @@ # $FreeBSD$ PORTNAME= mod_auth_gssapi PORTVERSION= 1.5.1 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} MAINTAINER= chris@chrullrich.net COMMENT= Apache module for authenticating users with GSSAPI LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING USE_GITHUB= yes GH_ACCOUNT= modauthgssapi USE_APACHE= 24+ USES= autoreconf libtool ssl gssapi:mit,flags GNU_CONFIGURE= yes CONFIGURE_ARGS+= KRB5_CONFIG=${KRB5CONFIG} CONFIGURE_ARGS+= OPENSSL_CFLAGS=-I${OPENSSLINC} CONFIGURE_ARGS+= OPENSSL_LIBS=-lcrypto PLIST_FILES= @sample\ ${APACHEETCDIR}/modules.d/%%APMOD_FILE%% \ ${APACHEMODDIR}/mod_auth_gssapi.so SUB_FILES= ${APMOD_FILE} APMOD_FILE= 240_${PORTNAME}.conf.sample PLIST_SUB+= APMOD_FILE=${APMOD_FILE} -.include +IGNORE_OPENSSL= libressl libressl-devel +IGNORE_OPENSSL_REASON= mod_auth_gssapi currently only supports OpenSSL -.if ${SSL_DEFAULT:Mlibressl*} -IGNORE= mod_auth_gssapi currently only supports OpenSSL -.endif - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \ -i -n ${MODULENAME} ${WRKSRC}/src/${MODULENAME}.la @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${INSTALL_DATA} ${WRKDIR}/${APMOD_FILE} ${STAGEDIR}${PREFIX}/${APACHEETCDIR}/modules.d ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so -.include +.include Index: head/www/mod_spdy/Makefile =================================================================== --- head/www/mod_spdy/Makefile (revision 438452) +++ head/www/mod_spdy/Makefile (revision 438453) @@ -1,141 +1,140 @@ # Created by: Masaki TAGAWA # $FreeBSD$ PORTNAME= mod_spdy PORTVERSION= 0.9.4.1 PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \ APACHE_HTTPD:apache22 DISTFILES= mod_spdy_source_${PORTVERSION}.tar.xz:mod_spdy \ httpd-2.2.22.tar.gz:apache22 DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= mod_spdy_source_${PORTVERSION}.tar.xz MAINTAINER= masaki@club.kyutech.ac.jp COMMENT= SPDY module for the Apache HTTP server v2.2 LICENSE= APACHE20 BUILD_DEPENDS= python:lang/python \ greadlink:sysutils/coreutils \ flock:sysutils/flock \ svn:devel/subversion \ curl:ftp/curl \ bash:shells/bash ONLY_FOR_ARCHS= amd64 i386 USE_APACHE= 22 USES= compiler execinfo gmake python:2 ssl tar:xz REINPLACE_ARGS= -i "" WRKSRC= ${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_spdy/src CFLAGS+= -fno-stack-protector -Wno-unknown-warning-option -Wno-c++11-extensions -I${OPENSSLINC} LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} GYP_DEFINES+= \ use_system_apache_dev=1 \ use_system_zlib=1 \ system_include_path_httpd=${LOCALBASE}/include/apache22 \ system_include_path_apr=${LOCALBASE}/include/apr-1 \ system_include_path_aprutil=${LOCALBASE}/include/apr-1 \ system_include_path_execinfo=${LOCALBASE}/include \ include_dirs=${LOCALBASE}/include SUB_FILES+= mod_spdy.conf SUB_LIST+= APACHEMODDIR=${APACHEMODDIR} OPTIONS_DEFINE= GCC DEBUG .include .if ${PORT_OPTIONS:MGCC} BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif .if ${PORT_OPTIONS:MGCC} USE_GCC?= yes GYP_DEFINES+= gcc_version=${CXX:S/g++//} .else CC= clang CXX= clang++ GYP_DEFINES+= clang=1 .endif .if ${PORT_OPTIONS:MDEBUG} MAKE_ENV+= V=1 BUILDTYPE= Debug .else BUILDTYPE= Release GYP_DEFINES+= buildtype=Official .endif CONFIGURE_ENV+= CC=${CC} \ CXX=${CXX} \ GYP_DEFINES="${GYP_DEFINES}" # according to portlint the below is passed via bsd.port.mk, # but 'make -V CONFIGURE_ENV' does not show it: CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} -.include +BROKEN_OPENSSL= libressl libressl-devel +BROKEN_OPENSSL_REASON= incompatible with LibreSSL, please use www/apache24 with mod_http2 -.if ${SSL_DEFAULT:Mlibressl*} -IGNORE= ${PORTNAME} is incompatible with LibreSSL, please use www/apache24 with mod_http2 -.endif +.include .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 CXXFLAGS+= -Wno-unused-local-typedef .endif post-extract: @${MKDIR} ${WRKSRC}/temp/progress @${CP} ${DISTDIR}/${DIST_SUBDIR}/httpd-2.2.22.tar.gz ${WRKSRC}/temp/ && \ ${TOUCH} ${WRKSRC}/temp/progress/httpd-2.2.22.tar.gz.downloaded post-patch: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ ${WRKSRC}/base/base.gypi @${REINPLACE_CMD} -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \ -e 's,%%FILESDIR%%,${FILESDIR},g' \ -e 's,%%OPENSSLBASE%%,${OPENSSLBASE},g' \ ${WRKSRC}/build_modssl_with_npn.sh .if ${PORT_OPTIONS:MGCC} @${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,-I${LOCALBASE}/lib/gcc${CXX:S/g++//}/include,g' \ -e 's,%%GCCLDFLAGS%%,-L${LOCALBASE}/lib/gcc${CXX:S/g++//},g' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,-I${LOCALBASE}/lib/gcc${CXX:S/g++//}/include,g' \ -e 's,%%GCCLDFLAGS%%,-L${LOCALBASE}/lib/gcc${CXX:S/g++//},g' \ ${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py .else @${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,,g' \ -e 's,%%GCCLDFLAGS%%,,g' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,,g' \ -e 's,%%GCCLDFLAGS%%,,g' \ ${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py .endif do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ../../depot_tools/gclient.py runhooks pre-build: cd ${WRKSRC} && CONFIGURE_ENV='${CONFIGURE_ENV}' \ BUILDROOT=${WRKSRC}/temp ${WRKSRC}/build_modssl_with_npn.sh do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${APACHEMODDIR} \ ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libmod_spdy.so \ ${STAGEDIR}/${PREFIX}/${APACHEMODDIR}/mod_spdy.so ${INSTALL_LIB} ${WRKSRC}/mod_ssl.so \ ${STAGEDIR}/${PREFIX}/${APACHEMODDIR}/mod_ssl_with_npn.so ${INSTALL_DATA} ${WRKDIR}/mod_spdy.conf \ ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes/mod_spdy.conf .include