3 files changed, 96 insertions, 92 deletions

diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 221b94574ae3..169078df43ac 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libetpan
-PORTVERSION=	0.58
-PORTREVISION=	2
+PORTVERSION=	1.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
@@ -23,6 +22,7 @@ USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool:22 autoconf:262
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index b49018fcc33d..b2d41df2b1b0 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1,3 +1,3 @@
-MD5 (libetpan-0.58.tar.gz) = bf20b5c0548f06b94bc588afdf5b3436
-SHA256 (libetpan-0.58.tar.gz) = 49cc237b1fdb2da9b03ff63f61920045c66bb830380d76f783a1868738f167bb
-SIZE (libetpan-0.58.tar.gz) = 1672554
+MD5 (libetpan-1.0.tar.gz) = 5addc766141a0b1d29ee1ca4ba1b6808
+SHA256 (libetpan-1.0.tar.gz) = cfe3ef67425bb5ad57c8c23a45eea1adffd3af2e7547932e8d384e3addfcd55e
+SIZE (libetpan-1.0.tar.gz) = 1669965
diff --git a/mail/libetpan/pkg-plist b/mail/libetpan/pkg-plist
index fc24c3a030e4..486f38b9144b 100644
--- a/mail/libetpan/pkg-plist
+++ b/mail/libetpan/pkg-plist
@@ -1,86 +1,106 @@
 bin/libetpan-config
-include/libetpan/mmapstring.h
-include/libetpan/mailstream.h
-include/libetpan/mailstream_helper.h
-include/libetpan/mail.h
-include/libetpan/mailstream_low.h
-include/libetpan/mailstream_socket.h
-include/libetpan/mailstream_ssl.h
-include/libetpan/mailstream_types.h
+include/libetpan.h
+include/libetpan/acl.h
+include/libetpan/acl_types.h
+include/libetpan/annotatemore.h
+include/libetpan/annotatemore_types.h
 include/libetpan/carray.h
-include/libetpan/clist.h
-include/libetpan/chash.h
 include/libetpan/charconv.h
-include/libetpan/mailsem.h
-include/libetpan/maillock.h
-include/libetpan/mailimap_helper.h
+include/libetpan/chash.h
+include/libetpan/clist.h
+include/libetpan/data_message_driver.h
+include/libetpan/dbdriver.h
+include/libetpan/dbdriver_message.h
+include/libetpan/dbdriver_types.h
+include/libetpan/dbstorage.h
+include/libetpan/feeddriver.h
+include/libetpan/feeddriver_message.h
+include/libetpan/feeddriver_types.h
+include/libetpan/feedstorage.h
+include/libetpan/generic_cache_types.h
+include/libetpan/hotmailstorage.h
+include/libetpan/idle.h
+include/libetpan/imapdriver.h
+include/libetpan/imapdriver_cached.h
+include/libetpan/imapdriver_cached_message.h
+include/libetpan/imapdriver_message.h
+include/libetpan/imapdriver_tools.h
+include/libetpan/imapdriver_tools_private.h
+include/libetpan/imapdriver_types.h
+include/libetpan/imapstorage.h
+include/libetpan/libetpan-config.h
+include/libetpan/libetpan.h
+include/libetpan/libetpan_version.h
+include/libetpan/mail.h
+include/libetpan/maildir.h
+include/libetpan/maildir_types.h
+include/libetpan/maildirdriver.h
+include/libetpan/maildirdriver_cached.h
+include/libetpan/maildirdriver_cached_message.h
+include/libetpan/maildirdriver_message.h
+include/libetpan/maildirdriver_types.h
+include/libetpan/maildirstorage.h
+include/libetpan/maildriver.h
+include/libetpan/maildriver_errors.h
+include/libetpan/maildriver_types.h
+include/libetpan/maildriver_types_helper.h
+include/libetpan/mailengine.h
+include/libetpan/mailfolder.h
 include/libetpan/mailimap.h
-include/libetpan/mailimap_types.h
-include/libetpan/mailimap_types_helper.h
-include/libetpan/mailimap_socket.h
-include/libetpan/mailimap_ssl.h
 include/libetpan/mailimap_extension.h
 include/libetpan/mailimap_extension_types.h
-include/libetpan/annotatemore.h
-include/libetpan/annotatemore_types.h
-include/libetpan/acl.h
-include/libetpan/acl_types.h
-include/libetpan/uidplus.h
-include/libetpan/uidplus_types.h
-include/libetpan/idle.h
+include/libetpan/mailimap_helper.h
+include/libetpan/mailimap_socket.h
+include/libetpan/mailimap_ssl.h
+include/libetpan/mailimap_types.h
+include/libetpan/mailimap_types_helper.h
 include/libetpan/mailimf.h
 include/libetpan/mailimf_types.h
-include/libetpan/mailimf_write_file.h
 include/libetpan/mailimf_types_helper.h
+include/libetpan/mailimf_write_file.h
 include/libetpan/mailimf_write_generic.h
 include/libetpan/mailimf_write_mem.h
-include/libetpan/maildir.h
-include/libetpan/maildir_types.h
+include/libetpan/maillock.h
 include/libetpan/mailmbox.h
 include/libetpan/mailmbox_types.h
+include/libetpan/mailmessage.h
+include/libetpan/mailmessage_types.h
 include/libetpan/mailmh.h
 include/libetpan/mailmime.h
-include/libetpan/mailmime_types.h
 include/libetpan/mailmime_content.h
 include/libetpan/mailmime_decode.h
 include/libetpan/mailmime_disposition.h
