Date: Mon, 25 Nov 2002 19:03:43 +0100 (CET) From: Alex Dupre <sysadmin@alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/45725: [Maintainer Update] Port: www/boa Message-ID: <200211251803.gAPI3hnj009469@vaio.alexdupre.com>
next in thread | raw e-mail | index | archive | help
>Number: 45725 >Category: ports >Synopsis: [Maintainer Update] Port: www/boa >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Nov 25 10:00:04 PST 2002 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 4.5-ALEXDUPRE i386 >Organization: >Environment: System: FreeBSD vaio.alexdupre.com 4.5-ALEXDUPRE FreeBSD 4.5-ALEXDUPRE #0: Fri Apr 12 14:12:57 CEST 2002 alex@vaio.alexdupre.com:/usr/obj/usr/src/sys/VAIO i386 >Description: Update to 0.94.14rc7 release. >How-To-Repeat: >Fix: --- boa.diff begins here --- diff -ruN boa.orig/Makefile boa/Makefile --- boa.orig/Makefile Mon Nov 25 17:58:17 2002 +++ boa/Makefile Mon Nov 25 18:49:13 2002 @@ -6,14 +6,15 @@ # PORTNAME= boa -PORTVERSION= 0.94.13 +PORTVERSION= 0.94.14.r7 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.boa.org/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= sysadmin@alexdupre.com -WRKSRC= ${WRKDIR}/${DISTNAME}/src +USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes @@ -21,26 +22,25 @@ MAN8= boa.8 post-patch: - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/defines.h \ - ${WRKSRC}/../boa.conf - -post-build: - @cd ${WRKSRC}/../docs && ${MAKE} boa.info boa.html boa.txt + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ + ${WRKSRC}/examples/boa.conf ${WRKSRC}/src/defines.h do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/boa ${PREFIX}/sbin - @${INSTALL_PROGRAM} ${WRKSRC}/boa_indexer ${PREFIX}/sbin - @${INSTALL_MAN} ${WRKSRC}/../docs/boa.8 ${PREFIX}/man/man8 - @${INSTALL_DATA} ${WRKSRC}/../boa.conf ${PREFIX}/etc/boa.conf.sample + @${INSTALL_PROGRAM} ${WRKSRC}/src/boa ${PREFIX}/sbin + @${INSTALL_PROGRAM} ${WRKSRC}/src/boa_indexer ${PREFIX}/sbin + @${INSTALL_MAN} ${WRKSRC}/docs/boa.8 ${PREFIX}/man/man8 @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/../examples/* ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/examples/boa.conf ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/examples/cgi-test.cgi ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/examples/nph-test.cgi ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/examples/resolver.pl ${EXAMPLESDIR} .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_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 diff -ruN boa.orig/distinfo boa/distinfo --- boa.orig/distinfo Mon Nov 25 17:58:17 2002 +++ boa/distinfo Mon Nov 25 18:19:07 2002 @@ -1 +1 @@ -MD5 (boa-0.94.13.tar.gz) = c8d6f46f9aa60909f171529068813fe0 +MD5 (boa-0.94.14rc7.tar.bz2) = 0baf8c7454d096c2d43d9f7fce58b3eb diff -ruN boa.orig/files/patch-Makefile.in boa/files/patch-Makefile.in --- boa.orig/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 +++ boa/files/patch-Makefile.in Mon Nov 25 18:40:18 2002 @@ -0,0 +1,11 @@ +--- Makefile.in.orig Mon Nov 25 18:39:27 2002 ++++ Makefile.in Mon Nov 25 18:40:07 2002 +@@ -4,7 +4,7 @@ + + .PHONY: clean mrclean distclean boa docs + +-all: boa ++all: boa docs + + boa: + (cd src && $(MAKE) $(MFLAGS)) diff -ruN boa.orig/files/patch-boa.conf boa/files/patch-boa.conf --- boa.orig/files/patch-boa.conf Mon Nov 25 17:58:17 2002 +++ boa/files/patch-boa.conf Thu Jan 1 01:00:00 1970 @@ -1,36 +0,0 @@ ---- ../boa.conf.orig Fri Mar 22 12:25:29 2002 -+++ ../boa.conf Fri Mar 22 12:28:52 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). - --DirectoryMaker /usr/lib/boa/boa_indexer -+DirectoryMaker %%PREFIX%%/sbin/boa_indexer - - # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker - # has been commented out, the the on-the-fly indexing of Boa can be used -@@ -161,7 +161,7 @@ - - # CGIPath: The value of the $PATH environment variable given to CGI progs. - --CGIPath /bin:/usr/bin:/usr/local/bin -+CGIPath /bin:/usr/bin:%%PREFIX%%/bin - - # SinglePostLimit: The maximum allowable number of bytes in - # a single POST. Default is normally 1MB. -@@ -190,5 +190,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::Makefile.in boa/files/patch-docs::Makefile.in --- boa.orig/files/patch-docs::Makefile.in Thu Jan 1 01:00:00 1970 +++ boa/files/patch-docs::Makefile.in Mon Nov 25 18:39:19 2002 @@ -0,0 +1,11 @@ +--- docs/Makefile.in.orig Mon Nov 25 18:38:32 2002 ++++ docs/Makefile.in Mon Nov 25 18:38:42 2002 +@@ -3,7 +3,7 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + +-all: boa.html boa.dvi boa.info boa.txt ++all: boa.html boa.info boa.txt + + boa.info: boa.texi + makeinfo --number-sections @ALLSOURCES@ diff -ruN boa.orig/files/patch-docs::boa.texi boa/files/patch-docs::boa.texi --- boa.orig/files/patch-docs::boa.texi Mon Nov 25 17:58:17 2002 +++ boa/files/patch-docs::boa.texi Mon Nov 25 18:29:05 2002 @@ -1,11 +1,11 @@ ---- ../docs/boa.texi.orig Mon Feb 25 12:39:56 2002 -+++ ../docs/boa.texi Mon Feb 25 12:40:28 2002 +--- docs/boa.texi.orig Mon Nov 25 18:28:07 2002 ++++ docs/boa.texi Mon Nov 25 18:28:44 2002 @@ -31,7 +31,7 @@ @ifinfo @dircategory Networking @direntry -* Boa: (boa). The Boa Webserver -+* Boa: (boa). The Boa Webserver ++* Boa: (boa). The Boa Webserver @end direntry @end ifinfo diff -ruN boa.orig/files/patch-examples::boa.conf boa/files/patch-examples::boa.conf --- boa.orig/files/patch-examples::boa.conf Thu Jan 1 01:00:00 1970 +++ boa/files/patch-examples::boa.conf Mon Nov 25 18:34:05 2002 @@ -0,0 +1,62 @@ +--- examples/boa.conf.orig Mon Nov 25 18:27:13 2002 ++++ examples/boa.conf Mon Nov 25 18:33:40 2002 +@@ -45,8 +45,8 @@ + # User: The name or UID the server should run as. + # Group: The group name or GID the server should run as. + +-User nobody +-Group nogroup ++User www ++Group www + + # ServerAdmin: The email address where server problems should be sent. + # Note: this is not currently used, except as an environment variable +@@ -155,7 +155,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. +@@ -174,7 +174,7 @@ + # DirectoryIndex are commented out, accessing a directory will give + # an error (though accessing files in the directory are still ok). + +-DirectoryMaker /usr/lib/boa/boa_indexer ++DirectoryMaker %%PREFIX%%/sbin/boa_indexer + + # DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker + # has been commented out, the the on-the-fly indexing of Boa can be used +@@ -199,7 +199,7 @@ + # Set to /dev/null if you do not want to load a mime types file. + # Do *not* comment out (better use AddType!) + +-MimeTypes /etc/mime.types ++MimeTypes %%PREFIX%%/etc/mime.types + + # DefaultType: MIME type used if the file extension is unknown, or there + # is no file extension. +@@ -208,7 +208,7 @@ + + # CGIPath: The value of the $PATH environment variable given to CGI progs. + +-CGIPath /bin:/usr/bin:/usr/local/bin ++CGIPath /bin:/usr/bin:%%PREFIX/bin + + # SinglePostLimit: The maximum allowable number of bytes in + # a single POST. Default is normally 1MB. +@@ -232,10 +232,10 @@ + # Aliases: Aliases one path to another. + # Example: Alias /path1/bar /path2/foo + +-Alias /doc /usr/doc ++Alias /doc /usr/share/doc + + # 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-src::defines.h boa/files/patch-src::defines.h --- boa.orig/files/patch-src::defines.h Mon Nov 25 17:58:17 2002 +++ boa/files/patch-src::defines.h Mon Nov 25 18:26:47 2002 @@ -1,5 +1,5 @@ ---- defines.h.orig Fri Mar 22 12:30:45 2002 -+++ defines.h Fri Mar 22 12:31:58 2002 +--- src/defines.h.orig Mon Nov 25 18:25:31 2002 ++++ src/defines.h Mon Nov 25 18:26:09 2002 @@ -27,7 +27,7 @@ /***** Change this, or use -c on the command line to specify it *****/ @@ -9,3 +9,12 @@ #endif /***** Change this via the CGIPath configuration value in boa.conf *****/ +@@ -53,7 +53,7 @@ + + #define REQUEST_TIMEOUT 60 + +-#define MIME_TYPES_DEFAULT "/etc/mime.types" ++#define MIME_TYPES_DEFAULT "%%PREFIX%%/etc/mime.types" + #define CGI_MIME_TYPE "application/x-httpd-cgi" + + /***** CHANGE ANYTHING BELOW THIS LINE AT YOUR OWN PERIL *****/ diff -ruN boa.orig/pkg-plist boa/pkg-plist --- boa.orig/pkg-plist Mon Nov 25 17:58:17 2002 +++ boa/pkg-plist Mon Nov 25 18:51:58 2002 @@ -1,4 +1,3 @@ -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 @@ -9,6 +8,7 @@ %%PORTDOCS%%share/doc/boa/boa.html %%PORTDOCS%%share/doc/boa/boa.txt %%PORTDOCS%%share/doc/boa/boa_banner.png +share/examples/boa/boa.conf share/examples/boa/cgi-test.cgi share/examples/boa/nph-test.cgi share/examples/boa/resolver.pl --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211251803.gAPI3hnj009469>