3 files changed, 71 insertions, 7 deletions

diff --git a/www/mod_frontpage/Makefile b/www/mod_frontpage/Makefile
index f106acd0a6a3..e5c2e374bacb 100644
--- a/www/mod_frontpage/Makefile
+++ b/www/mod_frontpage/Makefile
@@ -43,6 +43,7 @@ AP_LIBEXEC?=	${PREFIX}/libexec/apache
 .endif
 
 PERL_CONFIGURE= yes
+CONFIGURE_ENV=	PREFIX=${PREFIX}
 
 pre-fetch:
 	@${ECHO}
diff --git a/www/mod_frontpage/files/patch-Makefile.PL b/www/mod_frontpage/files/patch-Makefile.PL
index 4ebd456a5c26..6b2b0c75b4eb 100644
--- a/www/mod_frontpage/files/patch-Makefile.PL
+++ b/www/mod_frontpage/files/patch-Makefile.PL
@@ -1,10 +1,53 @@
---- Makefile.PL.orig	Sat May  4 14:25:20 2002
-+++ Makefile.PL	Sat May  4 14:25:23 2002
-@@ -10,6 +10,7 @@
+--- Makefile.PL.orig	Tue Mar 12 22:07:07 2002
++++ Makefile.PL	Thu May 16 11:01:05 2002
+@@ -9,14 +9,24 @@
+ # FP extensions 5.0 from Martin Blapp <mbr@freebsd.org>
  #
  
- $flavor=`uname`;
-+chop $flavor;
- if (-e "/etc/mandrake-release") {$flavor="Mandrake";}
+-$flavor=`uname`;
+-if (-e "/etc/mandrake-release") {$flavor="Mandrake";}
++$prefix= $ENV{PREFIX};
++if (!$prefix) {
++	$prefix = "/usr/local/";
++}
++
++$ostype=`uname`;
++chop $ostype;
++if (-e "/etc/mandrake-release") {
++    $flavor="Mandrake";
++}
+ 
+-if ($flavor eq "FreeBSD") { $thechoice="/usr/local/sbin/httpd"; 
+-} elsif ($flavor eq "Mandrake") { $thechoice="/usr/sbin/httpd"; 
++if ($ostype eq "FreeBSD" && -e "$prefix/sbin/httpd") {
++    $thechoice="$prefix/sbin/httpd"; 
++} elsif ($ostype eq "Linux" && -e "/usr/sbin/httpd") {
++    $thechoice="/usr/sbin/httpd"; 
+ } else {
+     print "Enter the path of your httpd binary.\n";
+-    print "It should be something like /usr/local/apache/bin).\n";
++    print "It should be something like $prefix/apache/bin).\n";
+     print "If you don't know, enter the word 'findit'. I will try to look\n";
+     print "for you... but it will take a few minutes.\n";
+     print "Your choice: ";
+@@ -121,8 +131,8 @@
+ # Check the user for sanity
+ # Should be 48 for Mandrake, 80 for BSD
+ 
+-if ($flavor eq "FreeBSD") { $defaultid=80;
+-} elsif ($flavor eq "Mandrake") { $defaultid=48;
++if ($ostype eq "FreeBSD") { $defaultid=80;
++} elsif ($ostype eq "Mandrake") { $defaultid=48;
+ } else { $defaultid=99; }
+ 
+ if ($uid < $defaultid) {
+@@ -162,7 +172,8 @@
+ $_=~ s|"\$\(fpstatic_bin\)|\\\\\"$sbindir\/fpstatic\\\\|;
+ $_=~ s|\$\(httpdconf\)|$httpdconf|;
+ $_=~ s|\$\(libexecdir\)|$libexecdir|;
+-if ($flavor eq "FreeBSD") { $_=~ s|root.root|root:wheel|;}
++$_=~ s|\$\(prefix\)|$prefix|;
++if ($ostype eq "FreeBSD") { $_=~ s|root.root|root:wheel|;}
+ print MAKF $_;
+ }
  
- if ($flavor eq "FreeBSD") { $thechoice="/usr/local/sbin/httpd"; 
diff --git a/www/mod_frontpage/files/patch-Makefile.in b/www/mod_frontpage/files/patch-Makefile.in
new file mode 100644
index 000000000000..e479264d0692
--- /dev/null
+++ b/www/mod_frontpage/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in	Tue Mar 12 22:07:06 2002
++++ Makefile.in	Thu May 16 11:00:58 2002
+@@ -16,14 +16,14 @@
+ DEF=	-DFPEXEC_BIN=\"$(fpexec_bin)\" \
+ 	-DFPSTATIC_BIN=\"$(fpstatic_bin)\"
+ 
+-DEF2=	-DFP_HTTPD_USER=\"$(fpexec_uidcaller)\" \
++DeEF2=	-DFP_HTTPD_USER=\"$(fpexec_uidcaller)\" \
+ 	-DFP_UID_MIN=$(fpexec_uidmin) \
+ 	-DFP_GID_MIN=$(fpexec_gidmin) \
+ 	-DFP_LOG_EXEC=\"$(fpexec_logexec)\" \
+ 	-DFP_USERDIR_SUFFIX=\"$(fpexec_userdir)\" \
+ 	-DFP_DOC_ROOT=\"$(fpexec_docroot)\" \
+-	-DFP_SAFE_PATH=\"/usr/local/bin:/usr/bin:/bin\" \
+-	-DFPDIR=\"/usr/local/frontpage/version5.0/exes\" \
++	-DFP_SAFE_PATH=\"$(prefix)/bin:/usr/bin:/bin\" \
++	-DFPDIR=\"$(prefix)/frontpage/version5.0/exes\" \
+ 	-DFP_USER=\"bin\" \
+ 	-DFP_GROUP=\"bin\" \
+ 	-DFP_HTACCESS=\".htaccess\" \