From 6f45b031e63ed958a769cafd8088bbc1c855dcd7 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 27 Oct 2008 22:03:40 +0000 Subject: [PATCH] - update to libvmime-0.9.0 somehow I missed this new version, reminded by landry@ --- devel/libvmime/Makefile | 7 +++-- devel/libvmime/distinfo | 10 +++---- devel/libvmime/patches/patch-configure | 14 +++++----- .../patches/patch-src_net_tls_TLSSession_cpp | 11 -------- .../libvmime/patches/patch-vmime_Makefile_in | 19 ++++---------- devel/libvmime/pkg/PLIST | 26 ++++++++++++------- 6 files changed, 36 insertions(+), 51 deletions(-) delete mode 100644 devel/libvmime/patches/patch-src_net_tls_TLSSession_cpp diff --git a/devel/libvmime/Makefile b/devel/libvmime/Makefile index 533b3002f46..286ae93ca1b 100644 --- a/devel/libvmime/Makefile +++ b/devel/libvmime/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2008/10/27 20:59:33 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2008/10/27 22:03:40 ajacoutot Exp $ COMMENT= C++ class library for working with Internet mail -DISTNAME= libvmime-0.8.1 -PKGNAME= ${DISTNAME}p0 +DISTNAME= libvmime-0.9.0 CATEGORIES= devel mail -SHARED_LIBS+= vmime 0.0 # .0.0 +SHARED_LIBS+= vmime 1.0 # .0.0 EXTRACT_SUFX= .tar.bz2 diff --git a/devel/libvmime/distinfo b/devel/libvmime/distinfo index e24f553fd7f..c88d87b348a 100644 --- a/devel/libvmime/distinfo +++ b/devel/libvmime/distinfo @@ -1,5 +1,5 @@ -MD5 (libvmime-0.8.1.tar.bz2) = bxP4Xi5U0KgZ5hRUq4S8lA== -RMD160 (libvmime-0.8.1.tar.bz2) = dM+SLsW4UbQlPLPlUKVnlXYdRfQ= -SHA1 (libvmime-0.8.1.tar.bz2) = 4qWktoZ1l4jX+c4rbjakvIK/0f4= -SHA256 (libvmime-0.8.1.tar.bz2) = iEIt3VLu1MwEO5tTgL3g516sLuKGB4Qg3UuXwgiLI/w= -SIZE (libvmime-0.8.1.tar.bz2) = 478197 +MD5 (libvmime-0.9.0.tar.bz2) = I/65z/e6OWHAaTkm4hRIzw== +RMD160 (libvmime-0.9.0.tar.bz2) = IgxR84WH1QOp6v9YvFTSCvmGsC8= +SHA1 (libvmime-0.9.0.tar.bz2) = AiFeHY6nWPSGwy57/2OgT3GptzY= +SHA256 (libvmime-0.9.0.tar.bz2) = lBqkBueih+eYGsSfVmVmPS1f7tDdVaVFmjEb+Aa2Q2M= +SIZE (libvmime-0.9.0.tar.bz2) = 501168 diff --git a/devel/libvmime/patches/patch-configure b/devel/libvmime/patches/patch-configure index a30d297e3b2..e90e87bf04b 100644 --- a/devel/libvmime/patches/patch-configure +++ b/devel/libvmime/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2008/10/09 15:16:03 ajacoutot Exp $ ---- configure.orig Thu Oct 9 15:49:50 2008 -+++ configure Thu Oct 9 15:51:04 2008 -@@ -3455,13 +3455,13 @@ if test "$ac_test_CFLAGS" = set; then +$OpenBSD: patch-configure,v 1.2 2008/10/27 22:03:40 ajacoutot Exp $ +--- configure.orig Sun Oct 19 14:36:19 2008 ++++ configure Mon Oct 27 22:55:58 2008 +@@ -3486,13 +3486,13 @@ if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2008/10/09 15:16:03 ajacoutot Exp $ else CFLAGS= fi -@@ -4108,13 +4108,13 @@ if test "$ac_test_CXXFLAGS" = set; then +@@ -4135,13 +4135,13 @@ if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then @@ -33,7 +33,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2008/10/09 15:16:03 ajacoutot Exp $ else CXXFLAGS= fi -@@ -7107,13 +7107,13 @@ if test "$ac_test_FFLAGS" = set; then +@@ -7156,13 +7156,13 @@ if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then if test "x$ac_cv_f77_compiler_gnu" = xyes; then @@ -49,7 +49,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2008/10/09 15:16:03 ajacoutot Exp $ else FFLAGS= fi -@@ -24916,7 +24916,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ +@@ -32278,7 +32278,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ else # -O2 OLD_CXXFLAGS="$CXXFLAGS" diff --git a/devel/libvmime/patches/patch-src_net_tls_TLSSession_cpp b/devel/libvmime/patches/patch-src_net_tls_TLSSession_cpp deleted file mode 100644 index 5289d0b0117..00000000000 --- a/devel/libvmime/patches/patch-src_net_tls_TLSSession_cpp +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_net_tls_TLSSession_cpp,v 1.1 2008/10/27 20:59:33 ajacoutot Exp $ ---- src/net/tls/TLSSession.cpp.orig Mon Oct 27 21:53:38 2008 -+++ src/net/tls/TLSSession.cpp Mon Oct 27 21:53:53 2008 -@@ -300,7 +300,6 @@ void TLSSession::throwTLSException(const string& fname - ERROR(GNUTLS_E_ASN1_TYPE_ANY_ERROR) - ERROR(GNUTLS_E_ASN1_SYNTAX_ERROR) - ERROR(GNUTLS_E_ASN1_DER_OVERFLOW) -- ERROR(GNUTLS_E_OPENPGP_TRUSTDB_VERSION_UNSUPPORTED) - ERROR(GNUTLS_E_OPENPGP_UID_REVOKED) - ERROR(GNUTLS_E_CERTIFICATE_ERROR) - //ERROR(GNUTLS_E_X509_CERTIFICATE_ERROR) diff --git a/devel/libvmime/patches/patch-vmime_Makefile_in b/devel/libvmime/patches/patch-vmime_Makefile_in index 20fe1ed970d..187d9e2a70c 100644 --- a/devel/libvmime/patches/patch-vmime_Makefile_in +++ b/devel/libvmime/patches/patch-vmime_Makefile_in @@ -1,8 +1,8 @@ -$OpenBSD: patch-vmime_Makefile_in,v 1.1.1.1 2008/10/09 15:16:03 ajacoutot Exp $ ---- vmime/Makefile.in.orig Thu Oct 9 16:22:51 2008 -+++ vmime/Makefile.in Thu Oct 9 16:23:16 2008 -@@ -369,9 +369,6 @@ nobase_libvmimeinclude_HEADERS = address.hpp \ - net/maildir/maildirUtils.hpp \ +$OpenBSD: patch-vmime_Makefile_in,v 1.2 2008/10/27 22:03:40 ajacoutot Exp $ +--- vmime/Makefile.in.orig Mon Oct 27 22:55:13 2008 ++++ vmime/Makefile.in Mon Oct 27 22:55:47 2008 +@@ -361,9 +361,6 @@ nobase_libvmimeinclude_HEADERS = address.hpp \ + net/maildir/format/courierMaildirFormat.hpp \ net/sendmail/sendmailServiceInfos.hpp \ net/sendmail/sendmailTransport.hpp \ - platforms/windows/windowsFile.hpp \ @@ -11,12 +11,3 @@ $OpenBSD: patch-vmime_Makefile_in,v 1.1.1.1 2008/10/09 15:16:03 ajacoutot Exp $ platforms/posix/posixChildProcess.hpp \ platforms/posix/posixFile.hpp \ platforms/posix/posixHandler.hpp \ -@@ -489,7 +486,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -- $(mkdir_p) $(distdir)/mdn $(distdir)/misc $(distdir)/net $(distdir)/net/imap $(distdir)/net/maildir $(distdir)/net/pop3 $(distdir)/net/sendmail $(distdir)/net/smtp $(distdir)/net/tls $(distdir)/platforms/posix $(distdir)/platforms/windows $(distdir)/security $(distdir)/security/cert $(distdir)/security/digest $(distdir)/security/digest/md5 $(distdir)/security/digest/sha1 $(distdir)/security/sasl $(distdir)/utility -+ $(mkdir_p) $(distdir)/mdn $(distdir)/misc $(distdir)/net $(distdir)/net/imap $(distdir)/net/maildir $(distdir)/net/pop3 $(distdir)/net/sendmail $(distdir)/net/smtp $(distdir)/net/tls $(distdir)/platforms/posix $(distdir)/security $(distdir)/security/cert $(distdir)/security/digest $(distdir)/security/digest/md5 $(distdir)/security/digest/sha1 $(distdir)/security/sasl $(distdir)/utility - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ diff --git a/devel/libvmime/pkg/PLIST b/devel/libvmime/pkg/PLIST index cefe21dcb7f..dd91ba49a0c 100644 --- a/devel/libvmime/pkg/PLIST +++ b/devel/libvmime/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2008/10/09 15:16:03 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.2 2008/10/27 22:03:40 ajacoutot Exp $ %%SHARED%% include/vmime/ include/vmime/address.hpp @@ -22,15 +22,6 @@ include/vmime/dateTime.hpp include/vmime/defaultAttachment.hpp include/vmime/disposition.hpp include/vmime/emptyContentHandler.hpp -include/vmime/encoder.hpp -include/vmime/encoder7bit.hpp -include/vmime/encoder8bit.hpp -include/vmime/encoderB64.hpp -include/vmime/encoderBinary.hpp -include/vmime/encoderDefault.hpp -include/vmime/encoderFactory.hpp -include/vmime/encoderQP.hpp -include/vmime/encoderUUE.hpp include/vmime/encoding.hpp include/vmime/exception.hpp include/vmime/fileAttachment.hpp @@ -74,7 +65,11 @@ include/vmime/net/imap/IMAPStore.hpp include/vmime/net/imap/IMAPTag.hpp include/vmime/net/imap/IMAPUtils.hpp include/vmime/net/maildir/ +include/vmime/net/maildir/format/ +include/vmime/net/maildir/format/courierMaildirFormat.hpp +include/vmime/net/maildir/format/kmailMaildirFormat.hpp include/vmime/net/maildir/maildirFolder.hpp +include/vmime/net/maildir/maildirFormat.hpp include/vmime/net/maildir/maildirMessage.hpp include/vmime/net/maildir/maildirServiceInfos.hpp include/vmime/net/maildir/maildirStore.hpp @@ -159,12 +154,23 @@ include/vmime/types.hpp include/vmime/utility/ include/vmime/utility/childProcess.hpp include/vmime/utility/datetimeUtils.hpp +include/vmime/utility/encoder/ +include/vmime/utility/encoder/b64Encoder.hpp +include/vmime/utility/encoder/binaryEncoder.hpp +include/vmime/utility/encoder/defaultEncoder.hpp +include/vmime/utility/encoder/eightBitEncoder.hpp +include/vmime/utility/encoder/encoder.hpp +include/vmime/utility/encoder/encoderFactory.hpp +include/vmime/utility/encoder/qpEncoder.hpp +include/vmime/utility/encoder/sevenBitEncoder.hpp +include/vmime/utility/encoder/uuEncoder.hpp include/vmime/utility/file.hpp include/vmime/utility/filteredStream.hpp include/vmime/utility/path.hpp include/vmime/utility/progressListener.hpp include/vmime/utility/random.hpp include/vmime/utility/smartPtr.hpp +include/vmime/utility/smartPtrInt.hpp include/vmime/utility/stream.hpp include/vmime/utility/stringProxy.hpp include/vmime/utility/stringUtils.hpp