diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2005-06-06 14:54:21 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2005-06-06 14:54:21 +0000 |
| commit | 3111a6a5b2b731016077c309f2c15af78defff1a (patch) | |
| tree | b0e5638472d620a0a3a702cf8e945808df2597c0 /www/mod_webapp | |
| parent | 4a6a2de67df16afa849a6b74eaa8242bf4fddb4e (diff) | |
| download | ports-3111a6a5b2b731016077c309f2c15af78defff1a.tar.gz ports-3111a6a5b2b731016077c309f2c15af78defff1a.zip | |
- fix build and unbreak
- utilize DOCSDIR
PR: ports/81459
Submitted by: leeym
Notes
Notes:
svn path=/head/; revision=136910
Diffstat (limited to 'www/mod_webapp')
| -rw-r--r-- | www/mod_webapp/Makefile | 20 | ||||
| -rw-r--r-- | www/mod_webapp/files/patch-lib-pr_warp_network.c | 11 | ||||
| -rw-r--r-- | www/mod_webapp/pkg-plist | 4 |
3 files changed, 27 insertions, 8 deletions
diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile index 9445f0b0fb2a..bc74f9f8aedd 100644 --- a/www/mod_webapp/Makefile +++ b/www/mod_webapp/Makefile @@ -19,6 +19,7 @@ COMMENT= Apache module mounts Tomcat web applications BUILD_DEPENDS= ${NONEXISTANT}:${PORTSDIR}/devel/apr:configure +USE_REINPLACE= yes USE_APACHE= yes WANT_AUTOCONF_VER=253 WANT_LIBTOOL_VER=13 @@ -35,16 +36,19 @@ CONNECTORS_RELEASE= ${PORTVERSION} # Apache locations. APACHECTL?= ${LOCALBASE}/sbin/apachectl APR_LIB?= ${LOCALBASE}/lib/ -APR_INCLUDE?= ${LOCALBASE}/include/apr-0/ -APACHE_MODULES?= libexec/apache/ -APR_SRC?= ${WRKDIRPREFIX}${PORTSDIR}/devel/apr/work/apr-?\.?\.?/ +APR_INCLUDE?= ${LOCALBASE}/include/apr-${APR_MAJORVER}/ +APACHE_MODULES?=libexec/apache +APR_VER!= cd ${PORTSDIR}/devel/apr && ${MAKE} -V PORTVERSION +APR_WRKSRC!= cd ${PORTSDIR}/devel/apr && ${MAKE} -V WRKSRC +APR_MAJORVER= ${APR_VER:C/\..*//g} +APR_SRC= ${APR_WRKSRC}/apr-${APR_VER} AUTOCONF?= ${LOCALBASE}/bin/autoconf # If the user's changed the modules directory, pack things correctly. PLIST_SUB= APACHE_MODULES=${APACHE_MODULES} # Build options. -APACHE_VERSION= 1.3.6 +APACHE_VERSION= 1.3.6 WRKSRC= ${WRKDIR}/${DISTNAME}/webapp HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-apxs=${APXS} \ @@ -53,6 +57,10 @@ CONFIGURE_ARGS= --with-apxs=${APXS} \ --with-apr=${APR_SRC} \ --without-ant +post-patch: + ${REINPLACE_CMD} -e 's/apr-config/apr-${APR_MAJORVER}-config/g' \ + ${WRKSRC}/support/wa_apr.m4 + pre-configure: cd ${WRKSRC} && ${AUTOCONF} @@ -67,8 +75,8 @@ do-install: post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/mod_webapp - ${INSTALL_MAN} ${WRKSRC}/INSTALL.txt ${PREFIX}/share/doc/mod_webapp + ${MKDIR} ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/INSTALL.txt ${DOCSDIR} .endif .include <bsd.port.post.mk> diff --git a/www/mod_webapp/files/patch-lib-pr_warp_network.c b/www/mod_webapp/files/patch-lib-pr_warp_network.c new file mode 100644 index 000000000000..b1e5d8cf1703 --- /dev/null +++ b/www/mod_webapp/files/patch-lib-pr_warp_network.c @@ -0,0 +1,11 @@ +--- lib/pr_warp_network.c.orig Wed May 25 10:37:48 2005 ++++ lib/pr_warp_network.c Wed May 25 10:38:03 2005 +@@ -142,7 +142,7 @@ + apr_status_t ret=APR_SUCCESS; + apr_socket_t *sock=NULL; + +- ret=apr_socket_create(&sock,AF_INET,SOCK_STREAM,wa_pool); ++ ret=apr_socket_create(&sock,AF_INET,SOCK_STREAM,0,wa_pool); + if (ret!=APR_SUCCESS) { + sock=NULL; + wa_log(WA_MARK,"Cannot create socket for conn. \"%s\"",conn->name); diff --git a/www/mod_webapp/pkg-plist b/www/mod_webapp/pkg-plist index fdc1d699fc82..7216cdf2d63f 100644 --- a/www/mod_webapp/pkg-plist +++ b/www/mod_webapp/pkg-plist @@ -1,3 +1,3 @@ %%APACHE_MODULES%%/mod_webapp.so -%%PORTDOCS%%share/doc/mod_webapp/INSTALL.txt -%%PORTDOCS%%@dirrm share/doc/mod_webapp +%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%% |