Date: Sat, 3 Aug 2013 22:28:37 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324206 - in head/www/websh: . files Message-ID: <201308032228.r73MSbMi090368@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Sat Aug 3 22:28:37 2013 New Revision: 324206 URL: http://svnweb.freebsd.org/changeset/ports/324206 Log: Add patches to build and work with Apache-2.4 (which has special requrements for users of ap_log_error()) and Tcl-8.6 (which uses -fvisibility=hidden if it can). No functional changes for those, who were able to build before, thus no PORTREVISION bump (I wish, previous committer followed this rule too). Added: head/www/websh/files/patch-apache2.4 (contents, props changed) head/www/websh/files/patch-dllexport (contents, props changed) Modified: head/www/websh/Makefile Modified: head/www/websh/Makefile ============================================================================== --- head/www/websh/Makefile Sat Aug 3 22:08:50 2013 (r324205) +++ head/www/websh/Makefile Sat Aug 3 22:28:37 2013 (r324206) @@ -21,7 +21,6 @@ MAKE_JOBS_UNSAFE= yes TCL_DVER= ${TCL_VER:S/.//} USE_TCL= 84+ -INVALID_TCL_VER=86 USE_AUTOTOOLS= autoconf WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix CONFIGURE_ARGS+=--with-tclinclude=${TCL_INCLUDEDIR} \ @@ -49,6 +48,8 @@ post-patch: `${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 Added: head/www/websh/files/patch-apache2.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/websh/files/patch-apache2.4 Sat Aug 3 22:28:37 2013 (r324206) @@ -0,0 +1,15 @@ +--- ../../src/generic/mod_websh.h 2005-12-12 12:13:55.000000000 -0500 ++++ ../../src/generic/mod_websh.h 2013-08-03 16:46:07.000000000 -0400 +@@ -30,4 +30,12 @@ + #include "util_script.h" + ++/* ++ * This is required for Apache-2.4 -- see: ++ * http://httpd.apache.org/docs/2.4/developer/new_api_2_4.html ++ */ ++#ifdef APLOG_USE_MODULE ++APLOG_USE_MODULE(websh); ++#endif ++ + /* define APACHE2 if appropriate */ + #ifdef AP_SERVER_BASEREVISION Added: head/www/websh/files/patch-dllexport ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/websh/files/patch-dllexport Sat Aug 3 22:28:37 2013 (r324206) @@ -0,0 +1,24 @@ +--- ../generic/macros.h 2007-03-19 13:18:37.000000000 -0400 ++++ ../generic/macros.h 2013-08-03 17:39:59.000000000 -0400 +@@ -29,8 +29,4 @@ + #endif + +-#ifndef WIN32 +-#define __declspec(dllexport) +-#endif +- + #include "log.h" + +--- ../generic/mod_websh.c 2009-06-12 09:37:16.000000000 -0400 ++++ ../generic/mod_websh.c 2013-08-03 17:46:06.000000000 -0400 +@@ -81,8 +81,8 @@ + + #ifndef APACHE2 +-module MODULE_VAR_EXPORT websh_module; ++DLLEXPORT module MODULE_VAR_EXPORT websh_module; + #define APPOOL pool + #else /* APACHE2 */ +-module AP_MODULE_DECLARE_DATA websh_module; ++DLLEXPORT module AP_MODULE_DECLARE_DATA websh_module; + #define APPOOL apr_pool_t + #endif /* APACHE2 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308032228.r73MSbMi090368>