From owner-freebsd-apache@FreeBSD.ORG Wed May 25 06:31:18 2005 Return-Path: X-Original-To: apache@freebsd.org Delivered-To: freebsd-apache@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 367FA16A41C; Wed, 25 May 2005 06:31:18 +0000 (GMT) (envelope-from leeym@utopia.leeym.com) Received: from msr9.hinet.net (msr9.hinet.net [168.95.4.109]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BC1C43D49; Wed, 25 May 2005 06:31:17 +0000 (GMT) (envelope-from leeym@utopia.leeym.com) Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52]) by msr9.hinet.net (8.9.3/8.9.3) with ESMTP id OAA20957; Wed, 25 May 2005 14:31:13 +0800 (CST) Received: from localhost (localhost [127.0.0.1]) by utopia.leeym.com (Postfix) with ESMTP id 0ECB23E9EB4; Wed, 25 May 2005 14:31:11 +0800 (CST) Received: from utopia.leeym.com ([127.0.0.1]) by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 84014-03; Wed, 25 May 2005 14:30:41 +0800 (CST) Received: by utopia.leeym.com (Postfix, from userid 1000) id 8C8323EA145; Wed, 25 May 2005 14:30:41 +0800 (CST) To: FreeBSD-gnats-submit@freebsd.org From: Yen-Ming Lee X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20050525063041.8C8323EA145@utopia.leeym.com> Date: Wed, 25 May 2005 14:30:41 +0800 (CST) X-Virus-Scanned: by amavisd-new at leeym.com Cc: apache@freebsd.org Subject: [PATCH] www/mod_webapp: upbreak port X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2005 06:31:18 -0000 >Submitter-Id: current-users >Originator: Yen-Ming Lee >Organization: FreeBSD Taiwan >Confidential: no >Synopsis: [PATCH] www/mod_webapp: upbreak port >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 5.4-STABLE i386 >Environment: System: FreeBSD utopia.leeym.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Mon May 16 15:20:54 CST 2005 >Description: - fix build and unbreak this port - utilize DOCSDIR Added file(s): - files/patch-lib-pr_warp_network.c Port maintainer (apache@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- mod_webapp-4.1.24_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_webapp/Makefile,v retrieving revision 1.9 diff -u -u -r1.9 Makefile --- Makefile 20 Aug 2004 15:13:13 -0000 1.9 +++ Makefile 25 May 2005 06:28:23 -0000 @@ -19,6 +19,7 @@ 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 @@ # 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 @@ --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 @@ 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 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/www/mod_webapp/pkg-plist,v retrieving revision 1.1 diff -u -u -r1.1 pkg-plist --- pkg-plist 12 Jun 2003 14:06:20 -0000 1.1 +++ pkg-plist 25 May 2005 06:28:23 -0000 @@ -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%% Index: files/patch-lib-pr_warp_network.c =================================================================== RCS file: files/patch-lib-pr_warp_network.c diff -N files/patch-lib-pr_warp_network.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-lib-pr_warp_network.c 25 May 2005 06:28:23 -0000 @@ -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); --- mod_webapp-4.1.24_1.patch ends here ---