2 files changed, 12 insertions, 28 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