- Convert security/gsasl to USES=libtool, drop .la files

- Bump revisions of dependent ports as gsasl .so version has changed
- Convert USE_BZIP2 and USE_XZ to USES in some ports

Approved by:	portmgr blanket

9 files changed, 14 insertions, 15 deletions

diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index b77618877a94..eda9e6a3ba2c 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pokerth
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.1
 DISTNAME=	PokerTH-${PORTVERSION}-src
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 548a8df1eac4..7ca38d77ba0d 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	anubis
 PORTVERSION=	4.1.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index ff6646fc1980..53e0cc33f050 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libvmime
 PORTVERSION=	0.9.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	SF/vmime/vmime/0.9
 
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index a57f3ddbdcb9..3ec365679c32 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mpop
 PORTVERSION=	1.0.28
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -21,8 +22,7 @@ GSASL_DESC=	GSASL GNU SASL authentication support
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-USES=		pkgconfig
-USE_BZIP2=	yes
+USES=		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-libidn
 
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index cbb50990fa8a..a0f5b9049111 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	msmtp
 PORTVERSION=	1.4.32
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
@@ -11,9 +12,8 @@ COMMENT=	SMTP plugin for MUAs
 
 LICENSE=	GPLv3
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		pkgconfig tar:bzip2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INFO=	msmtp
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 05e6ccacf6d4..7c18e90d869d 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jabberd
 DISTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \
 		LOCAL/matthew/${PORTNAME}
@@ -24,11 +24,10 @@ OPTIONS_SINGLE_SASL=	CYRUS GSASL
 OPTIONS_DEFAULT=MYSQL DEBUG GSASL
 OPTIONS_SUB=	yes
 
-USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	run
 USE_OPENSSL=	yes
-USES=		iconv perl5 compiler:c11
+USES=		iconv perl5 compiler:c11 tar:xz
 USE_RC_SUBR=	jabberd
 USE_LDCONFIG=	${PREFIX}/lib/jabberd
 CONFIGURE_ARGS+=	--localstatedir=/var \
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index 03b672974a6f..cfd3124f5dab 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dico
 PORTVERSION=	2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 82dd8856e479..be318af05482 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gsasl
 PORTVERSION=	1.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	GNU
 
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
 		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libntlm.so:${PORTSDIR}/security/libntlm
 
-USES=		charsetfix pathfix perl5 pkgconfig
+USES=		charsetfix pathfix perl5 pkgconfig libtool
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/gsasl/pkg-plist b/security/gsasl/pkg-plist
index 55e3f162874b..04887085a8ac 100644
--- a/security/gsasl/pkg-plist
+++ b/security/gsasl/pkg-plist
@@ -3,9 +3,9 @@ include/gsasl-compat.h
 include/gsasl-mech.h
 include/gsasl.h
 lib/libgsasl.a
-lib/libgsasl.la
 lib/libgsasl.so
-lib/libgsasl.so.16
+lib/libgsasl.so.7
+lib/libgsasl.so.7.9.6
 libdata/pkgconfig/libgsasl.pc
 man/man1/gsasl.1.gz
 man/man3/gsasl_appinfo_get.3.gz