--- /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/perl/p5-mail-spamassassin/Portfile	2013-07-15 12:03:38.000000000 -0400
+++ /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/perl/p5-mail-spamassassin/Portfile.new	2014-08-18 11:48:35.000000000 -0400
@@ -3,8 +3,8 @@
 PortSystem          1.0
 PortGroup           perl5 1.0
 
-perl5.branches      5.8 5.10 5.12 5.14 5.16
-perl5.setup         Mail-SpamAssassin 3.3.2
+perl5.branches      5.8 5.10 5.12 5.14 5.16 5.18
+perl5.setup         Mail-SpamAssassin 3.4.0
 revision            1
 categories-append   mail
 license             Apache-2
@@ -19,8 +19,8 @@
 
 homepage            http://spamassassin.apache.org/
 
-checksums           rmd160  78e22ba6ba62a48fb7d24c40170124881b975fd9 \
-                    sha256  5323038939a0ef9fc97d5264defce3ae1d95e98b3a94c4c3b583341c927f32df
+checksums           rmd160  c3a9b4adaebfe62c279684349ce76ed36d304f26 \
+                    sha256  244914c30976844878a7f129fd503eb40986c68a3800f416c3a68b14507c0a64
 
 if {${perl5.major} != ""} {
 depends_lib-append  port:p${perl5.major}-digest-sha1 \
@@ -28,11 +28,10 @@
                     port:p${perl5.major}-mailtools \
                     port:p${perl5.major}-mail-audit \
                     port:p${perl5.major}-net-dns \
-                    port:p${perl5.major}-net-ident \
                     port:p${perl5.major}-archive-tar \
                     port:p${perl5.major}-io-zlib \
                     port:p${perl5.major}-io-compress \
-                    port:p${perl5.major}-ip-country \
+                    port:p${perl5.major}-geo-ip \
                     port:p${perl5.major}-time-hires \
                     port:p${perl5.major}-mail-dkim \
                     port:p${perl5.major}-mail-spf \
@@ -60,7 +59,7 @@
 destroot.target-append      conf__install data__install
 
 # All configuration files for spamassassin.
-set conf_files      {init.pre local.cf v310.pre v312.pre v320.pre v330.pre}
+set conf_files      {init.pre local.cf v310.pre v312.pre v320.pre v330.pre v340.pre}
 
 post-destroot {
     set etc ${destroot}${prefix}/etc/mail/spamassassin