- Make configure script define DEFAULT_SCOREBOARD.

- Add NOTICE file to respect Apache 2.0 license

6 files changed, 14 insertions, 6 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index d74fdf707aad..cbee721de6f5 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -184,6 +184,7 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
 			${WRKSRC}/server/core.c
+	@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/www/apache2/files/patch-configure.in b/www/apache2/files/patch-configure.in
index bce5e602c918..6d77c65b7f07 100644
--- a/www/apache2/files/patch-configure.in
+++ b/www/apache2/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Mon Jan  5 14:40:31 2004
-+++ configure.in	Mon Jan  5 14:44:51 2004
+--- configure.in.orig	Thu Mar 18 08:36:52 2004
++++ configure.in	Fri Jul  2 11:44:25 2004
 @@ -69,7 +69,7 @@
  
  if test "$apr_found" = "reconfig"; then
@@ -18,12 +18,14 @@
                      [--enable-layout=*|\'--enable-layout=*])
    dnl We must be the last to build and the first to be cleaned
    AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
-@@ -532,8 +532,12 @@
+@@ -545,8 +545,14 @@
  	[Root directory of the Apache install area])
  AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
  	[Location of the config file, relative to the Apache root directory])
 +AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log",
 +	[Location of error log file])
++AC_DEFINE_UNQUOTED(DEFAULT_SCOREBOARD, "${rel_runtimedir}/apache_runtime_status",
++	[Location of ScoreBoard file])
  AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
  	[Location of the MIME types config file, relative to the Apache root directory])
 +AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}",
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index 077dc887c3c6..bad433a83ff3 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -513,6 +513,7 @@ share/apache2/build/special.mk
 %%ICONS%%www/icons-dist/world2.gif
 %%ICONS%%www/icons-dist/world2.png
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NOTICE
 %%PORTDOCS%%%%DOCSDIR%%/bind.html
 %%PORTDOCS%%%%DOCSDIR%%/bind.html.en
 %%PORTDOCS%%%%DOCSDIR%%/bind.html.ja.jis
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index d74fdf707aad..cbee721de6f5 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -184,6 +184,7 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
 			${WRKSRC}/server/core.c
+	@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/www/apache20/files/patch-configure.in b/www/apache20/files/patch-configure.in
index bce5e602c918..6d77c65b7f07 100644
--- a/www/apache20/files/patch-configure.in
+++ b/www/apache20/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Mon Jan  5 14:40:31 2004
-+++ configure.in	Mon Jan  5 14:44:51 2004
+--- configure.in.orig	Thu Mar 18 08:36:52 2004
++++ configure.in	Fri Jul  2 11:44:25 2004
 @@ -69,7 +69,7 @@
  
  if test "$apr_found" = "reconfig"; then
@@ -18,12 +18,14 @@
                      [--enable-layout=*|\'--enable-layout=*])
    dnl We must be the last to build and the first to be cleaned
    AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
-@@ -532,8 +532,12 @@
+@@ -545,8 +545,14 @@
  	[Root directory of the Apache install area])
  AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
  	[Location of the config file, relative to the Apache root directory])
 +AC_DEFINE_UNQUOTED(DEFAULT_ERRORLOG, "${rel_logfiledir}/httpd-error.log",
 +	[Location of error log file])
++AC_DEFINE_UNQUOTED(DEFAULT_SCOREBOARD, "${rel_runtimedir}/apache_runtime_status",
++	[Location of ScoreBoard file])
  AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
  	[Location of the MIME types config file, relative to the Apache root directory])
 +AC_DEFINE_UNQUOTED(DOCUMENT_LOCATION, "${rel_htdocsdir}",
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 077dc887c3c6..bad433a83ff3 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -513,6 +513,7 @@ share/apache2/build/special.mk
 %%ICONS%%www/icons-dist/world2.gif
 %%ICONS%%www/icons-dist/world2.png
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NOTICE
 %%PORTDOCS%%%%DOCSDIR%%/bind.html
 %%PORTDOCS%%%%DOCSDIR%%/bind.html.en
 %%PORTDOCS%%%%DOCSDIR%%/bind.html.ja.jis