7 files changed, 24 insertions, 47 deletions

diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 90eed03b71c9..6678ba14487d 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dbmail
 PORTVERSION=	2.2.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.2/
 PKGNAMESUFFIX=	22
@@ -36,15 +36,15 @@ SIEVE_LIB_DEPENDS=	libsieve.so:${PORTSDIR}/mail/libsieve
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
+USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
 USE_GNOME=	glib20
 USE_OPENSSL=	yes
-USES=		gmake pkgconfig
 
-CFLAGS+=	-fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-pkglibdir=${LOCALBASE}/lib/dbmail
 MAKE_ARGS+=	mandir=${MANPREFIX}/man
@@ -80,15 +80,6 @@ post-configure:
 	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
 				${WRKSRC}/dbmail.h
 
-# remove leftovers which are not removed by some revisions of port
-# fixes the `Shared object "libpgsqldbmail.so.0" not found, required by "libdbmail.so.0"' error.
-pre-install:
-	@for f in 'a' 'la' 'so' 'so.0'; do \
-	  if [ -f ${STAGEDIR}${PREFIX}/lib/libdbmail.$$f ] ; then \
-	    ${RM} ${STAGEDIR}${PREFIX}/lib/libdbmail.$$f; \
-	  fi; \
-	done
-
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf-dist
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/mail/dbmail22/pkg-plist b/mail/dbmail22/pkg-plist
index f1970118a0c3..90f12510abd6 100644
--- a/mail/dbmail22/pkg-plist
+++ b/mail/dbmail22/pkg-plist
@@ -2,34 +2,27 @@
 etc/dbmail.conf-dist
 @exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
 @exec mkdir -p %D/lib/dbmail
-%%LDAP%%lib/dbmail/libauth_ldap.a
-%%LDAP%%lib/dbmail/libauth_ldap.la
 %%LDAP%%lib/dbmail/libauth_ldap.so
 %%LDAP%%lib/dbmail/libauth_ldap.so.0
-lib/dbmail/libauth_sql.a
-lib/dbmail/libauth_sql.la
+%%LDAP%%lib/dbmail/libauth_ldap.so.0.0.0
 lib/dbmail/libauth_sql.so
 lib/dbmail/libauth_sql.so.0
-lib/dbmail/libdbmail.a
-lib/dbmail/libdbmail.la
+lib/dbmail/libauth_sql.so.0.0.0
 lib/dbmail/libdbmail.so
 lib/dbmail/libdbmail.so.0
-%%MYSQL%%lib/dbmail/libmysql.a
-%%MYSQL%%lib/dbmail/libmysql.la
+lib/dbmail/libdbmail.so.0.0.0
 %%MYSQL%%lib/dbmail/libmysql.so
 %%MYSQL%%lib/dbmail/libmysql.so.0
-%%PGSQL%%lib/dbmail/libpgsql.a
-%%PGSQL%%lib/dbmail/libpgsql.la
+%%MYSQL%%lib/dbmail/libmysql.so.0.0.0
 %%PGSQL%%lib/dbmail/libpgsql.so
 %%PGSQL%%lib/dbmail/libpgsql.so.0
-%%SIEVE%%lib/dbmail/libsort_sieve.a
-%%SIEVE%%lib/dbmail/libsort_sieve.la
+%%PGSQL%%lib/dbmail/libpgsql.so.0.0.0
 %%SIEVE%%lib/dbmail/libsort_sieve.so
 %%SIEVE%%lib/dbmail/libsort_sieve.so.0
-%%SQLITE%%lib/dbmail/libsqlite.a
-%%SQLITE%%lib/dbmail/libsqlite.la
+%%SIEVE%%lib/dbmail/libsort_sieve.so.0.0.0
 %%SQLITE%%lib/dbmail/libsqlite.so
 %%SQLITE%%lib/dbmail/libsqlite.so.0
+%%SQLITE%%lib/dbmail/libsqlite.so.0.0.0
 @dirrm lib/dbmail
 man/man1/dbmail-smtp.1.gz
 man/man1/dbmail.1.gz
