summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorYing-Chieh Liao <ijliao@FreeBSD.org>2001-12-13 10:12:38 +0000
committerYing-Chieh Liao <ijliao@FreeBSD.org>2001-12-13 10:12:38 +0000
commit3662cec740c2302685cdffefbbda07c86560e689 (patch)
tree49dae76d5461a4cdb0a3fc68699d0489357ecc83 /www
parentupgrade to 3.1.4 (diff)
Fix invalid path problem on building extension module with apxs.
PR: 32638 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=51467
Diffstat (limited to 'www')
-rw-r--r--www/apache2/Makefile2
-rw-r--r--www/apache2/files/patch-support:apxs.in29
-rw-r--r--www/apache20/Makefile2
-rw-r--r--www/apache20/files/patch-support:apxs.in29
-rw-r--r--www/apache21/Makefile2
-rw-r--r--www/apache21/files/patch-support:apxs.in29
-rw-r--r--www/apache22/Makefile2
-rw-r--r--www/apache22/files/patch-support:apxs.in29
8 files changed, 116 insertions, 8 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index f9eab5fbd9cc..847c715eb25d 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/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/apache2/files/patch-support:apxs.in b/www/apache2/files/patch-support:apxs.in
index 9ababb75322e..4106153d5e90 100644
--- a/www/apache2/files/patch-support:apxs.in
+++ b/www/apache2/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");
+ }
+
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index f9eab5fbd9cc..847c715eb25d 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/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/apache20/files/patch-support:apxs.in b/www/apache20/files/patch-support:apxs.in
index 9ababb75322e..4106153d5e90 100644
--- a/www/apache20/files/patch-support:apxs.in
+++ b/www/apache20/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");
+ }
+
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index f9eab5fbd9cc..847c715eb25d 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 9ababb75322e..4106153d5e90 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");
+ }
+
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index f9eab5fbd9cc..847c715eb25d 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/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/apache22/files/patch-support:apxs.in b/www/apache22/files/patch-support:apxs.in
index 9ababb75322e..4106153d5e90 100644
--- a/www/apache22/files/patch-support:apxs.in
+++ b/www/apache22/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");
+ }
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-06 11:30:02 +0000