Various fixes and FreeBSD modifications:

. remove the blubber about `submitter-id's from the man page, we don't
  use them,
. use REPLY_TO or REPLYTO in preference over LOGNAME as the value for
  the Reply-To address (closes PRs 1471 and its duplicates 1472 and 1823),
. don't abuse ~/.signature as ORGANIZATION, this is almost always
  useless blunder,
. actually list the Categories again, instead of xrefing to ``see
  above'' (closes PR 1835),
. check the Synopsis field for being not empty,
. make the mail Subject the same as Synopsis if left blank (closes
  PR 1209).

The remaining open send-pr related PRs (184 and its duplicate 1047,
and 1415) are pilot errors or local hardware problems.

2 files changed, 45 insertions, 27 deletions

diff --git a/gnu/usr.bin/send-pr/send-pr.1 b/gnu/usr.bin/send-pr/send-pr.1
index 76f369f..ba23134 100644
--- a/gnu/usr.bin/send-pr/send-pr.1
+++ b/gnu/usr.bin/send-pr/send-pr.1
@@ -79,30 +79,12 @@ according to its category and submitter-id.  \fBGNATS\fR automatically
 replies with an acknowledgement, citing the category and the PR
 number.
 .LP
-To ensure that a PR is handled promptly, it should contain your (unique)
-\fIsubmitter-id\fR and one of the available \fIcategories\fR to identify the
+To ensure that a PR is handled promptly, it should contain
+one of the available \fIcategories\fR to identify the
 problem area.  (Use
 .B `send-pr -L'
 to see a list of categories.)
 .LP
-The
-.B send-pr
-template at your site should already be customized with your
-submitter-id (running `\|\fBinstall-sid\fP \fIsubmitter-id\fP\|' to
-accomplish this is part of the installation procedures for
-.BR send-pr ).
-If this hasn't been done, see your system administrator for your
-submitter-id, or request one from your support site by invoking
-.B `send-pr \-\-request\-id'.
-If your site does not distinguish between different user sites, or if
-you are not affiliated with the support site, use
-.B `net'
-for this field.
-.B NOTE:
-If you are using send-pr to send problem reports to the FreeBSD Project,
-this version of send-pr already has a customer ID in it and you do not
-need to request a new one.
-.LP
 The more precise your problem description and the more complete your
 information, the faster your support team can solve your problems.
 .SH OPTIONS
diff --git a/gnu/usr.bin/send-pr/send-pr.sh b/gnu/usr.bin/send-pr/send-pr.sh
index 7aaa501..931dc5c 100644
--- a/gnu/usr.bin/send-pr/send-pr.sh
+++ b/gnu/usr.bin/send-pr/send-pr.sh
@@ -19,12 +19,15 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU GNATS; see the file COPYING.  If not, write to
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+# $Id$
 
 # The version of this send-pr.
 VERSION=3.2
 
 # The submitter-id for your site.
-SUBMITTER=unknown
+# "current-users" is the only allowable value for FreeBSD.
+SUBMITTER="current-users"
 
 # Where the GNATS directory lives, if at all.
 [ -z "$GNATS_ROOT" ] && 
@@ -81,7 +84,7 @@ if [ -z "$LOGNAME" -a -n "$USER" ]; then
 fi
 
 FROM="$LOGNAME"
-REPLY_TO="$LOGNAME"
+REPLY_TO="${REPLY_TO:-${REPLYTO:-$LOGNAME}}"
 
 # Find out the name of the originator of this PR.
 if [ -n "$NAME" ]; then
@@ -114,8 +117,6 @@ else
     ORGANIZATION="$DEFAULT_ORGANIZATION"
   elif [ -f $HOME/.organization ]; then
     ORGANIZATION="`cat $HOME/.organization`"
-  elif [ -f $HOME/.signature ]; then
-    ORGANIZATION="`cat $HOME/.signature`"
   fi
 fi
 
@@ -231,13 +232,18 @@ case "$FORMAT" in
         ;;
 esac
 
+CATEGORY_C=`echo "$CATEGORIES" | \
+	awk 'BEGIN	{ ORS=""; print "<[ " }
+	     FNR > 1	{ print " | " }
+	     		{ print }
+	     END	{ print " ]>" }`
+
 ORIGINATOR_C='<Name of the PR author (one line)>'
 ORGANIZATION_C='<Organization of PR author (multiple lines)>'
 CONFIDENTIAL_C='<[ yes | no ] (one line)>'
 SYNOPSIS_C='<Synopsis of the problem (one line)>'
 SEVERITY_C='<[ non-critical | serious | critical ] (one line)>'
 PRIORITY_C='<[ low | medium | high ] (one line)>'
-CATEGORY_C='<Problem category (as listed above)>'
 CLASS_C='<[ sw-bug | doc-bug | change-request | support ] (one line)>'
 RELEASE_C='<Release number or tag (one line)>'
 ENVIRONMENT_C='<Relevant environment information (multiple lines)>'
@@ -291,6 +297,10 @@ SEND-PR:
 SEND-PR: Please consult the send-pr man page `send-pr(1)' or the Texinfo
 SEND-PR: manual if you are not sure how to fill out a problem report.
 SEND-PR:
+SEND-PR: Note that the Synopsis field is mandatory.  The Subject (for
+SEND-PR: the mail) will be made the same as Synopsis unless explicitly
+SEND-PR: changed.
+SEND-PR:
 SEND-PR: Choose from the following categories:
 SEND-PR:
 __EOF__
@@ -446,7 +456,17 @@ while [ -z "$REQUEST_ID" ]; do
     *)  echo "$COMMAND: \`$CLASS' is not a valid value for \`Class'."
   esac
 
-  [ $CNT -lt 5 -a -z "$BATCH" ] && 
+  #
+  # 6) Check that Synopsis is not empty
+  #
+  if grep "^>Synopsis:[ 	]*${SYNOPSIS_C}\$" $TEMP > /dev/null
+  then
+    echo "$COMMAND: Synopsis must not be empty."
+  else
+    CNT=`expr $CNT + 1`
+  fi
+
+  [ $CNT -lt 6 -a -z "$BATCH" ] && 
     echo "Errors were found with the problem report."
 
   while true; do
@@ -454,7 +474,7 @@ while [ -z "$REQUEST_ID" ]; do
       $ECHON1 "a)bort, e)dit or s)end? $ECHON2"
       read input
     else
-      if [ $CNT -eq 5 ]; then
+      if [ $CNT -eq 6 ]; then
         input=s
       else
         input=a
@@ -480,6 +500,22 @@ while [ -z "$REQUEST_ID" ]; do
     esac
   done
 done
+
+#
+# Make sure the mail has got a Subject.  If not, use the same as
+# in Synopsis.
+#
+
+if grep '^Subject:[ 	]*$' $TEMP > /dev/null
+then
+  SYNOPSIS=`grep '^>Synopsis:' $TEMP | sed -e 's/^>Synopsis:[ 	]*//'`
+  ed -s $TEMP << __EOF__
+/^Subject:/s/:.*\$/: $SYNOPSIS/
+w
+q
+__EOF__
+fi
+
 #
 #	Remove comments and send the problem report
 #	(we have to use patterns, where the comment contains regex chars)