Reorganize a bit to behave more like other mailer m4 macros

diff --git a/clients/mail500/mail500.m4 b/clients/mail500/mail500.m4
index 1cf58b55063e764106165c276fbd26c69baf3c7e..1301939aff99dd2665883f34767918c4bd5c364d 100644 (file)
--- a/clients/mail500/mail500.m4
+++ b/clients/mail500/mail500.m4
@@ -1,17 +1,20 @@
 PUSHDIVERT(-1)
-#
-# mail500 mailer
-#
-# This file should be placed in the sendmail's cf/mailer directory.
-# To include this mailer in your .cf file, use the directive:
-#      MAILER(mail500)
-#
-
-#CQ foo.com
-
-POPDIVERT
+## Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms are permitted only
+## as authorized by the OpenLDAP Public License.  A copy of this
+## license is available at http://www.OpenLDAP.org/license.html or
+## in file LICENSE in the top-level directory of the distribution.
 
 dnl
+dnl mail500 mailer
+dnl
+dnl This file should be placed in the sendmail's cf/mailer directory.
+dnl To include this mailer in your .cf file, use the directive:
+dnl    MAILER(mail500)
+dnl
+
 ifdef(`MAIL500_HOST',
        `define(`MAIL500_HOST_FLAG', CONCAT(` -l ', CONCAT(MAIL500_HOST,` ')))',
        `define(`MAIL500_HOST_FLAG', `')')
@@ -26,18 +29,24 @@ ifdef(`MAIL500_MAILER_FLAGS',,
 ifdef(`MAIL500_MAILER_ARGS',,
        `define(`MAIL500_MAILER_ARGS',
                CONCAT(`mail500',CONCAT(` -C ',MAIL500_CONFIG_PATH,MAIL500_HOST_FLAG,`-f $f -m $n@$w $u')))')
-dnl
-MAILER_DEFINITIONS
 
-VERSIONID(`OpenLDAP mail500 990630')
+POPDIVERT
+
+MAILER_DEFINITIONS
 
 ######################*****##############
 ###   MAIL500 Mailer specification   ###
 ##################*****##################
 
+VERSIONID(`$OpenLDAP$')
+
 Mmail500,      P=MAIL500_MAILER_PATH, F=CONCAT(`DFM', MAIL500_MAILER_FLAGS), S=11/31, R=20/40, T=DNS/RFC822/X-Unix,
                ifdef(`MAIL500_MAILER_MAX', `M=500_MAILER_MAX, ')A=MAIL500_MAILER_ARGS
 
+LOCAL_CONFIG
+# Mail500 Domains
+#CQ foo.com
+
 PUSHDIVERT(3)
 # mail500 additions
 R$* < @ $=Q > $*       $#mail500 $@ $2 $: <$1@$2>              domain handled by mail500