3 files changed, 52 insertions, 57 deletions

diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
index 2a45e9bbf2bc..497e2c08dd4d 100644
--- a/mail/gmime24/Makefile
+++ b/mail/gmime24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmime
-PORTVERSION=	2.4.15
+PORTVERSION=	2.4.24
 PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	GNOME
@@ -25,17 +25,13 @@ USE_GMAKE=	yes
 USE_GNOME?=	gnomehack gnometarget glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS?=	--with-libiconv=${LOCALBASE} \
-			--with-html-dir=${PREFIX}/share/doc \
-			--enable-mono=no
+CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
+		--enable-mono=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 LATEST_LINK?=	${PORTNAME}24
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|stdint.h|inttypes.h|" ${WRKSRC}/zentimer.h
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/
diff --git a/mail/gmime24/distinfo b/mail/gmime24/distinfo
index 8d4c54c90f90..960b7fc8a22c 100644
--- a/mail/gmime24/distinfo
+++ b/mail/gmime24/distinfo
@@ -1,3 +1,2 @@
-MD5 (gmime-2.4.15.tar.gz) = f0f8ea95d1a6b5f8012fd0a340a8021a
-SHA256 (gmime-2.4.15.tar.gz) = 250e8d1f0404ecac7d97b8802bd412ca5438a2a655c901f0d9edb82fdd7ac28e
-SIZE (gmime-2.4.15.tar.gz) = 1108187
+SHA256 (gmime-2.4.24.tar.gz) = 2f538d68e215f075d16575a6da9acb87983db9e2df0d7d403858048881a0dd15
+SIZE (gmime-2.4.24.tar.gz) = 1118949
diff --git a/mail/gmime24/pkg-plist b/mail/gmime24/pkg-plist
index 5c9ec6f70f3a..70439e115693 100644
--- a/mail/gmime24/pkg-plist
+++ b/mail/gmime24/pkg-plist
@@ -55,7 +55,49 @@ libdata/pkgconfig/gmime-2.4.pc
 %%PORTDOCS%%%%DOCSDIR%%/CipherContexts.html
 %%PORTDOCS%%%%DOCSDIR%%/DataWrappers.html
 %%PORTDOCS%%%%DOCSDIR%%/Filters.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeCipherContext.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeContentDisposition.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeContentType.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeDataWrapper.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilter.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterBasic.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterBest.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterCRLF.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterCharset.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterEnriched.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterFrom.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterGZip.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterHTML.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterMd5.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterStrip.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterWindows.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeFilterYenc.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeGpgContext.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeMessage.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeMessagePart.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeMessagePartial.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeMultipart.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeMultipartEncrypted.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeMultipartSigned.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeObject.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeParser.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimePart.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeSession.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeSessionSimple.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeStream.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeStreamBuffer.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeStreamCat.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeStreamFile.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeStreamFilter.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeStreamFs.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeStreamMem.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeStreamMmap.html
+%%PORTDOCS%%%%DOCSDIR%%/GMimeStreamNull.html
 %%PORTDOCS%%%%DOCSDIR%%/Headers.html
+%%PORTDOCS%%%%DOCSDIR%%/InternetAddress.html
+%%PORTDOCS%%%%DOCSDIR%%/InternetAddressGroup.html
+%%PORTDOCS%%%%DOCSDIR%%/InternetAddressList.html
+%%PORTDOCS%%%%DOCSDIR%%/InternetAddressMailbox.html
 %%PORTDOCS%%%%DOCSDIR%%/InternetAddresses.html
 %%PORTDOCS%%%%DOCSDIR%%/MimeParts.html
 %%PORTDOCS%%%%DOCSDIR%%/Parsers.html
@@ -65,6 +107,8 @@ libdata/pkgconfig/gmime-2.4.pc
 %%PORTDOCS%%%%DOCSDIR%%/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/core.html
 %%PORTDOCS%%%%DOCSDIR%%/fundamentals.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-GMimeHeader.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime-GMimeParam.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-building.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-changes-2-0.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-changes-2-2.html
@@ -73,62 +117,18 @@ libdata/pkgconfig/gmime-2.4.pc
 %%PORTDOCS%%%%DOCSDIR%%/gmime-data-wrappers.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-filters.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-charset.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-cipher-context.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-content-type.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-data-wrapper.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-disposition.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-encodings.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-basic.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-best.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-charset.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-crlf.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-enriched.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-from.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-gzip.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-html.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-md5.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-strip.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-windows.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter-yenc.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-filter.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-gpg-context.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-header.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-iconv-utils.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-iconv.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-message-part.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-message-partial.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-message.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-multipart-encrypted.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-multipart-signed.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-multipart.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-object.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-param.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-parser.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-part.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-session-simple.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-session.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-buffer.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-cat.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime.devhelp
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-file.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-filter.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-fs.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-mem.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-mmap.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream-null.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-stream.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-gmime-utils.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-gmime.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-internet-address-group.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-internet-address-list.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-internet-address-mailbox.html
-%%PORTDOCS%%%%DOCSDIR%%/gmime-internet-address.html
-%%PORTDOCS%%%%DOCSDIR%%/home.png
 %%PORTDOCS%%%%DOCSDIR%%/gmime-question-index.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-resources.html
 %%PORTDOCS%%%%DOCSDIR%%/gmime-streams.html
+%%PORTDOCS%%%%DOCSDIR%%/gmime.devhelp
 %%PORTDOCS%%%%DOCSDIR%%/gmime.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/gmime.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/index.sgml
 %%PORTDOCS%%%%DOCSDIR%%/left.png