--- a/components/sendmail/Makefile	Thu Sep 24 14:08:43 2015 -0700
+++ b/components/sendmail/Makefile	Thu Sep 24 15:41:57 2015 -0700
@@ -77,7 +77,8 @@
 
 # libmilter and sendmail must come before include, so appending to the default
 # value of LINT_FLAGS will not work; we must redefine it here.
-SM_DEFS=	-DSOLARIS=21200
+SM_DEFS=	-DSOLARIS=$(shell echo $(SOLARIS_VERSION) | \
+    $(GSED) -e 's/\.//' -e 's/$$/00/')
 SM_INCLUDES=	-I$(SM_BUILD_DIR)/libmilter -I$(SOURCE_DIR)/sendmail \
     -I$(SOURCE_DIR)/include -I$(SOURCE_DIR) -I.
 LINT_FLAGS =	-nsvx $(SM_DEFS) $(SM_INCLUDES)

--- a/components/sendmail/patches/site.SunOS.5.12.m4.patch	Thu Sep 24 14:08:43 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# This patch is Solaris specific and thus has not been contributed upstream.
-
---- /dev/null						2013-06-18 15:31:00.000000000 -0700
-+++ sendmail-8.14.9/devtools/Site/site.SunOS.5.12.m4	2013-03-26 07:18:05.675345928 -0700
-@@ -0,0 +1,21 @@
-+APPENDDEF(`conf_sendmail_ENVDEF', `-DSUN_EXTENSIONS')
-+APPENDDEF(`conf_sendmail_ENVDEF', `-DVENDOR_DEFAULT=VENDOR_SUN')
-+APPENDDEF(`conf_sendmail_ENVDEF', `-DSUN_INIT_DOMAIN')
-+APPENDDEF(`conf_sendmail_ENVDEF', `-DSUN_SIMPLIFIED_LDAP')
-+APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
-+APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
-+APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_LOCAL_DAEMON')
-+APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_MAIL_MACRO')
-+APPENDDEF(`conf_sendmail_ENVDEF', `-DIPV6_FULL=0')
-+APPENDDEF(`conf_sendmail_LIBS', `-lsldap')
-+APPENDDEF(`conf_sendmail_LIBS', `-lwrap')
-+APPENDDEF(`conf_sendmail_LIBS', `-lumem')
-+APPENDDEF(`conf_sendmail_LIBS', `-lssl')
-+APPENDDEF(`conf_sendmail_LIBS', `-lcrypto')
-+APPENDDEF(`confMAPDEF', `-DLDAPMAP')
-+define(`confDEPEND_TYPE', `Solaris')
-+define(`confINCDIRS', `-I/usr/include/openldap')
-+define(`confLIBS', `-lldap_r-2.4 -llber-2.4 -lc')
-+define(`confMKDIR', `/usr/bin/mkdir')
-+define(`confMTCFLAGS', `$(CC_PIC)')
-+define(`sendmailTARGET_LINKS', `')

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/sendmail/patches/site.config.m4.patch	Thu Sep 24 15:41:57 2015 -0700
@@ -0,0 +1,26 @@
+# This patch is Solaris specific and thus has not been contributed upstream.
+
+--- /dev/null						2013-06-18 15:31:00.000000000 -0700
++++ sendmail-8.14.9/devtools/Site/site.config.m4	2015-09-24 07:18:05.675345928 -0700
+@@ -0,0 +1,21 @@
++APPENDDEF(`conf_sendmail_ENVDEF', `-DSUN_EXTENSIONS')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DVENDOR_DEFAULT=VENDOR_SUN')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DSUN_INIT_DOMAIN')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DSUN_SIMPLIFIED_LDAP')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DSTARTTLS')
++APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_LOCAL_DAEMON')
++APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_MAIL_MACRO')
++APPENDDEF(`conf_sendmail_ENVDEF', `-DIPV6_FULL=0')
++APPENDDEF(`conf_sendmail_LIBS', `-lsldap')
++APPENDDEF(`conf_sendmail_LIBS', `-lwrap')
++APPENDDEF(`conf_sendmail_LIBS', `-lumem')
++APPENDDEF(`conf_sendmail_LIBS', `-lssl')
++APPENDDEF(`conf_sendmail_LIBS', `-lcrypto')
++APPENDDEF(`confMAPDEF', `-DLDAPMAP')
++APPENDDEF(`confLIBS', `-lldap_r-2.4 -llber-2.4 -lc')
++define(`confDEPEND_TYPE', `Solaris')
++define(`confINCDIRS', `-I/usr/include/openldap')
++define(`confMKDIR', `/usr/bin/mkdir')
++define(`confMTCFLAGS', `$(CC_PIC)')
++define(`sendmailTARGET_LINKS', `')