update majorcool to 1.3.2

make port prefix clean
use perl from /usr/bin not /usr/local/bin
patch interactive configure script to show sane default paths for
	- apache paths
	- apache documents, etc.
updated PLIST
cosmetics in DESCR

6 files changed, 107 insertions, 61 deletions

diff --git a/mail/majorcool/Makefile b/mail/majorcool/Makefile
index e2cd38f50748..ec6da90e22f5 100644
--- a/mail/majorcool/Makefile
+++ b/mail/majorcool/Makefile
@@ -6,10 +6,9 @@
 # $FreeBSD$
 #
 
-DISTNAME=	majorcool-1.30
-PKGNAME=	majorcool-1.3.0
+DISTNAME=	majorcool-1.3.2
 CATEGORIES=	mail
-MASTER_SITES=	http://ncrinfo.ncr.com/pub/contrib/unix/MajorCool/
+MASTER_SITES=	http://www.FreeBSD.org/~andreas/download/
 
 MAINTAINER=	andreas@FreeBSD.org
 
diff --git a/mail/majorcool/distinfo b/mail/majorcool/distinfo
index c41db07d7a2c..db249cf8e969 100644
--- a/mail/majorcool/distinfo
+++ b/mail/majorcool/distinfo
@@ -1 +1 @@
-MD5 (majorcool-1.30.tar.gz) = d951f2d051b7e3cbf4769883792ee8c9
+MD5 (majorcool-1.3.2.tar.gz) = 46678d0db7779f8ce35e5f63944c3e8d
diff --git a/mail/majorcool/files/patch-aa b/mail/majorcool/files/patch-aa
index a3b8224adfed..d81d4e592809 100644
--- a/mail/majorcool/files/patch-aa
+++ b/mail/majorcool/files/patch-aa
@@ -1,22 +1,23 @@
---- Configure.orig	Thu Dec 25 11:47:24 1997
-+++ Configure	Thu Feb 19 23:02:55 1998
+--- Configure.orig	Wed Jun 10 02:44:18 1998
++++ Configure	Sun Sep 19 12:44:16 1999
 @@ -44,16 +44,16 @@
  #  be overwritten by any of the parameters saved in $config.
  #  For yes/no values, 0=no, 1=yes
  
 -DOMO_DIR=			# Majordomo home directory
-+DOMO_DIR=/usr/local/majordomo	# Majordomo home directory
++DOMO_DIR=!!PREFIX!!/majordomo	# Majordomo home directory
  DOMO_CONF=			# Majordomo configuration file
  DOMO_VERSION=			# Majordomo version number
  WEB_SCHEME="http"		# Web server scheme/protocol
 -WEB_ROOT=			# Web server root directory
-+WEB_ROOT=/usr/local/www		# Web server root directory
++WEB_ROOT=!!PREFIX!!/share/apache	# Web server root directory
  WEB_CGIDIR=			# Web server CGI directory
  WEB_CGIURL="/cgi-bin"		# Web server CGI URL
  WEB_IMGDIR=			# Web server images directory
- WEB_IMGURL="/images"		# Web server images URL
+-WEB_IMGURL="/images"		# Web server images URL
 -WEB_DOCROOT=			# Root for served documents
-+WEB_DOCROOT=/usr/local/www/data	# Root for served documents
++WEB_IMGURL="/icons"		# Web server images URL
++WEB_DOCROOT=!!PREFIX!!/share/apache/htdocs	# Root for served documents
  WEB_HEADER=			# Header for common site look
  WEB_FOOTER=			# Footer for common site look
  COOL_CF=			# Config file for this installation
@@ -28,4 +29,13 @@
 +COOL_HELPFILE=/majorcool.html	# MajorCool HTML info file location
  COOL_SITEADDR="simple"		# The address lookup function to use
  COOL_CREATECMD=			# Program to call on CREATE request
