Index: branches/2016Q4/www/aws/Makefile =================================================================== --- branches/2016Q4/www/aws/Makefile (revision 423347) +++ branches/2016Q4/www/aws/Makefile (revision 423348) @@ -1,184 +1,188 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= aws PORTVERSION= 17.0.0 PORTREVISION= 1 CATEGORIES= www MAINTAINER= marino@FreeBSD.org COMMENT= Adacore Ada Web Server and framework LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi BUILD_DEPENDS= gprbuild:devel/gprbuild \ templates_parser>11:textproc/templates_parser \ xmlada>=4.4:textproc/xmlada \ asis>=2013:lang/asis \ gnatpython>=20101207:devel/gnatpython RUN_DEPENDS= templates_parser>11:textproc/templates_parser \ xmlada>=4.4:textproc/xmlada USES= ada:run gmake python shebangfix tar:bzip2 USE_GITHUB= yes GH_ACCOUNT= AdaCore GH_PROJECT= aws GH_TAGNAME= 31d491e GNU_CONFIGURE= yes NO_MTREE= yes DOTBUILD= release LINK_SSL= -- LINK_TLS= -- LINK_LDP= -- NAME_IP6= -- NAME_STD= -- BUILD_TYPE= release ADDL_RPATH= ${LOCALBASE}/lib:${LOCALBASE}/lib/aws/native/relocatable AUX_TARGET= ${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL} TEMPARSE= ${WRKSRC}/.build/${AUX_TARGET}/${BUILD_TYPE} SHEBANG_FILES= tools/awsascb OPTIONS_SINGLE= Secure-Socket-Layer OPTIONS_DEFINE= IP6 DEBUG LDAP SHARED DOCS OPTIONS_DEFAULT= SSL SHARED OPTIONS_SUB= yes NO_OPTIONS_SORT= yes DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx OPTIONS_SINGLE_Secure-Socket-Layer= SSL GNUTLS SHARED_DESC= Build shared libraries in addition to static ones IP6_DESC= Support IPv6 instead of IPv4 SSL_USES= ssl GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls LDAP_USE= OPENLDAP=yes CONF_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} CONF_ARGS+= GCC=ada CONF_ARGS+= PYTHON=python${PYTHON_VER} CONF_ARGS+= XMLADA=true CONF_ARGS+= PRJ_BUILD=${DOTBUILD} CONF_ARGS+= prefix=${PREFIX} CONF_ARGS+= LPATH=${PREFIX}/lib CONF_ARGS+= ZPATH=/usr/lib CONF_ARGS+= ZLIB=true CONF_ARGS+= ASIS=true CONF_ARGS+= DEFAULT_LIBRARY_TYPE=static -.include +.include +.if ${SSL_DEFAULT} == base +IGNORE_FreeBSD_9= Requires newer OpenSSL (set DEFAULT_VERSIONS+=ssl=openssl) +.endif + ################### ## SSL Support ## ################### .if ${PORT_OPTIONS:MSSL} CONF_ARGS+= SOCKET=openssl CONF_ARGS+= LPATH=${OPENSSLLIB} LINK_SSL= .endif .if ${PORT_OPTIONS:MGNUTLS} CONF_ARGS+= SOCKET=gnutls LINK_TLS= .endif #################### ## LDAP Support ## #################### .if ${PORT_OPTIONS:MLDAP} CONF_ARGS+= LDAP=true LINK_LDP= .endif #################### ## IPv6 Support ## #################### .if ${PORT_OPTIONS:MIP6} CONF_ARGS+= IPv6=true NAME_IP4= -- NAME_IP6= .endif ##################### ## Debug Support ## ##################### .if ${PORT_OPTIONS:MDEBUG} CONF_ARGS+= DEBUG=true BUILD_TYPE= debug .endif ############################## ## Shared Runtime Library ## ############################## .if ${PORT_OPTIONS:MSHARED} CONF_ARGS+= ENABLE_SHARED=true .else CONF_ARGS+= ENABLE_SHARED=false .endif post-patch: @${MKDIR} ${WRKSRC}/templates_parser \ ${TEMPARSE}/static/obj/temparse \ ${TEMPARSE}/static/lib/temparse \ ${TEMPARSE}/relocatable/obj/temparse \ ${TEMPARSE}/relocatable/lib/temparse \ ${WRKSRC}/templates_parser/tools \ ${WRKSRC}/templates_parser/xsrc \ ${WRKSRC}/templates_parser/src @${REINPLACE_CMD} \ -e 's|@ADDITIONAL_RPATH@|${ADDL_RPATH}|' \ -e 's|@PREFIX@|${LOCALBASE}|g' \ ${WRKSRC}/aws.gpr \ ${WRKSRC}/src/src.gpr \ ${WRKSRC}/include/include.gpr @${SED} -e 's|@PREFIX@|${LOCALBASE}|g' ${FILESDIR}/temparse.gpr.in \ > ${WRKSRC}/templates_parser/temparse.gpr do-configure: # If we want to do templates_parser copy in an earlier target then # templates_parser needs to be listed as an EXTRACT_DEPENDS @${CP} ${LOCALBASE}/lib/templates_parser/* \ ${TEMPARSE}/static/lib/temparse @${CP} ${LOCALBASE}/lib/templates_parser.relocatable/*.ali \ ${TEMPARSE}/relocatable/lib/temparse @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${MAKE_CMD} setup ${CONF_ARGS} do-build: # We cannot use a redefined ALL_TARGET because MAKE_JOBS_SAFE is set # for PROCESSORS, but that also sets -j for gmake which breaks build cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} build .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} html .endif test: .if exists(${LOCALBASE}/bin/awsres) @cd ${WRKSRC}/regtests && ${SETENV} ${MAKE_ENV} TIMEOUT=75 \ python${PYTHON_VER} testsuite.py .else @${ECHO} "AWS has to be installed before testing" .endif post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/gpr/manifests ${RM} ${STAGEDIR}${PREFIX}/include/aws.relocatable/Makefile ${RM} ${STAGEDIR}${PREFIX}/include/aws/Makefile ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \ ${STAGEDIR}${PREFIX}/share/gps/plug-ins ${CAT} ${FILESDIR}/aws.gpr.in | ${SED} -e 's|@PREFIX@|${PREFIX}|g' \ -e 's|@SSL@|${LINK_SSL}|g' -e 's|@TLS@|${LINK_TLS}|g' \ -e 's|@LDP@|${LINK_LDP}|g' -e 's|@IP4@|${NAME_IP4}|g' \ -e 's|@IP6@|${NAME_IP6}|g' -e 's|@STD@|${NAME_STD}|g' \ > ${STAGEDIR}${PREFIX}/lib/gnat/aws.gpr cd ${WRKSRC}/gps && ${INSTALL_DATA} *.xml aws.py \ ${STAGEDIR}${PREFIX}/share/gps/plug-ins -.include +.include Index: branches/2016Q4/www/aws-demos/Makefile =================================================================== --- branches/2016Q4/www/aws-demos/Makefile (revision 423347) +++ branches/2016Q4/www/aws-demos/Makefile (revision 423348) @@ -1,123 +1,127 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= aws PORTVERSION= 17.0.0 PORTREVISION= 1 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 SSL_USES= ssl 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 +.include +.if ${SSL_DEFAULT} == base +IGNORE_FreeBSD_9= Requires newer OpenSSL (set DEFAULT_VERSIONS+=ssl=openssl) +.endif + .if ${PORT_OPTIONS:MSSL} 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 +.include Index: branches/2016Q4 =================================================================== --- branches/2016Q4 (revision 423347) +++ branches/2016Q4 (revision 423348) Property changes on: branches/2016Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r423299