Index: head/www/websh/Makefile =================================================================== --- head/www/websh/Makefile (revision 528554) +++ head/www/websh/Makefile (revision 528555) @@ -1,91 +1,91 @@ # Created by: Mikhail Teterin # $FreeBSD$ PORTNAME= websh PORTVERSION= 3.6.0b5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www tcl MASTER_SITES= APACHE/tcl/${PORTNAME}/source EXTRACT_SUFX= -src.tar.gz MAINTAINER= mi@aldan.algebra.com COMMENT= Embeds a TCL8 interpreter in the Apache server MAKE_JOBS_UNSAFE= yes TCL_DVER= ${TCL_VER:S/.//} USES= apache:2.2+ autoreconf gmake tcl:tea WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix USE_LDCONFIG= yes SUB_FILES= httpd.conf pkgIndex.tcl pkg-message SUB_LIST+= TCL_DVER=${TCL_DVER} WS_VER=${PORTVERSION} SUB_LIST+= APACHEETCDIR=${APACHEETCDIR} APACHEMODDIR=${APACHEMODDIR} PLIST_SUB+= TCL_DVER=${TCL_DVER} PLIST_SUB+= NOMINORVERSION=${TCL_VER:C/8.[345]//:C/^..*/"@comment "/} PORTDOCS= * PORTEXAMPLES= * CONFIGURE_ARGS+=--with-httpdinclude=`apxs -q includedir` OPTIONS_DEFINE= DOCS EXAMPLES CPPFLAGS+= -I ${LOCALBASE}/include/apr-1 .if !defined(NO_WERROR) && ${CC} == "cc" || ${CC:T:Mgcc*} != "" CPPFLAGS+= -Wall -Werror .endif post-patch: ${REINPLACE_CMD} -e 's,/usr/local/websh,${PREFIX},' \ ${WRKSRC:H:H}/doc/mod_websh/conf/websh.conf for p in ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.html ; do \ ${SED} -e 's,\.html,.whtml,g' < $$p > \ `${DIRNAME} $$p`/`${BASENAME} $$p .html`.whtml; \ done ${REINPLACE_CMD} -e 's,\.html,.whtml,g' ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3 ${REINPLACE_CMD} -e 's|__declspec(dllexport)|DLLEXPORT|' \ ${WRKSRC}/../generic/*.[ch] post-configure: # Remove the "STUBS" and the PACKAGE_* defines, which may conflict # with Apache's definitions: ${REINPLACE_CMD} -e 's,tclstub,tcl,' \ -e 's,-DPACKAGE_[^=]*=."[^"]*",,g' ${WRKSRC}/Makefile post-build test: ${SETENV} HOME=${WRKDIR} ${MAKE_CMD} -C ${WRKSRC} test | ${AWK} '\ /Failed/ && $$NF {failed=1} \ END {exit failed} \ {print}' do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} ${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/conf/*.ws3 \ ${WRKDIR}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/conf/websh.conf \ ${STAGEDIR}${PREFIX}/etc/websh.conf.dist ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_LIB} ${WRKSRC}/mod_websh${PORTVERSION}.so \ ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_websh.so if [ -f ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 ]; then \ ${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1.0 \ ${STAGEDIR}${PREFIX}/lib; \ ${LN} -sf libwebsh${TCL_DVER}.so.1.0 \ ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so.1; \ ${LN} -sf libwebsh${TCL_DVER}.so.1.0 \ ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so; \ else \ ${INSTALL_LIB} ${WRKSRC}/libwebsh${TCL_DVER}.so.1 \ ${STAGEDIR}${PREFIX}/lib; \ ${LN} -sf libwebsh${TCL_DVER}.so.1 \ ${STAGEDIR}${PREFIX}/lib/libwebsh${TCL_DVER}.so; \ fi ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3 \ ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.whtml \ ${WRKDIR}/httpd.conf ${STAGEDIR}${EXAMPLESDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC:H:H}/doc/html/* ${STAGEDIR}${DOCSDIR} .include Index: head/www/websh/files/patch-response_ap.c =================================================================== --- head/www/websh/files/patch-response_ap.c (nonexistent) +++ head/www/websh/files/patch-response_ap.c (revision 528555) @@ -0,0 +1,20 @@ +Patch an ancient bug, uncovered by clang10's new warning-flag... + + -mi + +--- ../generic/response_ap.c 2009-05-22 06:13:35.000000000 -0400 ++++ ../generic/response_ap.c 2020-03-16 22:40:32.845609000 -0400 +@@ -69,4 +69,6 @@ + r->status_line = ap_pstrdup(r->pool, ++response); + #else /* APACHE2 */ ++ { ++ + r->status_line = (char *) apr_pstrdup(r->pool, ++response); + /* as of Apache 2.2.1, r->status_line must be in line with +@@ -80,5 +82,5 @@ + response[3] = tmp; + } +- ++ } + #endif /* APACHE2 */ + } Property changes on: head/www/websh/files/patch-response_ap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property