Update to 0.94.12rc3.

PR:		35601
Submitted by:	maintainer

5 files changed, 43 insertions, 4 deletions

diff --git a/www/boa/Makefile b/www/boa/Makefile
index e77593f2c51e..082ebb3c7533 100644
--- a/www/boa/Makefile
+++ b/www/boa/Makefile
@@ -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 @@ post-patch:
 	@${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 @@ do-install:
 .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 --git a/www/boa/distinfo b/www/boa/distinfo
index a9ac66756638..628d82fd07f4 100644
--- a/www/boa/distinfo
+++ b/www/boa/distinfo
@@ -1 +1 @@
-MD5 (boa-0.94.12rc2.tar.gz) = db9c924b542dc44fe9cae459bbbb4faa
+MD5 (boa-0.94.12rc3.tar.gz) = 7c0ac77a108f40c09d0341e2dc437cd4
diff --git a/www/boa/files/patch-boa.conf b/www/boa/files/patch-boa.conf
index a84412f66eb7..89f305c598bb 100644
--- a/www/boa/files/patch-boa.conf
+++ b/www/boa/files/patch-boa.conf
@@ -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 --git a/www/boa/files/patch-docs::boa.texi b/www/boa/files/patch-docs::boa.texi
new file mode 100644
index 000000000000..13da5e3e8ef0
--- /dev/null
+++ b/www/boa/files/patch-docs::boa.texi
@@ -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 --git a/www/boa/pkg-plist b/www/boa/pkg-plist
index dea29627bee9..ec7291a77154 100644
--- a/www/boa/pkg-plist
+++ b/www/boa/pkg-plist
@@ -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