From owner-freebsd-ports Wed Mar 6 15:30:23 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A196137B416 for ; Wed, 6 Mar 2002 15:30:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g26NU1262904; Wed, 6 Mar 2002 15:30:01 -0800 (PST) (envelope-from gnats) Received: from vaio.alexdupre.com (212-41-211-209.adsl.galactica.it [212.41.211.209]) by hub.freebsd.org (Postfix) with ESMTP id EFCA037B404 for ; Wed, 6 Mar 2002 15:26:53 -0800 (PST) Received: (from alex@localhost) by vaio.alexdupre.com (8.11.6/8.11.6) id g26NROj03943; Thu, 7 Mar 2002 00:27:24 +0100 (CET) (envelope-from alex) Message-Id: <200203062327.g26NROj03943@vaio.alexdupre.com> Date: Thu, 7 Mar 2002 00:27:24 +0100 (CET) From: Alex Dupre Reply-To: Alex Dupre To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/35601: [Maintainer Update Port] Boa Web Server (to 0.94.12rc3) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 35601 >Category: ports >Synopsis: [Maintainer Update Port] Boa Web Server (to 0.94.12rc3) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Mar 06 15:30:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD vaio.alexdupre.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Sun Feb 3 15:53:42 CET 2002 alex@vaio.alexdupre.com:/usr/obj/usr/src/sys/VAIO2002 i386 >Description: Updated www/boa to the latest release. This submission supersedes PR 35312. >How-To-Repeat: >Fix: --- boa.diff begins here --- diff -ruN boa.orig/Makefile boa/Makefile --- boa.orig/Makefile Wed Mar 6 23:53:40 2002 +++ boa/Makefile Thu Mar 7 00:15:13 2002 @@ -6,7 +6,7 @@ # PORTNAME= boa -PORTVERSION= 0.94.12.r2 +PORTVERSION= 0.94.12.r3 CATEGORIES= www MASTER_SITES= http://www.boa.org/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} @@ -23,6 +23,9 @@ @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/defines.h \ ${WRKSRC}/../boa.conf +post-build: + @cd ${WRKSRC}/../docs && ${MAKE} boa.info boa.html boa.txt + do-install: @${INSTALL_PROGRAM} ${WRKSRC}/boa ${PREFIX}/sbin @${INSTALL_PROGRAM} ${WRKSRC}/boa_indexer ${PREFIX}/sbin @@ -33,7 +36,11 @@ .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/../docs/boa.texi ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/../docs/boa.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/../docs/boa.txt ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/../docs/boa_banner.png ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/../docs/boa.info ${PREFIX}/info + @install-info ${PREFIX}/info/boa.info ${PREFIX}/info/dir .endif post-install: diff -ruN boa.orig/distinfo boa/distinfo --- boa.orig/distinfo Wed Mar 6 23:53:47 2002 +++ boa/distinfo Wed Mar 6 23:44:57 2002 @@ -1 +1 @@ -MD5 (boa-0.94.12rc2.tar.gz) = db9c924b542dc44fe9cae459bbbb4faa +MD5 (boa-0.94.12rc3.tar.gz) = 7c0ac77a108f40c09d0341e2dc437cd4 diff -ruN boa.orig/files/patch-boa.conf boa/files/patch-boa.conf --- boa.orig/files/patch-boa.conf Wed Mar 6 23:53:19 2002 +++ boa/files/patch-boa.conf Thu Mar 7 00:07:25 2002 @@ -1,5 +1,14 @@ ---- ../boa.conf.orig Mon Sep 24 23:28:30 2001 -+++ ../boa.conf Sun Feb 17 16:33:43 2002 +--- ../boa.conf.orig Wed Mar 6 23:50:40 2002 ++++ ../boa.conf Wed Mar 6 23:52:39 2002 +@@ -108,7 +108,7 @@ + # DocumentRoot: The root directory of the HTML documents. + # Comment out to disable server non user files. + +-DocumentRoot /var/www ++DocumentRoot %%PREFIX%%/www/data + + # UserDir: The name of the directory which is appended onto a user's home + # directory if a ~user request is recieved. @@ -127,7 +127,7 @@ # DirectoryIndex are commented out, accessing a directory will give # an error (though accessing files in the directory are still ok). @@ -9,3 +18,10 @@ # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker # has been commented out, the the on-the-fly indexing of Boa can be used +@@ -183,5 +183,5 @@ + # ScriptAlias: Maps a virtual path to a directory for serving scripts + # Example: ScriptAlias /htbin/ /www/htbin/ + +-ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ ++ScriptAlias /cgi-bin/ %%PREFIX%%/www/cgi-bin/ + diff -ruN boa.orig/files/patch-docs::boa.texi boa/files/patch-docs::boa.texi --- boa.orig/files/patch-docs::boa.texi Thu Jan 1 01:00:00 1970 +++ boa/files/patch-docs::boa.texi Mon Feb 25 12:44:40 2002 @@ -0,0 +1,11 @@ +--- ../docs/boa.texi.orig Mon Feb 25 12:39:56 2002 ++++ ../docs/boa.texi Mon Feb 25 12:40:28 2002 +@@ -31,7 +31,7 @@ + @ifinfo + @dircategory Networking + @direntry +-* Boa: (boa). The Boa Webserver ++* Boa: (boa). The Boa Webserver + @end direntry + @end ifinfo + diff -ruN boa.orig/pkg-plist boa/pkg-plist --- boa.orig/pkg-plist Wed Mar 6 23:53:19 2002 +++ boa/pkg-plist Thu Mar 7 00:06:02 2002 @@ -1,8 +1,13 @@ etc/boa.conf.sample etc/rc.d/boa.sh.sample +%%PORTDOCS%%@unexec install-info --delete %D/info/boa.info %D/info/dir +%%PORTDOCS%%info/boa.info +%%PORTDOCS%%@exec install-info %D/info/boa.info %D/info/dir sbin/boa sbin/boa_indexer %%PORTDOCS%%share/doc/boa/boa.texi +%%PORTDOCS%%share/doc/boa/boa.html +%%PORTDOCS%%share/doc/boa/boa.txt %%PORTDOCS%%share/doc/boa/boa_banner.png share/examples/boa/cgi-test.cgi share/examples/boa/nph-test.cgi --- boa.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message