diff -urN /usr/ports/mail/imp3.orig/Makefile /usr/ports/mail/imp3/Makefile
--- /usr/ports/mail/imp3.orig/Makefile	Thu May 23 19:12:54 2002
+++ /usr/ports/mail/imp3/Makefile	Tue Jun 11 21:03:58 2002
@@ -7,10 +7,10 @@
 
 PORTNAME=	imp
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3
+MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. old
 
 MAINTAINER=	thierry@pompo.net
 
diff -urN /usr/ports/mail/imp3.orig/distinfo /usr/ports/mail/imp3/distinfo
--- /usr/ports/mail/imp3.orig/distinfo	Thu May 23 19:12:54 2002
+++ /usr/ports/mail/imp3/distinfo	Tue Jun 11 21:20:22 2002
@@ -1 +1 @@
-MD5 (imp-3.1-RC3.tar.gz) = cc068223e37dfd4b49f5f17b21639a5e
+MD5 (imp-3.1.tar.gz) = 73ff42a32e3ee3617fd411be356cb70f
diff -urN /usr/ports/mail/imp3.orig/pkg-plist /usr/ports/mail/imp3/pkg-plist
--- /usr/ports/mail/imp3.orig/pkg-plist	Thu May 23 19:12:54 2002
+++ /usr/ports/mail/imp3/pkg-plist	Tue Jun 11 21:26:23 2002
@@ -121,15 +121,17 @@
 %%IMPDIR%%/locale/fi_FI/help.xml
 %%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/fr_FR/help.xml
+%%IMPDIR%%/locale/hu_HU/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/it_IT/help.xml
 %%IMPDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ko_KR/help.xml
-%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/nl_NL/help.xml
 %%IMPDIR%%/locale/nb_NO/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/nb_NO/help.xml
+%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/nl_NL/help.xml
+%%IMPDIR%%/locale/nn_NO/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/pl_PL/help.xml
 %%IMPDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo
@@ -167,11 +169,13 @@
 %%IMPDIR%%/po/extract.pl
 %%IMPDIR%%/po/fi_FI.po
 %%IMPDIR%%/po/fr_FR.po
+%%IMPDIR%%/po/hu_HU.po
 %%IMPDIR%%/po/it_IT.po
 %%IMPDIR%%/po/ja_JP.po
 %%IMPDIR%%/po/ko_KR.po
-%%IMPDIR%%/po/nl_NL.po
 %%IMPDIR%%/po/nb_NO.po
+%%IMPDIR%%/po/nl_NL.po
+%%IMPDIR%%/po/nn_NO.po
 %%IMPDIR%%/po/pl_PL.po
 %%IMPDIR%%/po/pt_BR.po
 %%IMPDIR%%/po/pt_PT.po
@@ -281,16 +285,20 @@
 @dirrm %%IMPDIR%%/locale/fi_FI
 @dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/fr_FR
+@dirrm %%IMPDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/hu_HU
 @dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/it_IT
 @dirrm %%IMPDIR%%/locale/ja_JP/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/ja_JP
 @dirrm %%IMPDIR%%/locale/ko_KR/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/ko_KR
-@dirrm %%IMPDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/nl_NL
 @dirrm %%IMPDIR%%/locale/nb_NO/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/nb_NO
+@dirrm %%IMPDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/nl_NL
+@dirrm %%IMPDIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/nn_NO
 @dirrm %%IMPDIR%%/locale/pl_PL/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/pl_PL
 @dirrm %%IMPDIR%%/locale/pt_BR/LC_MESSAGES