6 files changed, 18 insertions, 28 deletions

diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 945649a061ed..b5e042fffd8b 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	libetpan
-PORTVERSION=	0.31
+PORTVERSION=	0.32
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index 5dac199366f6..ae5e6f4efc41 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1 +1 @@
-MD5 (libetpan-0.31.tar.gz) = c55632d34f0a5d22ffc6b2e79a6581bc
+MD5 (libetpan-0.32.tar.gz) = 87104b7ff4cbb1e9f5ba256dde0a5f56
diff --git a/mail/libetpan/files/patch-Rules.in b/mail/libetpan/files/patch-Rules.in
new file mode 100644
index 000000000000..83ec2c449402
--- /dev/null
+++ b/mail/libetpan/files/patch-Rules.in
@@ -0,0 +1,13 @@
+--- Rules.in.orig	Tue Dec 16 07:11:13 2003
++++ Rules.in	Thu Dec 18 13:08:39 2003
+@@ -14,8 +14,8 @@
+ CC	    = @CC@
+ @SET_MAKE@
+ 
+-CFLAGS	    = @CFLAGS@ @CPPFLAGS@ @DEFS@ \
+-	-I$(top_builddir)/include -I$(top_builddir) -I. $(INCLUDES)
++CFLAGS	    = -I$(top_builddir)/include -I$(top_builddir) -I. $(INCLUDES) \
++	@CFLAGS@ @CPPFLAGS@ @DEFS@
+ 
+ LDFLAGS     = @LDFLAGS@
+ OBJECTS	    = $(SOURCES:.c=.lo)
diff --git a/mail/libetpan/files/patch-generic::maildriver_tools.c b/mail/libetpan/files/patch-generic::maildriver_tools.c
deleted file mode 100644
index edc55e991fa6..000000000000
--- a/mail/libetpan/files/patch-generic::maildriver_tools.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- generic/maildriver_tools.c.orig	Tue Dec  9 00:36:37 2003
-+++ generic/maildriver_tools.c	Thu Dec 11 00:01:00 2003
-@@ -40,6 +40,7 @@
- #include <string.h>
- #include <dirent.h>
- #include <unistd.h>
-+#include <limits.h>
- 
- #include "maildriver.h"
- #include "mailmessage.h"
diff --git a/mail/libetpan/files/patch-generic::mailstorage_tools.c b/mail/libetpan/files/patch-generic::mailstorage_tools.c
deleted file mode 100644
index 904f2142aba2..000000000000
--- a/mail/libetpan/files/patch-generic::mailstorage_tools.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- generic/mailstorage_tools.c.orig	Tue Dec  9 00:36:37 2003
-+++ generic/mailstorage_tools.c	Thu Dec 11 00:04:20 2003
-@@ -44,6 +44,7 @@
- #include <sys/wait.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
-+#include <limits.h>
- 
- #include "mailmessage.h"
- #include "maildriver.h"
diff --git a/mail/libetpan/pkg-plist b/mail/libetpan/pkg-plist
index ef9d9332e646..24bfb826228f 100644
--- a/mail/libetpan/pkg-plist
+++ b/mail/libetpan/pkg-plist
@@ -5,7 +5,6 @@ include/libetpan/chash.h
 include/libetpan/cinthash.h
 include/libetpan/clist.h
 include/libetpan/data_message_driver.h
-include/libetpan/generic_cache.h
 include/libetpan/generic_cache_types.h
 include/libetpan/imapdriver.h
 include/libetpan/imapdriver_cached.h
@@ -13,10 +12,10 @@ include/libetpan/imapdriver_cached_message.h
 include/libetpan/imapdriver_message.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/mail_cache_db_types.h
 include/libetpan/maildir.h
 include/libetpan/maildir_types.h
 include/libetpan/maildirdriver.h
@@ -27,7 +26,6 @@ include/libetpan/maildirdriver_types.h
 include/libetpan/maildirstorage.h
 include/libetpan/maildriver.h
 include/libetpan/maildriver_errors.h
-include/libetpan/maildriver_tools.h
 include/libetpan/maildriver_types.h
 include/libetpan/maildriver_types_helper.h
 include/libetpan/mailimap.h
@@ -43,7 +41,6 @@ include/libetpan/mailimf_write.h
 include/libetpan/mailmbox.h
 include/libetpan/mailmbox_types.h
 include/libetpan/mailmessage.h
-include/libetpan/mailmessage_tools.h
 include/libetpan/mailmessage_types.h
 include/libetpan/mailmh.h
 include/libetpan/mailmime.h
@@ -95,7 +92,6 @@ include/libetpan/nntpdriver.h
 include/libetpan/nntpdriver_cached.h
 include/libetpan/nntpdriver_cached_message.h
 include/libetpan/nntpdriver_message.h
-include/libetpan/nntpdriver_tools.h
 include/libetpan/nntpdriver_types.h
 include/libetpan/nntpstorage.h
 include/libetpan/pop3driver.h
@@ -104,7 +100,8 @@ include/libetpan/pop3driver_cached_message.h
 include/libetpan/pop3driver_message.h
 include/libetpan/pop3driver_types.h
 include/libetpan/pop3storage.h
+include/libetpan.h
 lib/libetpan.a
 lib/libetpan.so
-lib/libetpan.so.0
+lib/libetpan.so.1
 @dirrm include/libetpan