diff options
author | Hye-Shik Chang <perky@FreeBSD.org> | 2003-01-08 11:29:55 +0000 |
---|---|---|
committer | Hye-Shik Chang <perky@FreeBSD.org> | 2003-01-08 11:29:55 +0000 |
commit | 21de316435f47579d64e9659e4e5a454e1a26e76 (patch) | |
tree | 0330f7ed751cb0752828cb02a6a92d7da3f1118c /www/apache21 | |
parent | upgrade to 2.30 (diff) |
Move bin/ap[ru]-config to lib/apache2/ to coexist with devel/apr-devel
Bumped PORTREVISION accordingly.
PR: ports/39091
Submitted by: Marc Recht <marc@informatik.uni-bremen.de>
Notes
Notes:
svn path=/head/; revision=72733
Diffstat (limited to 'www/apache21')
-rw-r--r-- | www/apache21/Makefile | 2 | ||||
-rw-r--r-- | www/apache21/files/patch-configure | 26 | ||||
-rw-r--r-- | www/apache21/pkg-plist | 4 |
3 files changed, 25 insertions, 7 deletions
diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 7f7404339659..45d4809bd426 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.43 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache21/files/patch-configure b/www/apache21/files/patch-configure index 942d1b071371..7a85d2f86f30 100644 --- a/www/apache21/files/patch-configure +++ b/www/apache21/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Thu May 2 05:53:00 2002 -+++ configure Wed May 8 16:12:46 2002 -@@ -1503,7 +1503,7 @@ +--- configure.orig Thu Oct 3 14:43:28 2002 ++++ configure Wed Jan 8 19:58:11 2003 +@@ -1520,7 +1520,7 @@ $srcdir/config.layout > $pldconf layout_name=$LAYOUT . $pldconf @@ -9,7 +9,25 @@ for var in prefix exec_prefix bindir sbindir libexecdir mandir \ sysconfdir datadir errordir iconsdir htdocsdir cgidir \ includedir localstatedir runtimedir logfiledir libdir \ -@@ -15077,6 +15077,9 @@ +@@ -2627,7 +2627,7 @@ + esac + + # The eval makes quoting arguments work. +- if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir" ++ if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir" + then : + echo "srclib/apr configured properly" + else +@@ -2908,7 +2908,7 @@ + esac + + # The eval makes quoting arguments work. +- if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir" ++ if eval $ac_abs_srcdir/configure $ac_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir "--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir" + then : + echo "srclib/apr-util configured properly" + else +@@ -15652,6 +15652,9 @@ cat >>confdefs.h <<_ACEOF #define SERVER_CONFIG_FILE "${rel_sysconfdir}/${progname}.conf" diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist index b6aa9376f3c6..ec4f439a4d65 100644 --- a/www/apache21/pkg-plist +++ b/www/apache21/pkg-plist @@ -1,5 +1,3 @@ -bin/apr-config -bin/apu-config @unexec if cmp -s %D/etc/apache2/highperformance.conf %D/etc/apache2/highperformance-std.conf; then rm -f %D/etc/apache2/highperformance.conf; fi etc/apache2/highperformance-std.conf @exec [ -f %B/highperformance.conf ] || cp %B/%f %B/highperformance.conf @@ -125,8 +123,10 @@ include/apache2/util_md5.h include/apache2/util_script.h include/apache2/util_time.h include/apache2/util_xml.h +lib/apache2/apr-config lib/apache2/apr.exp lib/apache2/aprutil.exp +lib/apache2/apu-config lib/apache2/libapr.a lib/apache2/libapr.la lib/apache2/libapr.so |