diff --git a/mail/gmime2-sharp/Makefile b/mail/gmime2-sharp/Makefile
index 4cb4321ecd6d..da1c10ad7ec9 100644
--- a/mail/gmime2-sharp/Makefile
+++ b/mail/gmime2-sharp/Makefile
@@ -1,14 +1,14 @@
 # Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
-PKGNAMESUFFIX=	-sharp
+PKGNAMESUFFIX=	2-sharp
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Mono bindings for gmime
 
-IGNORE=		try to install weaked-named assembly into the GAC.
+IGNORE=		try to install weaked-named assembly into the GAC
 
 LIB_DEPENDS=	libgmime-2.0.so:${PORTSDIR}/mail/gmime2
 
@@ -18,17 +18,14 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
-USES=		mono pathfix
+USES=		mono
 USE_GNOME=	glib20 gtksharp20
 CONFIGURE_ARGS=	--enable-mono=yes
 
-LATEST_LINK=	gmime2-sharp
-
 # Else we conflict with mail/gmime2
-NOPORTDOCS=	yes
+OPTIONS_EXCLUDE=DOCS
 
 # Done in pre-configure because master port has a post-patch target already.
-NO_STAGE=	yes
 pre-configure:
 	@${REINPLACE_CMD} -e 's|.@GMIME_VERSION@||g' \
 		${WRKSRC}/mono/gmime-sharp.dll.config.in
diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index 231b1ce9aa5b..b3cdc4429f81 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	gmime
 PORTVERSION=	2.2.27
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	mail
 MASTER_SITES=	GNOME
+PKGNAMESUFFIX?=	2
 
 MAINTAINER?=	ahicks@p-o.co.uk
 COMMENT?=	Library (written in C) for parsing and creating messages using MIME
@@ -17,7 +18,7 @@ CONFLICTS=	gmime-1.0.* gmime-2.4.*
 SLAVEDIRS=	mail/gmime2-sharp
 
 USE_GNOME?=	glib20
-USES=		gmake pathfix pkgconfig iconv
+USES+=		gmake iconv libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 # www.freebsd.org/cgi/query-pr.cgi?pr=118092
@@ -27,9 +28,7 @@ CONFIGURE_ARGS?=	${ICONV_CONFIGURE_BASE} \
 			--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}
-
-LATEST_LINK?=	${PORTNAME}2
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/mail/gmime2/files/patch-docs_Makefile.in b/mail/gmime2/files/patch-docs_Makefile.in
index de3b1fc39f7e..09fa5b5faa8e 100644
--- a/mail/gmime2/files/patch-docs_Makefile.in
+++ b/mail/gmime2/files/patch-docs_Makefile.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
 --- docs/Makefile.in.orig	2008-01-03 09:05:09.000000000 -0200
 +++ docs/Makefile.in	2008-01-03 09:05:21.000000000 -0200
 @@ -193,7 +193,7 @@
diff --git a/mail/gmime2/pkg-plist b/mail/gmime2/pkg-plist
index 9329ff798ceb..d8af7f58c6c3 100644
--- a/mail/gmime2/pkg-plist
+++ b/mail/gmime2/pkg-plist
@@ -51,9 +51,9 @@ include/gmime-2.0/gmime/gmime.h
 include/gmime-2.0/gmime/internet-address.h
 lib/gmimeConf.sh
 lib/libgmime-2.0.a
-lib/libgmime-2.0.la
 lib/libgmime-2.0.so
-lib/libgmime-2.0.so.4
+lib/libgmime-2.0.so.2
+lib/libgmime-2.0.so.2.2.27
 libdata/pkgconfig/gmime-2.0.pc
 @dirrm include/gmime-2.0/gmime
 @dirrm include/gmime-2.0
diff --git a/mail/p5-MIME-Fast/Makefile b/mail/p5-MIME-Fast/Makefile
index 5a20598a90aa..88feb29dd7ca 100644
--- a/mail/p5-MIME-Fast/Makefile
+++ b/mail/p5-MIME-Fast/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MIME-Fast
 PORTVERSION=	1.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-