Index: head/www/aws/Makefile =================================================================== --- head/www/aws/Makefile (revision 430558) +++ head/www/aws/Makefile (revision 430559) @@ -1,168 +1,164 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= aws -PORTVERSION= 17.0.1 +PORTVERSION= 17.1.0 CATEGORIES= www MAINTAINER= marino@FreeBSD.org COMMENT= Adacore Ada Web Server and framework LICENSE= GPLv3 GPLv3RLE LICENSE_COMB= multi BUILD_DEPENDS= gprbuild:devel/gprbuild \ xmlada>=4.4:textproc/xmlada \ asis>=2013:lang/asis \ gnatpython>=20101207:devel/gnatpython RUN_DEPENDS= xmlada>=4.4:textproc/xmlada USES= ada:run gmake python shebangfix tar:bzip2 USE_GITHUB= yes GH_ACCOUNT= AdaCore -GH_TAGNAME= 17.0 -GH_TUPLE= AdaCore:templates-parser:17.0:tp/templates_parser +GH_TAGNAME= ${PORTVERSION:R} +GH_TUPLE= AdaCore:templates-parser:${PORTVERSION:R}:tp/templates_parser 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 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+= 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= .else # it's not SSL so it must be GNUTLS CONF_ARGS+= LPATH=${PREFIX}/lib 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: @${REINPLACE_CMD} \ -e 's|@ADDITIONAL_RPATH@|${ADDL_RPATH}|' \ -e 's|@PREFIX@|${LOCALBASE}|g' \ ${WRKSRC}/aws.gpr \ ${WRKSRC}/src/src.gpr \ ${WRKSRC}/include/include.gpr @${REINPLACE_CMD} -e 's|latexpdf||' ${WRKSRC}/Makefile do-configure: (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 do-build-DOCS-on: cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_ARGS} html 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: head/www/aws/distinfo =================================================================== --- head/www/aws/distinfo (revision 430558) +++ head/www/aws/distinfo (revision 430559) @@ -1,5 +1,5 @@ -TIMESTAMP = 1476161971 -SHA256 (AdaCore-aws-17.0.1-17.0_GH0.tar.gz) = 3dfaca1fd965300d2e1506874f3bfacd6d913032cc7c6ae0ed148672634a870e -SIZE (AdaCore-aws-17.0.1-17.0_GH0.tar.gz) = 2085711 -SHA256 (AdaCore-templates-parser-17.0_GH0.tar.gz) = 837693c5a5ff6acc0140b341a8e363e7e4e036e9316e516a53116eb0db3b88a7 -SIZE (AdaCore-templates-parser-17.0_GH0.tar.gz) = 216629 +TIMESTAMP = 1483518397 +SHA256 (AdaCore-aws-17.1.0-17.1_GH0.tar.gz) = 107d2fcec8e20b4f00d390e9db858a0723ed1baed9a696e869c05b362da98d8b +SIZE (AdaCore-aws-17.1.0-17.1_GH0.tar.gz) = 2085674 +SHA256 (AdaCore-templates-parser-17.1_GH0.tar.gz) = efd2f2d21a532014802c5dc2083453b9c945c146c7bf910c348387ef48c22b62 +SIZE (AdaCore-templates-parser-17.1_GH0.tar.gz) = 216649 Index: head/www/aws-demos/Makefile =================================================================== --- head/www/aws-demos/Makefile (revision 430558) +++ head/www/aws-demos/Makefile (revision 430559) @@ -1,164 +1,160 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= aws -PORTVERSION= 17.0.1 +PORTVERSION= 17.1.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 USE_GITHUB= yes GH_ACCOUNT= AdaCore -GH_TAGNAME= 17.0 -GH_TUPLE= AdaCore:templates-parser:17.0:tp/templates_parser +GH_TAGNAME= ${PORTVERSION:R} +GH_TUPLE= AdaCore:templates-parser:${PORTVERSION:R}:tp/templates_parser 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+= 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 PROGS= multiple_sessions/multiple_sessions \ jabber_demo/jabber_demo \ auth/auth \ text_input/text_input \ web_block/web_block \ web_mail/web_mail \ websockets/websock \ wps/wps \ interoplab/interoplab_main \ soap_demo/soap_server \ soap_demo/soap_client \ web_block_ajax/web_block_ajax \ web_elements/web_elements_program \ cert/cert \ com/com_2 \ com/com_1 \ dowload_manager/download_manager \ hello_world/hello_world \ hello_wsdl/wsdl_demo_client \ hello_wsdl/wsdl_demo_server \ hotplug/main \ hotplug/hotplug \ res_demo/res_demo \ soap_vs/soap_svs \ soap_vs/soap_cvs \ test_mail/test_mail \ upload/upload \ vh_demo/vh_demo \ ws/ws \ ws_candy/candy \ split/split \ dispatch/dispatch \ zdemo/zdemo \ soap_disp/soap_server_disp \ soap_disp/soap_client -.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+= https DEMO_DIRS+= runme PROGS+= agent/agent \ https/https \ runme/runme .endif .if ${PORT_OPTIONS:MLDAP} CONF_ARGS+= LDAP=true DEMO_DIRS+= test_ldap PROGS+= test_ldap/test_ldap .endif post-patch: @${REINPLACE_CMD} -e 's|@PREFIX@|${LOCALBASE}|g' \ ${WRKSRC}/demos/test_ldap/test_ldap.gpr @${REINPLACE_CMD} -e 's|latexpdf||' ${WRKSRC}/Makefile .for dd in ${DEMO_DIRS} @${REINPLACE_CMD} -i '' -e 's|gprclean|gprclean -c|' \ ${WRKSRC}/demos/${dd}/Makefile .endfor 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}) (cd ${WRKSRC}/demos/${dd} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} clean && ${RM} -r Makefile *.ad[bs] *.gpr src) .endfor do-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/demos (cd ${WRKSRC} && ${COPYTREE_SHARE} web_elements \ ${STAGEDIR}${EXAMPLESDIR}) .for dd in ${DEMO_DIRS:Nautobahn} (cd ${WRKSRC}/demos && ${COPYTREE_SHARE} ${dd} \ ${STAGEDIR}${EXAMPLESDIR}/demos) .endfor .for prog in ${PROGS} @${CHMOD} 755 ${STAGEDIR}${EXAMPLESDIR}/demos/${prog} @${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/demos/${prog} @${CHMOD} ${BINMODE} ${STAGEDIR}${EXAMPLESDIR}/demos/${prog} .endfor -.include +.include