diff options
author | ijliao <ijliao@FreeBSD.org> | 2001-12-13 10:12:38 +0000 |
---|---|---|
committer | ijliao <ijliao@FreeBSD.org> | 2001-12-13 10:12:38 +0000 |
commit | 22fedd428dfc91b5b63f459a74c3a3283faff389 (patch) | |
tree | 3c6eb854d3a2891e7d3f42d2fb30c850befce3d3 /www/apache21 | |
parent | 69d04df4f6ba61499e2e98c87b792bb97ee6d17d (diff) | |
download | FreeBSD-ports-22fedd428dfc91b5b63f459a74c3a3283faff389.zip FreeBSD-ports-22fedd428dfc91b5b63f459a74c3a3283faff389.tar.gz |
Fix invalid path problem on building extension module with apxs.
PR: 32638
Submitted by: maintainer
Diffstat (limited to 'www/apache21')
-rw-r--r-- | www/apache21/Makefile | 2 | ||||
-rw-r--r-- | www/apache21/files/patch-support:apxs.in | 29 |
2 files changed, 29 insertions, 2 deletions
diff --git a/www/apache21/Makefile b/www/apache21/Makefile index f9eab5f..847c715 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.28 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache21/files/patch-support:apxs.in b/www/apache21/files/patch-support:apxs.in index 9ababb7..4106153 100644 --- a/www/apache21/files/patch-support:apxs.in +++ b/www/apache21/files/patch-support:apxs.in @@ -1,5 +1,5 @@ --- support/apxs.in.orig Sat Nov 3 05:09:20 2001 -+++ support/apxs.in Sat Nov 17 02:51:43 2001 ++++ support/apxs.in Sun Dec 9 14:47:57 2001 @@ -66,7 +66,7 @@ # read the configuration variables once @@ -18,3 +18,30 @@ $httpd = eval qq("$httpd"); $httpd = eval qq("$httpd"); +@@ -412,7 +412,7 @@ + $la =~ s|\.c$|.la|; + my $o = $s; + $o =~ s|\.c$|.o|; +- push(@cmds, "$prefix/build/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); ++ push(@cmds, "$prefix/share/mk/apache/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); + unshift(@objs, $lo); + } + +@@ -437,7 +437,7 @@ + $opt .= " -l$opt_l"; + } + +- push(@cmds, "$prefix/build/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); ++ push(@cmds, "$prefix/share/mk/apache/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); + + # execute the commands + &execute_cmds(@cmds); +@@ -467,7 +467,7 @@ + my $t = $f; + $t =~ s|^.+/([^/]+)$|$1|; + if ($opt_i) { +- push(@cmds, "$prefix/build/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t"); ++ push(@cmds, "$prefix/share/mk/apache/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t"); + push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); + } + |