- fix build and unbreak

- utilize DOCSDIR

PR:		ports/81459
Submitted by:	leeym

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>

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);

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%%