- COOL_DELETECMD=			# Program to call on DELETE request
+ COOL_RENAMECMD=			# Program to call on RENAME request
+@@ -86,7 +86,7 @@
+ OPT_PREFSRETURN=0		# Return to prior screen from Prefs session?
+ OPT_ROBOTS=1			# Allow Internet spiders to index the CGI?
+ OPT_SCANSTEPS=50		# Update interval suring list scan.
+-PERLBIN="/usr/local/bin/perl"	# How to start a perl script
++PERLBIN="/usr/bin/perl"		# How to start a perl script
+ 
+ #----------------------------------------------------------------------------
+ 
diff --git a/mail/majorcool/pkg-comment b/mail/majorcool/pkg-comment
index a6201a43e1b4..58ee04a827b2 100644
--- a/mail/majorcool/pkg-comment
+++ b/mail/majorcool/pkg-comment
@@ -1 +1 @@
-A Web Interface To Majordomo
+A Web Interface to Majordomo
diff --git a/mail/majorcool/pkg-plist b/mail/majorcool/pkg-plist
index 2af17fe7dd25..cbef6180b033 100644
--- a/mail/majorcool/pkg-plist
+++ b/mail/majorcool/pkg-plist
@@ -1,51 +1,79 @@
 majordomo/majorcool.pl
 majordomo/majorcool_default.cf
