--- rpms/smeserver-fetchmail/contribs8/smeserver-fetchmail-1.4.non_standard_smtpd_TCPPort.patch	2015/01/12 17:00:26	1.1
+++ rpms/smeserver-fetchmail/contribs8/smeserver-fetchmail-1.4.non_standard_smtpd_TCPPort.patch	2015/02/06 08:53:36	1.2
@@ -1,12 +1,21 @@
 diff -Nur smeserver-fetchmail-1.4.old8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail smeserver-fetchmail-1.4.bz8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail
 --- smeserver-fetchmail-1.4.old8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail	2015-01-12 17:45:34.869937632 +0100
-+++ smeserver-fetchmail-1.4.bz8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail	2015-01-12 17:47:51.134384591 +0100
-@@ -339,7 +339,7 @@
++++ smeserver-fetchmail-1.4.bz8796/root/etc/e-smith/templates/etc/fetchmail/90fetchmail	2015-02-06 09:42:51.012772145 +0100
+@@ -333,13 +333,16 @@
+                         $mname =~ s/[\']/\\x27/g ;
+                         $mpass =~ s/[\']/\\x27/g ;
+ 
++                        #find the tcp port of smtpd
++                        my $tcpport = $db->get_prop('smtpd','TCPPort')||'25';
++                        
+             		    $OUT .= "#\n";
+                         $OUT .= "#   Mail N$FetchN Account for : $comment\n";
+                         $OUT .= $staticvalue;
                          $OUT .= "poll $mserv with proto $mtype$ServOpt\n" ;
                          $OUT .= "  user '$mname' $DestSMTPServer with password '" ;
                          $OUT .= "$mpass' is $name here $keep $ssl\n" ;
 -                        $OUT .= "  smtphost 127.0.0.200\n" ;
-+                        $OUT .= "  smtphost 127.0.0.200" . ($smtpd{TCPPort} ? "/$smtpd{TCPPort}" : "") . "\n";
++                        $OUT .= "  smtphost 127.0.0.200" . ($tcpport ? "/$tcpport" : "") . "\n";
                      	$OUT .="EOF\n";
              	    }
              	}