-include/libetpan/mailmime_write_file.h
+include/libetpan/mailmime_types.h
 include/libetpan/mailmime_types_helper.h
+include/libetpan/mailmime_write_file.h
 include/libetpan/mailmime_write_generic.h
 include/libetpan/mailmime_write_mem.h
-include/libetpan/newsnntp.h
-include/libetpan/newsnntp_socket.h
-include/libetpan/newsnntp_ssl.h
-include/libetpan/newsnntp_types.h
 include/libetpan/mailpop3.h
-include/libetpan/mailpop3_socket.h
 include/libetpan/mailpop3_helper.h
+include/libetpan/mailpop3_socket.h
 include/libetpan/mailpop3_ssl.h
 include/libetpan/mailpop3_types.h
+include/libetpan/mailprivacy.h
+include/libetpan/mailprivacy_gnupg.h
+include/libetpan/mailprivacy_smime.h
+include/libetpan/mailprivacy_tools.h
+include/libetpan/mailprivacy_types.h
+include/libetpan/mailsem.h
 include/libetpan/mailsmtp.h
 include/libetpan/mailsmtp_helper.h
 include/libetpan/mailsmtp_socket.h
 include/libetpan/mailsmtp_ssl.h
 include/libetpan/mailsmtp_types.h
-include/libetpan/newsfeed_types.h
-include/libetpan/newsfeed.h
-include/libetpan/newsfeed_item.h
-include/libetpan/newsfeed_item_enclosure.h
-include/libetpan/data_message_driver.h
-include/libetpan/imapdriver.h
-include/libetpan/imapdriver_message.h
-include/libetpan/imapdriver_cached.h
-include/libetpan/imapdriver_cached_message.h
-include/libetpan/imapdriver_types.h
-include/libetpan/imapstorage.h
-include/libetpan/imapdriver_tools.h
-include/libetpan/imapdriver_tools_private.h
-include/libetpan/maildirdriver.h
-include/libetpan/maildirdriver_cached.h
-include/libetpan/maildirdriver_cached_message.h
-include/libetpan/maildirdriver_message.h
-include/libetpan/maildirdriver_types.h
-include/libetpan/maildirstorage.h
+include/libetpan/mailstorage.h
+include/libetpan/mailstorage_types.h
+include/libetpan/mailstream.h
+include/libetpan/mailstream_helper.h
+include/libetpan/mailstream_low.h
+include/libetpan/mailstream_socket.h
+include/libetpan/mailstream_ssl.h
+include/libetpan/mailstream_types.h
+include/libetpan/mailthread.h
+include/libetpan/mailthread_types.h
 include/libetpan/mboxdriver.h
 include/libetpan/mboxdriver_cached.h
 include/libetpan/mboxdriver_cached_message.h
@@ -94,6 +114,15 @@ include/libetpan/mhdriver_message.h
 include/libetpan/mhdriver_types.h
 include/libetpan/mhstorage.h
 include/libetpan/mime_message_driver.h
+include/libetpan/mmapstring.h
+include/libetpan/newsfeed.h
+include/libetpan/newsfeed_item.h
+include/libetpan/newsfeed_item_enclosure.h
+include/libetpan/newsfeed_types.h
+include/libetpan/newsnntp.h
+include/libetpan/newsnntp_socket.h
+include/libetpan/newsnntp_ssl.h
+include/libetpan/newsnntp_types.h
 include/libetpan/nntpdriver.h
 include/libetpan/nntpdriver_cached.h
 include/libetpan/nntpdriver_cached_message.h
@@ -106,39 +135,14 @@ include/libetpan/pop3driver_cached_message.h
 include/libetpan/pop3driver_message.h
 include/libetpan/pop3driver_types.h
 include/libetpan/pop3storage.h
-include/libetpan/hotmailstorage.h
-include/libetpan/dbdriver.h
-include/libetpan/dbdriver_message.h
-include/libetpan/dbdriver_types.h
-include/libetpan/dbstorage.h
-include/libetpan/feeddriver.h
-include/libetpan/feeddriver_message.h
-include/libetpan/feeddriver_types.h
-include/libetpan/feedstorage.h
-include/libetpan/maildriver.h
-include/libetpan/maildriver_types.h
-include/libetpan/maildriver_types_helper.h
-include/libetpan/maildriver_errors.h
-include/libetpan/mailmessage.h
-include/libetpan/mailmessage_types.h
-include/libetpan/mailstorage.h
-include/libetpan/mailstorage_types.h
-include/libetpan/mailfolder.h
-include/libetpan/generic_cache_types.h
-include/libetpan/mailthread.h
-include/libetpan/mailthread_types.h
-include/libetpan/libetpan.h
-include/libetpan/libetpan_version.h
-include/libetpan/mailengine.h
-include/libetpan/mailprivacy.h
-include/libetpan/mailprivacy_gnupg.h
-include/libetpan/mailprivacy_smime.h
-include/libetpan/mailprivacy_types.h
-include/libetpan/mailprivacy_tools.h
-include/libetpan/libetpan-config.h
-include/libetpan.h
-lib/libetpan.so
-lib/libetpan.so.14
-lib/libetpan.la
+include/libetpan/quota.h
+include/libetpan/quota_parser.h
+include/libetpan/quota_sender.h
+include/libetpan/quota_types.h
+include/libetpan/uidplus.h
+include/libetpan/uidplus_types.h
 lib/libetpan.a
+lib/libetpan.la
+lib/libetpan.so
+lib/libetpan.so.15
 @dirrm include/libetpan