-www/cgi-bin/majordomo
-www/data/majorcool.html
-www/icons/mc_action_button.gif
-www/icons/mc_apply_button.gif
-www/icons/mc_browse_active.gif
-www/icons/mc_browse_banner.gif
-www/icons/mc_browse_button.gif
-www/icons/mc_browse_hot.gif
-www/icons/mc_cool_banner.gif
-www/icons/mc_cool_button.gif
-www/icons/mc_cool_hot.gif
-www/icons/mc_create_active.gif
-www/icons/mc_create_banner.gif
-www/icons/mc_create_button.gif
-www/icons/mc_create_hot.gif
-www/icons/mc_delete_active.gif
-www/icons/mc_delete_banner.gif
-www/icons/mc_lock.gif
-www/icons/mc_delete_button.gif
-www/icons/mc_delete_hot.gif
-www/icons/mc_help_active.gif
-www/icons/mc_help_banner.gif
-www/icons/mc_help_button.gif
-www/icons/mc_help_hot.gif
-www/icons/mc_home_button.gif
-www/icons/mc_home_hot.gif
-www/icons/mc_mail_button.gif
-www/icons/mc_mail_hot.gif
-www/icons/mc_modify_active.gif
-www/icons/mc_modify_banner.gif
-www/icons/mc_modify_button.gif
-www/icons/mc_modify_hot.gif
-www/icons/mc_not.gif
-www/icons/mc_prefs_active.gif
-www/icons/mc_prefs_banner.gif
-www/icons/mc_prefs_button.gif
-www/icons/mc_prefs_hot.gif
-www/icons/mc_scrncap_approval.gif
-www/icons/mc_scrncap_backdoor.gif
-www/icons/mc_scrncap_browse.gif
-www/icons/mc_scrncap_confkey.gif
-www/icons/mc_scrncap_keywords.gif
-www/icons/mc_scrncap_menu.gif
-www/icons/mc_scrncap_modify.gif
-www/icons/mc_scrncap_prefs.gif
-www/icons/mc_scrncap_sub.gif
-www/icons/mc_scrncap_toggle.gif
-www/icons/mc_send_button.gif
-www/icons/mc_wait.gif
+share/apache/cgi-bin/majordomo
+share/apache/htdocs/majorcool.html
+share/apache/icons/mc_action_button.gif
+share/apache/icons/mc_apply_button.gif
+share/apache/icons/mc_browse_active.gif
+share/apache/icons/mc_browse_banner.gif
+share/apache/icons/mc_browse_button.gif
+share/apache/icons/mc_browse_hot.gif
+share/apache/icons/mc_cool_banner.gif
+share/apache/icons/mc_cool_button.gif
+share/apache/icons/mc_cool_hot.gif
+share/apache/icons/mc_create_active.gif
+share/apache/icons/mc_create_banner.gif
+share/apache/icons/mc_create_button.gif
+share/apache/icons/mc_create_hot.gif
+share/apache/icons/mc_delete_active.gif
+share/apache/icons/mc_delete_banner.gif
+share/apache/icons/mc_delete_button.gif
+share/apache/icons/mc_delete_hot.gif
+share/apache/icons/mc_help_active.gif
+share/apache/icons/mc_help_banner.gif
+share/apache/icons/mc_help_button.gif
+share/apache/icons/mc_help_hot.gif
+share/apache/icons/mc_home_button.gif
+share/apache/icons/mc_home_hot.gif
+share/apache/icons/mc_lock.gif
+share/apache/icons/mc_mail_button.gif
+share/apache/icons/mc_mail_hot.gif
+share/apache/icons/mc_modify_active.gif
+share/apache/icons/mc_modify_banner.gif
+share/apache/icons/mc_modify_button.gif
+share/apache/icons/mc_modify_hot.gif
+share/apache/icons/mc_not.gif
+share/apache/icons/mc_prefs_active.gif
+share/apache/icons/mc_prefs_banner.gif
+share/apache/icons/mc_prefs_button.gif
+share/apache/icons/mc_prefs_hot.gif
+share/apache/icons/mc_rename_active.gif
+share/apache/icons/mc_rename_banner.gif
+share/apache/icons/mc_rename_button.gif
+share/apache/icons/mc_rename_hot.gif
+share/apache/icons/mc_scrncap_approval.gif
+share/apache/icons/mc_scrncap_backdoor.gif
+share/apache/icons/mc_scrncap_browse.gif
+share/apache/icons/mc_scrncap_confkey.gif
+share/apache/icons/mc_scrncap_full_browse1.gif
+share/apache/icons/mc_scrncap_full_browse2.gif
+share/apache/icons/mc_scrncap_full_browse3.gif
+share/apache/icons/mc_scrncap_full_create1.gif
+share/apache/icons/mc_scrncap_full_delete1.gif
+share/apache/icons/mc_scrncap_full_modify1.gif
+share/apache/icons/mc_scrncap_full_modify2.gif
+share/apache/icons/mc_scrncap_full_modify3.gif
+share/apache/icons/mc_scrncap_full_modify4.gif
+share/apache/icons/mc_scrncap_full_modify5.gif
+share/apache/icons/mc_scrncap_full_prefs1.gif
+share/apache/icons/mc_scrncap_full_rename1.gif
+share/apache/icons/mc_scrncap_keywords.gif
+share/apache/icons/mc_scrncap_menu.gif
+share/apache/icons/mc_scrncap_mini_browse1.gif
+share/apache/icons/mc_scrncap_mini_browse2.gif
+share/apache/icons/mc_scrncap_mini_browse3.gif
+share/apache/icons/mc_scrncap_mini_create1.gif
+share/apache/icons/mc_scrncap_mini_delete1.gif
+share/apache/icons/mc_scrncap_mini_modify1.gif
+share/apache/icons/mc_scrncap_mini_modify2.gif
+share/apache/icons/mc_scrncap_mini_modify3.gif
+share/apache/icons/mc_scrncap_mini_modify4.gif
+share/apache/icons/mc_scrncap_mini_modify5.gif
+share/apache/icons/mc_scrncap_mini_prefs1.gif
+share/apache/icons/mc_scrncap_mini_rename1.gif
+share/apache/icons/mc_scrncap_modify.gif
+share/apache/icons/mc_scrncap_prefs.gif
+share/apache/icons/mc_scrncap_sub.gif
+share/apache/icons/mc_scrncap_toggle.gif
+share/apache/icons/mc_send_button.gif
+share/apache/icons/mc_wait.gif
diff --git a/mail/majorcool/scripts/pre-configure b/mail/majorcool/scripts/pre-configure
new file mode 100644
index 000000000000..3f1fd7b9f9d5
--- /dev/null
+++ b/mail/majorcool/scripts/pre-configure
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+# $FreeBSD$
+
+#
+# make majorcool port "PREFIX clean"
+#
+
+perl -pi -e "s|!!PREFIX!!|$PREFIX|" ${WRKSRC}/Configure