Index: mail/gmime26/Makefile =================================================================== --- mail/gmime26/Makefile (working copy) +++ mail/gmime26/Makefile (working copy) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= gmime -PORTVERSION= 2.4.33 +PORTVERSION= 2.6.15 PORTREVISION?= 0 CATEGORIES?= mail MASTER_SITES= GNOME -PKGNAMESUFFIX?= -24 +PKGNAMESUFFIX?= -26 MAINTAINER?= ahicks@p-o.co.uk COMMENT?= Library (written in C) for parsing and creating messages using MIME @@ -15,11 +15,12 @@ CONFLICTS= gmime-1.0.* -SLAVEDIRS= mail/gmime2-sharp +SLAVEDIRS= mail/gmime26-sharp -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}24 +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}26 USE_GMAKE= yes -USE_GNOME?= glib20 +USE_AUTOTOOLS= libtool +USE_GNOME+= glib20 ltverhack USES= pathfix pkgconfig iconv USE_LDCONFIG= yes USE_XZ= yes @@ -30,19 +31,21 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --enable-mono=no \ --program-transform-name="s/uuencode/gmime-uuencode/;s/uudecode/gmime-uudecode/;" -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -LATEST_LINK?= ${PORTNAME}24 +LATEST_LINK?= ${PORTNAME}26 PORTDOCS= * +.include + post-patch: - @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ - ${WRKSRC}/*/Makefile.in + @${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \ + ${WRKSRC}/Makefile.in post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in docs/reference/html/* ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} Index: mail/gmime26/distinfo =================================================================== --- mail/gmime26/distinfo (working copy) +++ mail/gmime26/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (gmime-2.4.33.tar.xz) = 27dfa99967c19d2e8707b2670bd084dd514167925cca92cbd474298fc515d391 -SIZE (gmime-2.4.33.tar.xz) = 692336 +SHA256 (gmime-2.6.15.tar.xz) = b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a +SIZE (gmime-2.6.15.tar.xz) = 731880 Index: mail/gmime26/pkg-plist =================================================================== --- mail/gmime26/pkg-plist (working copy) +++ mail/gmime26/pkg-plist (working copy) @@ -1,56 +1,60 @@ -include/gmime-2.4/gmime/gmime-charset.h -include/gmime-2.4/gmime/gmime-cipher-context.h -include/gmime-2.4/gmime/gmime-content-type.h -include/gmime-2.4/gmime/gmime-data-wrapper.h -include/gmime-2.4/gmime/gmime-disposition.h -include/gmime-2.4/gmime/gmime-encodings.h -include/gmime-2.4/gmime/gmime-error.h -include/gmime-2.4/gmime/gmime-filter-basic.h -include/gmime-2.4/gmime/gmime-filter-best.h -include/gmime-2.4/gmime/gmime-filter-charset.h -include/gmime-2.4/gmime/gmime-filter-crlf.h -include/gmime-2.4/gmime/gmime-filter-enriched.h -include/gmime-2.4/gmime/gmime-filter-from.h -include/gmime-2.4/gmime/gmime-filter-gzip.h -include/gmime-2.4/gmime/gmime-filter-html.h -include/gmime-2.4/gmime/gmime-filter-md5.h -include/gmime-2.4/gmime/gmime-filter-strip.h -include/gmime-2.4/gmime/gmime-filter-windows.h -include/gmime-2.4/gmime/gmime-filter-yenc.h -include/gmime-2.4/gmime/gmime-filter.h -include/gmime-2.4/gmime/gmime-gpg-context.h -include/gmime-2.4/gmime/gmime-header.h -include/gmime-2.4/gmime/gmime-iconv-utils.h -include/gmime-2.4/gmime/gmime-iconv.h -include/gmime-2.4/gmime/gmime-message-part.h -include/gmime-2.4/gmime/gmime-message-partial.h -include/gmime-2.4/gmime/gmime-message.h -include/gmime-2.4/gmime/gmime-multipart-encrypted.h -include/gmime-2.4/gmime/gmime-multipart-signed.h -include/gmime-2.4/gmime/gmime-multipart.h -include/gmime-2.4/gmime/gmime-object.h -include/gmime-2.4/gmime/gmime-param.h -include/gmime-2.4/gmime/gmime-parse-utils.h -include/gmime-2.4/gmime/gmime-parser.h -include/gmime-2.4/gmime/gmime-part.h -include/gmime-2.4/gmime/gmime-session-simple.h -include/gmime-2.4/gmime/gmime-session.h -include/gmime-2.4/gmime/gmime-stream-buffer.h -include/gmime-2.4/gmime/gmime-stream-cat.h -include/gmime-2.4/gmime/gmime-stream-file.h -include/gmime-2.4/gmime/gmime-stream-filter.h -include/gmime-2.4/gmime/gmime-stream-fs.h -include/gmime-2.4/gmime/gmime-stream-mem.h -include/gmime-2.4/gmime/gmime-stream-mmap.h -include/gmime-2.4/gmime/gmime-stream-null.h -include/gmime-2.4/gmime/gmime-stream.h -include/gmime-2.4/gmime/gmime-utils.h -include/gmime-2.4/gmime/gmime.h -include/gmime-2.4/gmime/internet-address.h -lib/libgmime-2.4.a -lib/libgmime-2.4.la -lib/libgmime-2.4.so -lib/libgmime-2.4.so.6 -libdata/pkgconfig/gmime-2.4.pc -@dirrm include/gmime-2.4/gmime -@dirrm include/gmime-2.4 +include/gmime-2.6/gmime/gmime-certificate.h +include/gmime-2.6/gmime/gmime-charset.h +include/gmime-2.6/gmime/gmime-content-type.h +include/gmime-2.6/gmime/gmime-crypto-context.h +include/gmime-2.6/gmime/gmime-data-wrapper.h +include/gmime-2.6/gmime/gmime-disposition.h +include/gmime-2.6/gmime/gmime-encodings.h +include/gmime-2.6/gmime/gmime-error.h +include/gmime-2.6/gmime/gmime-filter-basic.h +include/gmime-2.6/gmime/gmime-filter-best.h +include/gmime-2.6/gmime/gmime-filter-charset.h +include/gmime-2.6/gmime/gmime-filter-crlf.h +include/gmime-2.6/gmime/gmime-filter-enriched.h +include/gmime-2.6/gmime/gmime-filter-from.h +include/gmime-2.6/gmime/gmime-filter-gzip.h +include/gmime-2.6/gmime/gmime-filter-html.h +include/gmime-2.6/gmime/gmime-filter-md5.h +include/gmime-2.6/gmime/gmime-filter-strip.h +include/gmime-2.6/gmime/gmime-filter-windows.h +include/gmime-2.6/gmime/gmime-filter-yenc.h +include/gmime-2.6/gmime/gmime-filter.h +include/gmime-2.6/gmime/gmime-gpg-context.h +include/gmime-2.6/gmime/gmime-header.h +include/gmime-2.6/gmime/gmime-iconv-utils.h +include/gmime-2.6/gmime/gmime-iconv.h +include/gmime-2.6/gmime/gmime-message-part.h +include/gmime-2.6/gmime/gmime-message-partial.h +include/gmime-2.6/gmime/gmime-message.h +include/gmime-2.6/gmime/gmime-multipart-encrypted.h +include/gmime-2.6/gmime/gmime-multipart-signed.h +include/gmime-2.6/gmime/gmime-multipart.h +include/gmime-2.6/gmime/gmime-object.h +include/gmime-2.6/gmime/gmime-param.h +include/gmime-2.6/gmime/gmime-parser.h +include/gmime-2.6/gmime/gmime-part-iter.h +include/gmime-2.6/gmime/gmime-part.h +include/gmime-2.6/gmime/gmime-pkcs7-context.h +include/gmime-2.6/gmime/gmime-signature.h +include/gmime-2.6/gmime/gmime-stream-buffer.h +include/gmime-2.6/gmime/gmime-stream-cat.h +include/gmime-2.6/gmime/gmime-stream-file.h +include/gmime-2.6/gmime/gmime-stream-filter.h +include/gmime-2.6/gmime/gmime-stream-fs.h +include/gmime-2.6/gmime/gmime-stream-gio.h +include/gmime-2.6/gmime/gmime-stream-mem.h +include/gmime-2.6/gmime/gmime-stream-mmap.h +include/gmime-2.6/gmime/gmime-stream-null.h +include/gmime-2.6/gmime/gmime-stream-pipe.h +include/gmime-2.6/gmime/gmime-stream.h +include/gmime-2.6/gmime/gmime-utils.h +include/gmime-2.6/gmime/gmime-version.h +include/gmime-2.6/gmime/gmime.h +include/gmime-2.6/gmime/internet-address.h +lib/libgmime-2.6.a +lib/libgmime-2.6.la +lib/libgmime-2.6.so +lib/libgmime-2.6.so.0 +libdata/pkgconfig/gmime-2.6.pc +@dirrm include/gmime-2.6/gmime +@dirrm include/gmime-2.6 Index: mail/gmime26-sharp/Makefile =================================================================== --- mail/gmime26-sharp/Makefile (working copy) +++ mail/gmime26-sharp/Makefile (working copy) @@ -1,33 +1,29 @@ -# New ports collection makefile for: gmime2-sharp -# Date Created: 20050513 -# Whom: Tom McLaughlin -# +# Created by: Tom McLaughlin # $FreeBSD$ # $Id: Makefile,v 1.17 2006/10/26 18:37:29 tmclau02 Exp $ -# -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= mail -PKGNAMESUFFIX= -24-sharp +PKGNAMESUFFIX= -26-sharp MAINTAINER= mono@FreeBSD.org COMMENT= Mono bindings for gmime -LIB_DEPENDS= gmime-2.4:${PORTSDIR}/mail/gmime24 +LIB_DEPENDS= gmime-2.6:${PORTSDIR}/mail/gmime26 -MASTERDIR= ${.CURDIR}/../gmime24 +MASTERDIR= ${.CURDIR}/../gmime26 BUILD_WRKSRC= ${WRKSRC}/mono INSTALL_WRKSRC= ${BUILD_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USE_GNOME= gnomehack glib20 gtksharp20 +USE_GNOME+= gtksharp20 CONFIGURE_ARGS= --enable-mono=yes -LATEST_LINK= gmime24-sharp +LATEST_LINK= gmime26-sharp -# Else we conflict with mail/gmime24 -NOPORTDOCS= yes +# Else we conflict with mail/gmime26 +OPTIONS_EXCLUDE= DOCS # Done in pre-configure because master port has a post-patch target already. pre-configure: Index: mail/gmime26-sharp/pkg-plist =================================================================== --- mail/gmime26-sharp/pkg-plist (working copy) +++ mail/gmime26-sharp/pkg-plist (working copy) @@ -1,8 +1,10 @@ @comment $FreeBSD$ -lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll -lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll.config -lib/mono/gmime-sharp-2.4/gmime-sharp.dll -libdata/pkgconfig/gmime-sharp-2.4.pc -@dirrm lib/mono/gmime-sharp-2.4 -@dirrmtry lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4 +lib/mono/gac/gmime-sharp/2.6.0.0__2b75c2ad004c52e4/gmime-sharp.dll +lib/mono/gac/gmime-sharp/2.6.0.0__2b75c2ad004c52e4/gmime-sharp.dll.config +lib/mono/gmime-sharp-2.6/gmime-sharp.dll +libdata/pkgconfig/gmime-sharp-2.6.pc +share/gapi-2.0/gmime-api.xml +@dirrmtry share/gapi-2.0 +@dirrm lib/mono/gmime-sharp-2.6 +@dirrmtry lib/mono/gac/gmime-sharp/2.6.0.0__2b75c2ad004c52e4 @dirrmtry lib/mono/gac/gmime-sharp