From 433e3d97bda402d381371210e6c9649f935ae87c Mon Sep 17 00:00:00 2001 From: Hye-Shik Chang Date: Fri, 15 Nov 2002 13:35:56 +0000 Subject: o Change installbuilddir to $PREFIX/share/apache2/build to make porting 3rd party modules easy. [1] o Include before to reduce warnings on -CURRENT PR: 44104 [1] Submitted by: Clement Laforet [1] --- www/apache2/Makefile | 1 + www/apache2/files/config.layout | 2 +- www/apache2/files/patch-srclib:apr:include:apr.h | 17 +++++++++++++++++ www/apache2/pkg-plist | 17 +++++++++-------- 4 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 www/apache2/files/patch-srclib:apr:include:apr.h (limited to 'www/apache2') diff --git a/www/apache2/Makefile b/www/apache2/Makefile index f7f81e54edbe..7f7404339659 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.43 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache2/files/config.layout b/www/apache2/files/config.layout index e4f8ca8e22a4..e1f6e37ef756 100644 --- a/www/apache2/files/config.layout +++ b/www/apache2/files/config.layout @@ -7,7 +7,7 @@ mandir: ${prefix}/man sysconfdir: ${prefix}/etc/apache2 datadir: ${prefix}/www - installbuilddir: ${prefix}/share/apache2 + installbuilddir: ${prefix}/share/apache2/build errordir: ${datadir}/error iconsdir: ${datadir}/icons htdocsdir: ${datadir}/data diff --git a/www/apache2/files/patch-srclib:apr:include:apr.h b/www/apache2/files/patch-srclib:apr:include:apr.h new file mode 100644 index 000000000000..f6e2e55f0de5 --- /dev/null +++ b/www/apache2/files/patch-srclib:apr:include:apr.h @@ -0,0 +1,17 @@ +--- srclib/apr/include/apr.h.in.orig Fri Nov 15 17:33:00 2002 ++++ srclib/apr/include/apr.h.in Fri Nov 15 17:33:10 2002 +@@ -299,11 +299,11 @@ + #endif + + /* header files for PATH_MAX, _POSIX_PATH_MAX */ +-#if APR_HAVE_SYS_SYSLIMITS_H +-#include +-#endif + #if APR_HAVE_LIMITS_H + #include ++#endif ++#if APR_HAVE_SYS_SYSLIMITS_H ++#include + #endif + + #if defined(PATH_MAX) diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist index 755ba5f02feb..b6aa9376f3c6 100644 --- a/www/apache2/pkg-plist +++ b/www/apache2/pkg-plist @@ -203,14 +203,14 @@ sbin/httpd sbin/logresolve sbin/rotatelogs %%SUEXEC%%sbin/suexec -share/apache2/config_vars.mk -share/apache2/instdso.sh -share/apache2/library.mk -share/apache2/libtool -share/apache2/ltlib.mk -share/apache2/program.mk -share/apache2/rules.mk -share/apache2/special.mk +share/apache2/build/config_vars.mk +share/apache2/build/instdso.sh +share/apache2/build/library.mk +share/apache2/build/libtool +share/apache2/build/ltlib.mk +share/apache2/build/program.mk +share/apache2/build/rules.mk +share/apache2/build/special.mk %%PORTDOCS%%share/doc/apache2/LICENSE %%PORTDOCS%%share/doc/apache2/bind.html.en %%PORTDOCS%%share/doc/apache2/bind.html.ja.jis @@ -989,6 +989,7 @@ www/icons-dist/world2.png %%PORTDOCS%%@dirrm share/doc/apache2/faq %%PORTDOCS%%@dirrm share/doc/apache2/developer %%PORTDOCS%%@dirrm share/doc/apache2 +@dirrm share/apache2/build @dirrm share/apache2 @dirrm libexec/apache2 @dirrm lib/apache2 -- cgit v1.2.3