Update to version 0.94.6.

PR:		17723
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

5 files changed, 57 insertions, 47 deletions

diff --git a/www/boa/Makefile b/www/boa/Makefile
index 61eb6a9a12fb..537a6ea6f0fb 100644
--- a/www/boa/Makefile
+++ b/www/boa/Makefile
@@ -6,24 +6,33 @@
 #
 
 PORTNAME=	boa
-PORTVERSION= 	0.92
+PORTVERSION= 	0.94.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.boa.org/
 
 MAINTAINER=	ports@FreeBSD.org
 
-do-build:
-	@ cd ${WRKSRC}/src; make
+FETCH_BEFORE_ARGS=	-b
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+
+BOA_DOCS=	boa-1.html boa-2.html boa-3.html boa-4.html boa.html \
+		boa.ps boa.txt boa_banner.png
+
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/defines.h
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/src/boa ${PREFIX}/sbin
-	@ ${MKDIR} ${PREFIX}/share/examples/boa
-	@ ${INSTALL_DATA} ${WRKSRC}/conf/* ${PREFIX}/share/examples/boa
+	${INSTALL_PROGRAM} ${WRKSRC}/boa ${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/../boa.conf ${PREFIX}/etc/boa.conf.sample
+	@${MKDIR} ${PREFIX}/share/examples/boa
+	${INSTALL_DATA} ${WRKSRC}/../examples/* ${PREFIX}/share/examples/boa
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/boa
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/boa
-.for file in Changelog Gnu_License biblio.html details.html details.txt logos.html newboa7.gif poweredbyboa.gif readme.html readme.txt todo.txt
-	@ ${INSTALL_DATA} ${WRKSRC}/docs/${file} ${PREFIX}/share/doc/boa
+	@${MKDIR} ${PREFIX}/share/doc/boa
+.for file in ${BOA_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/../docs/${file} ${PREFIX}/share/doc/boa
 .endfor
 .endif
 
diff --git a/www/boa/distinfo b/www/boa/distinfo
index d099c8e624cb..d17302b79114 100644
--- a/www/boa/distinfo
+++ b/www/boa/distinfo
@@ -1 +1 @@
-MD5 (boa-0.92.tar.gz) = f3a28c2c911727f43eaf3e9e2703ab45
+MD5 (boa-0.94.6.tar.gz) = abb44d3c2b9d6dba19c647ac7474d63f
diff --git a/www/boa/files/patch-aa b/www/boa/files/patch-aa
index 5532a492de72..9c2edcc10473 100644
--- a/www/boa/files/patch-aa
+++ b/www/boa/files/patch-aa
@@ -1,19 +1,13 @@
---- src/Makefile.orig	Fri Dec 20 20:45:00 1996
-+++ src/Makefile	Fri Jan 21 01:42:21 2000
-@@ -9,13 +9,13 @@
+--- Makefile.in.orig	Sun Feb 13 06:52:45 2000
++++ Makefile.in	Thu Mar 30 20:22:55 2000
+@@ -12,8 +12,8 @@
+ # Add -lefence to LDFLAGS to link with ElectricFence
+ # Add -pg to CFLAGS and LDFLAGS to get profiling output with gcc/gprof
  
- # Add -DVERBOSE_CGI_LOGS if you want logs of CGI program start and stop times
- 
--CMDARGS = -c -O2
-+CMDARGS = -c ${CFLAGS}
+-LDFLAGS = @LIBS@ -g 
+-CFLAGS = -O -Wall -g
++LDFLAGS = @LIBS@
++CFLAGS = @CFLAGS@
  
  # Change these if necessary
  
--YACC = bison -y
-+YACC = yacc
- LEX = flex
--CC = gcc
-+#CC = gcc
- 
- all:	boa
- 
diff --git a/www/boa/files/patch-ab b/www/boa/files/patch-ab
index ba89ddc650ff..f325e4723132 100644
--- a/www/boa/files/patch-ab
+++ b/www/boa/files/patch-ab
@@ -1,11 +1,20 @@
---- src/defines.h	Sun Dec 22 22:20:16 1996
-+++ /home/andy/tmp/wrk/src/defines.h	Thu May 21 22:10:31 1998
-@@ -23,7 +23,7 @@
- 
+--- defines.h.orig	Fri Feb 18 13:18:42 2000
++++ defines.h	Thu Mar 30 20:31:43 2000
+@@ -27,7 +27,7 @@
  /***** Change this, or use -c on the command line to specify it *****/
  
--#define SERVER_ROOT "/usr/local/boa"
-+#define SERVER_ROOT "/usr/local/www"
+ #ifndef SERVER_ROOT
+-#define SERVER_ROOT "/etc/boa"
++#define SERVER_ROOT "%%PREFIX%%/etc"
+ #endif
  
  /***** Various stuff that you may want to tweak, but probably shouldn't *****/
+@@ -44,7 +44,7 @@
+ #define REQUEST_TIMEOUT				60
+ 
+ #define CGI_MIME_TYPE    "application/x-httpd-cgi"
+-#define DEFAULT_PATH     "/bin:/usr/bin:/usr/local/bin"
++#define DEFAULT_PATH     "/bin:/usr/bin:%%PREFIX%%/bin"
  
+ /***** CHANGE ANYTHING BELOW THIS LINE AT YOUR OWN PERIL *****/
+ /***** You will probably introduce buffer overruns unless you know
diff --git a/www/boa/pkg-plist b/www/boa/pkg-plist
index 98644b1104ad..e1803c9556ed 100644
--- a/www/boa/pkg-plist
+++ b/www/boa/pkg-plist
@@ -1,17 +1,15 @@
+etc/boa.conf.sample
 sbin/boa
-share/doc/boa/Changelog
-share/doc/boa/Gnu_License
-share/doc/boa/README
-share/doc/boa/biblio.html
-share/doc/boa/details.html
-share/doc/boa/details.txt
-share/doc/boa/logos.html
-share/doc/boa/newboa7.gif
-share/doc/boa/poweredbyboa.gif
-share/doc/boa/readme.html
-share/doc/boa/readme.txt
-share/doc/boa/todo.txt
-share/examples/boa/boa.conf
-share/examples/boa/mime.types
-@dirrm share/doc/boa
+share/doc/boa/boa-1.html
+share/doc/boa/boa-2.html
+share/doc/boa/boa-3.html
+share/doc/boa/boa-4.html
+share/doc/boa/boa.html
+share/doc/boa/boa.ps
+share/doc/boa/boa.txt
+share/doc/boa/boa_banner.png
+share/examples/boa/cgi-test.cgi
+share/examples/boa/nph-test.cgi
+share/examples/boa/resolver.pl
 @dirrm share/examples/boa
+@dirrm share/doc/boa