Remove trailing slashes from prefix if there are any, fix a typo

3 files changed, 59 insertions, 14 deletions

diff --git a/www/mod_frontpage/files/patch-Makefile.PL b/www/mod_frontpage/files/patch-Makefile.PL
index 6b2b0c75b4eb..3d45591deedb 100644
--- a/www/mod_frontpage/files/patch-Makefile.PL
+++ b/www/mod_frontpage/files/patch-Makefile.PL
@@ -1,6 +1,6 @@
 --- Makefile.PL.orig	Tue Mar 12 22:07:07 2002
-+++ Makefile.PL	Thu May 16 11:01:05 2002
-@@ -9,14 +9,24 @@
++++ Makefile.PL	Thu May 16 11:52:08 2002
+@@ -9,14 +9,28 @@
  # FP extensions 5.0 from Martin Blapp <mbr@freebsd.org>
  #
  
@@ -9,6 +9,10 @@
 +$prefix= $ENV{PREFIX};
 +if (!$prefix) {
 +	$prefix = "/usr/local/";
++} else {
++	if ($prefix =~ /^(.*?)[\/]{1,}$/) {
++		$prefix = $1;
++	}
 +}
 +
 +$ostype=`uname`;
@@ -30,7 +34,7 @@
      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 @@
+@@ -121,8 +135,8 @@
  # Check the user for sanity
  # Should be 48 for Mandrake, 80 for BSD
  
@@ -41,7 +45,7 @@
  } else { $defaultid=99; }
  
  if ($uid < $defaultid) {
-@@ -162,7 +172,8 @@
+@@ -162,7 +176,8 @@
  $_=~ s|"\$\(fpstatic_bin\)|\\\\\"$sbindir\/fpstatic\\\\|;
  $_=~ s|\$\(httpdconf\)|$httpdconf|;
  $_=~ s|\$\(libexecdir\)|$libexecdir|;
diff --git a/www/mod_frontpage/files/patch-Makefile.in b/www/mod_frontpage/files/patch-Makefile.in
index e479264d0692..c2ba2b40feeb 100644
--- a/www/mod_frontpage/files/patch-Makefile.in
+++ b/www/mod_frontpage/files/patch-Makefile.in
@@ -1,13 +1,6 @@
---- 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) \
+--- Makefile.in.orig	Tue Mar 12 22:07:06 2002
++++ Makefile.in	Thu May 16 11:27:06 2002
+@@ -22,8 +22,9 @@
  	-DFP_LOG_EXEC=\"$(fpexec_logexec)\" \
  	-DFP_USERDIR_SUFFIX=\"$(fpexec_userdir)\" \
  	-DFP_DOC_ROOT=\"$(fpexec_docroot)\" \
@@ -15,6 +8,7 @@
 -	-DFPDIR=\"/usr/local/frontpage/version5.0/exes\" \
 +	-DFP_SAFE_PATH=\"$(prefix)/bin:/usr/bin:/bin\" \
 +	-DFPDIR=\"$(prefix)/frontpage/version5.0/exes\" \
++	-DPREFIX=\"$(prefix)\" \
  	-DFP_USER=\"bin\" \
  	-DFP_GROUP=\"bin\" \
  	-DFP_HTACCESS=\".htaccess\" \
diff --git a/www/mod_frontpage/files/patch-fpexec.h b/www/mod_frontpage/files/patch-fpexec.h
new file mode 100644
index 000000000000..cbb7153176c5
--- /dev/null
+++ b/www/mod_frontpage/files/patch-fpexec.h
@@ -0,0 +1,47 @@
+--- fpexec.h.orig	Tue Mar 12 22:07:06 2002
++++ fpexec.h	Thu May 16 11:25:40 2002
+@@ -94,7 +94,7 @@
+  *                debugging purposes.
+  */
+ #ifndef FP_LOG_EXEC
+-#define FP_LOG_EXEC "/usr/local/apache/logs/cgi.log"	/* Need me? */
++#define FP_LOG_EXEC PREFIX "/apache/logs/cgi.log"	/* Need me? */
+ #endif
+ 
+ /*
+@@ -102,7 +102,7 @@
+  *
+  */
+ #ifndef FP_SAFE_PATH
+-#define FP_SAFE_PATH "/usr/local/bin:/usr/bin:/bin"
++#define FP_SAFE_PATH PREFIX "/bin:/usr/bin:/bin"
+ #endif
+ 
+ /*
+@@ -111,7 +111,7 @@
+  *
+  */
+ #ifndef FPDIR
+-#define FPDIR "/usr/local/frontpage/version5.0/exes"
++#define FPDIR PREFIX "/frontpage/version5.0/exes"
+ #endif
+ 
+ /*
+@@ -120,7 +120,7 @@
+  *
+  */
+ #ifndef FPBASE
+-#define FPBASE "/usr/local/frontpage/version5.0"
++#define FPBASE PREFIX "/frontpage/version5.0"
+ #endif
+ 
+ 
+@@ -165,7 +165,7 @@
+  *               that can be used for fpEXEC behavior.
+  */
+ #ifndef FP_DOC_ROOT
+-#define FP_DOC_ROOT "/usr/local/apache/htdocs"
++#define FP_DOC_ROOT PREFIX "/apache/htdocs"
+ #endif
+ 
+ /*