Attachment #26850 for bug #45725

View | Details | Raw Unified | Return to bug 45725
Collapse All | Expand All




#

PORTNAME=	boa
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

USE_BZIP2=	yes
USE_GMAKE=	yes
USE_REINPLACE=	yes
GNU_CONFIGURE=	yes

MAN8=		boa.8

post-patch:
	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
		${WRKSRC}/examples/boa.conf ${WRKSRC}/src/defines.h

post-build:
	@cd ${WRKSRC}/../docs && ${MAKE} boa.info boa.html boa.txt

do-install:
	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa ${PREFIX}/sbin
	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa_indexer ${PREFIX}/sbin
	@${INSTALL_MAN} ${WRKSRC}/docs/boa.8 ${PREFIX}/man/man8
	@${INSTALL_DATA} ${WRKSRC}/../boa.conf ${PREFIX}/etc/boa.conf.sample
	@${MKDIR} ${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-info ${PREFIX}/info/boa.info ${PREFIX}/info/dir
.endif


Line 1 Link Here

(-)boa/distinfo (-1 / +1 lines)
1	MD5 (boa-0.94.13.tar.gz) = c8d6f46f9aa60909f171529068813fe0	1	MD5 (boa-0.94.14rc7.tar.bz2) = 0baf8c7454d096c2d43d9f7fce58b3eb

Line 0 Link Here

(-)boa/files/patch-Makefile.in (+11 lines)
	1	--- Makefile.in.orig Mon Nov 25 18:39:27 2002
	2	+++ Makefile.in Mon Nov 25 18:40:07 2002
	3	@@ -4,7 +4,7 @@
	4
	5	.PHONY: clean mrclean distclean boa docs
	6
	7	-all: boa
	8	+all: boa docs
	9
	10	boa:
	11	(cd src && $(MAKE) $(MFLAGS))




--- ../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/
 

Line 0 Link Here

(-)boa/files/patch-docs::Makefile.in (+11 lines)
	1	--- docs/Makefile.in.orig Mon Nov 25 18:38:32 2002
	2	+++ docs/Makefile.in Mon Nov 25 18:38:42 2002
	3	@@ -3,7 +3,7 @@
	4	srcdir = @srcdir@
	5	VPATH = @srcdir@
	6
	7	-all: boa.html boa.dvi boa.info boa.txt
	8	+all: boa.html boa.info boa.txt
	9
	10	boa.info: boa.texi
	11	makeinfo --number-sections @ALLSOURCES@

Lines 1-11 Link Here

(-)boa/files/patch-docs::boa.texi (-3 / +3 lines)
1	--- ../docs/boa.texi.orig Mon Feb 25 12:39:56 2002	1	--- docs/boa.texi.orig Mon Nov 25 18:28:07 2002
2	+++ ../docs/boa.texi Mon Feb 25 12:40:28 2002	2	+++ docs/boa.texi Mon Nov 25 18:28:44 2002
3	@@ -31,7 +31,7 @@	3	@@ -31,7 +31,7 @@
4	@ifinfo	4	@ifinfo
5	@dircategory Networking	5	@dircategory Networking
6	@direntry	6	@direntry
7	-* Boa: (boa). The Boa Webserver	7	-* Boa: (boa). The Boa Webserver
8	+* Boa: (boa). The Boa Webserver	8	+* Boa: (boa). The Boa Webserver
9	@end direntry	9	@end direntry
10	@end ifinfo	10	@end ifinfo
11		11




--- 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/
 




--- 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 *****/
 

 #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 *****/

Lines 1-4 Link Here

(-)boa/pkg-plist (-1 / +1 lines)
1	etc/boa.conf.sample
2	etc/rc.d/boa.sh.sample	1	etc/rc.d/boa.sh.sample
3	%%PORTDOCS%%@unexec install-info --delete %D/info/boa.info %D/info/dir	2	%%PORTDOCS%%@unexec install-info --delete %D/info/boa.info %D/info/dir
4	%%PORTDOCS%%info/boa.info	3	%%PORTDOCS%%info/boa.info
Lines 9-14 Link Here
9	%%PORTDOCS%%share/doc/boa/boa.html	8	%%PORTDOCS%%share/doc/boa/boa.html
10	%%PORTDOCS%%share/doc/boa/boa.txt	9	%%PORTDOCS%%share/doc/boa/boa.txt
11	%%PORTDOCS%%share/doc/boa/boa_banner.png	10	%%PORTDOCS%%share/doc/boa/boa_banner.png
		11	share/examples/boa/boa.conf
12	share/examples/boa/cgi-test.cgi	12	share/examples/boa/cgi-test.cgi
13	share/examples/boa/nph-test.cgi	13	share/examples/boa/nph-test.cgi
14	share/examples/boa/resolver.pl	14	share/examples/boa/resolver.pl

Return to bug 45725

Lines 6-19 Link Here

(-)boa/Makefile (-17 / +17 lines)
6	#	6	#
7		7
8	PORTNAME= boa	8	PORTNAME= boa
9	PORTVERSION= 0.94.13	9	PORTVERSION= 0.94.14.r7
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= www ipv6	11	CATEGORIES= www ipv6
12	MASTER_SITES= http://www.boa.org/	12	MASTER_SITES= http://www.boa.org/
		13	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
13		14
14	MAINTAINER= sysadmin@alexdupre.com	15	MAINTAINER= sysadmin@alexdupre.com
15		16
16	WRKSRC= ${WRKDIR}/${DISTNAME}/src	17	USE_BZIP2= yes
17	USE_GMAKE= yes	18	USE_GMAKE= yes
18	USE_REINPLACE= yes	19	USE_REINPLACE= yes
19	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
Lines 21-46 Link Here
21	MAN8= boa.8	22	MAN8= boa.8
22		23
23	post-patch:	24	post-patch:
24	@${REINPLACE_CMD} -e "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKSRC}/defines.h \	25	@${REINPLACE_CMD} -e "s\|%%PREFIX%%\|${PREFIX}\|g" \
25	${WRKSRC}/../boa.conf	26	${WRKSRC}/examples/boa.conf ${WRKSRC}/src/defines.h
26
27	post-build:
28	@cd ${WRKSRC}/../docs && ${MAKE} boa.info boa.html boa.txt
29		27
30	do-install:	28	do-install:
31	@${INSTALL_PROGRAM} ${WRKSRC}/boa ${PREFIX}/sbin	29	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa ${PREFIX}/sbin
32	@${INSTALL_PROGRAM} ${WRKSRC}/boa_indexer ${PREFIX}/sbin	30	@${INSTALL_PROGRAM} ${WRKSRC}/src/boa_indexer ${PREFIX}/sbin
33	@${INSTALL_MAN} ${WRKSRC}/../docs/boa.8 ${PREFIX}/man/man8	31	@${INSTALL_MAN} ${WRKSRC}/docs/boa.8 ${PREFIX}/man/man8
34	@${INSTALL_DATA} ${WRKSRC}/../boa.conf ${PREFIX}/etc/boa.conf.sample
35	@${MKDIR} ${EXAMPLESDIR}	32	@${MKDIR} ${EXAMPLESDIR}
36	@${INSTALL_DATA} ${WRKSRC}/../examples/* ${EXAMPLESDIR}	33	@${INSTALL_DATA} ${WRKSRC}/examples/boa.conf ${EXAMPLESDIR}
		34	@${INSTALL_DATA} ${WRKSRC}/examples/cgi-test.cgi ${EXAMPLESDIR}
		35	@${INSTALL_DATA} ${WRKSRC}/examples/nph-test.cgi ${EXAMPLESDIR}
		36	@${INSTALL_DATA} ${WRKSRC}/examples/resolver.pl ${EXAMPLESDIR}
37	.if !defined(NOPORTDOCS)	37	.if !defined(NOPORTDOCS)
38	@${MKDIR} ${DOCSDIR}	38	@${MKDIR} ${DOCSDIR}
39	@${INSTALL_DATA} ${WRKSRC}/../docs/boa.texi ${DOCSDIR}	39	@${INSTALL_DATA} ${WRKSRC}/docs/boa.texi ${DOCSDIR}
40	@${INSTALL_DATA} ${WRKSRC}/../docs/boa.html ${DOCSDIR}	40	@${INSTALL_DATA} ${WRKSRC}/docs/boa.html ${DOCSDIR}
41	@${INSTALL_DATA} ${WRKSRC}/../docs/boa.txt ${DOCSDIR}	41	@${INSTALL_DATA} ${WRKSRC}/docs/boa.txt ${DOCSDIR}
42	@${INSTALL_DATA} ${WRKSRC}/../docs/boa_banner.png ${DOCSDIR}	42	@${INSTALL_DATA} ${WRKSRC}/docs/boa_banner.png ${DOCSDIR}
43	@${INSTALL_DATA} ${WRKSRC}/../docs/boa.info ${PREFIX}/info	43	@${INSTALL_DATA} ${WRKSRC}/docs/boa.info ${PREFIX}/info
44	@install-info ${PREFIX}/info/boa.info ${PREFIX}/info/dir	44	@install-info ${PREFIX}/info/boa.info ${PREFIX}/info/dir
45	.endif	45	.endif
46		46

Lines 1-36 Link Here

(-)boa/files/patch-boa.conf (-36 lines)
1	--- ../boa.conf.orig Fri Mar 22 12:25:29 2002
2	+++ ../boa.conf Fri Mar 22 12:28:52 2002
3	@@ -108,7 +108,7 @@
4	# DocumentRoot: The root directory of the HTML documents.
5	# Comment out to disable server non user files.
6
7	-DocumentRoot /var/www
8	+DocumentRoot %%PREFIX%%/www/data
9
10	# UserDir: The name of the directory which is appended onto a user's home
11	# directory if a ~user request is recieved.
12	@@ -127,7 +127,7 @@
13	# DirectoryIndex are commented out, accessing a directory will give
14	# an error (though accessing files in the directory are still ok).
15
16	-DirectoryMaker /usr/lib/boa/boa_indexer
17	+DirectoryMaker %%PREFIX%%/sbin/boa_indexer
18
19	# DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker
20	# has been commented out, the the on-the-fly indexing of Boa can be used
21	@@ -161,7 +161,7 @@
22
23	# CGIPath: The value of the $PATH environment variable given to CGI progs.
24
25	-CGIPath /bin:/usr/bin:/usr/local/bin
26	+CGIPath /bin:/usr/bin:%%PREFIX%%/bin
27
28	# SinglePostLimit: The maximum allowable number of bytes in
29	# a single POST. Default is normally 1MB.
30	@@ -190,5 +190,5 @@
31	# ScriptAlias: Maps a virtual path to a directory for serving scripts
32	# Example: ScriptAlias /htbin/ /www/htbin/
33
34	-ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
35	+ScriptAlias /cgi-bin/ %%PREFIX%%/www/cgi-bin/
36

Line 0 Link Here

(-)boa/files/patch-examples::boa.conf (+62 lines)
	1	--- examples/boa.conf.orig Mon Nov 25 18:27:13 2002
	2	+++ examples/boa.conf Mon Nov 25 18:33:40 2002
	3	@@ -45,8 +45,8 @@
	4	# User: The name or UID the server should run as.
	5	# Group: The group name or GID the server should run as.
	6
	7	-User nobody
	8	-Group nogroup
	9	+User www
	10	+Group www
	11
	12	# ServerAdmin: The email address where server problems should be sent.
	13	# Note: this is not currently used, except as an environment variable
	14	@@ -155,7 +155,7 @@
	15	# DocumentRoot: The root directory of the HTML documents.
	16	# Comment out to disable server non user files.
	17
	18	-DocumentRoot /var/www
	19	+DocumentRoot %%PREFIX%%/www/data
	20
	21	# UserDir: The name of the directory which is appended onto a user's home
	22	# directory if a ~user request is recieved.
	23	@@ -174,7 +174,7 @@
	24	# DirectoryIndex are commented out, accessing a directory will give
	25	# an error (though accessing files in the directory are still ok).
	26
	27	-DirectoryMaker /usr/lib/boa/boa_indexer
	28	+DirectoryMaker %%PREFIX%%/sbin/boa_indexer
	29
	30	# DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker
	31	# has been commented out, the the on-the-fly indexing of Boa can be used
	32	@@ -199,7 +199,7 @@
	33	# Set to /dev/null if you do not want to load a mime types file.
	34	# Do not comment out (better use AddType!)
	35
	36	-MimeTypes /etc/mime.types
	37	+MimeTypes %%PREFIX%%/etc/mime.types
	38
	39	# DefaultType: MIME type used if the file extension is unknown, or there
	40	# is no file extension.
	41	@@ -208,7 +208,7 @@
	42
	43	# CGIPath: The value of the $PATH environment variable given to CGI progs.
	44
	45	-CGIPath /bin:/usr/bin:/usr/local/bin
	46	+CGIPath /bin:/usr/bin:%%PREFIX/bin
	47
	48	# SinglePostLimit: The maximum allowable number of bytes in
	49	# a single POST. Default is normally 1MB.
	50	@@ -232,10 +232,10 @@
	51	# Aliases: Aliases one path to another.
	52	# Example: Alias /path1/bar /path2/foo
	53
	54	-Alias /doc /usr/doc
	55	+Alias /doc /usr/share/doc
	56
	57	# ScriptAlias: Maps a virtual path to a directory for serving scripts
	58	# Example: ScriptAlias /htbin/ /www/htbin/
	59
	60	-ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
	61	+ScriptAlias /cgi-bin/ %%PREFIX/www/cgi-bin/
	62

Lines 1-5 Link Here

(-)boa/files/patch-src::defines.h (-2 / +11 lines)
1	--- defines.h.orig Fri Mar 22 12:30:45 2002	1	--- src/defines.h.orig Mon Nov 25 18:25:31 2002
2	+++ defines.h Fri Mar 22 12:31:58 2002	2	+++ src/defines.h Mon Nov 25 18:26:09 2002
3	@@ -27,7 +27,7 @@	3	@@ -27,7 +27,7 @@
4	/*** Change this, or use -c on the command line to specify it ***/	4	/*** Change this, or use -c on the command line to specify it ***/
5		5
Lines 9-11 Link Here
9	#endif	9	#endif
10		10
11	/*** Change this via the CGIPath configuration value in boa.conf ***/	11	/*** Change this via the CGIPath configuration value in boa.conf ***/
		12	@@ -53,7 +53,7 @@
		13
		14	#define REQUEST_TIMEOUT 60
		15
		16	-#define MIME_TYPES_DEFAULT "/etc/mime.types"
		17	+#define MIME_TYPES_DEFAULT "%%PREFIX%%/etc/mime.types"
		18	#define CGI_MIME_TYPE "application/x-httpd-cgi"
		19
		20	/*** CHANGE ANYTHING BELOW THIS LINE AT YOUR OWN PERIL ***/