- Switch to new LIB_DEPENDS format

- Convert USE_PERL5 to USES
- Remove stale MAKE_JOBS_SAFE
- Trim dependencies where they are too detailed

10 files changed, 22 insertions, 24 deletions

diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index ea535c86256c..b88f92cf94ca 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -6,8 +6,8 @@ PORTREVISION=	0
 
 COMMENT=	Webkit based HTML renderer plugin for Claws Mail
 
-LIB_DEPENDS=	soup-gnome:${PORTSDIR}/devel/libsoup-gnome \
-		webkitgtk:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
+		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
 
 CLAWS_PLUGINS_BUILD=	fancy
 
diff --git a/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile
index e96924dc2377..77ad345292cd 100644
--- a/mail/claws-mail-gdata/Makefile
+++ b/mail/claws-mail-gdata/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	0
 
 COMMENT=	Plugin providing Google Contacts in the Tab-address completion
 
-LIB_DEPENDS=	gdata:${PORTSDIR}/devel/libgdata
+LIB_DEPENDS=	libgdata.so:${PORTSDIR}/devel/libgdata
 
 CLAWS_PLUGINS_BUILD=	gdata
 
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index b62a43e9c403..3ae665810b12 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -6,8 +6,8 @@ PORTREVISION=	1
 
 COMMENT=	New mail notification plugin for Claws Mail
 
-LIB_DEPENDS=	canberra-gtk:${PORTSDIR}/audio/libcanberra \
-		notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
+		libnotify.so:${PORTSDIR}/devel/libnotify
 
 CLAWS_PLUGINS_BUILD=	notification
 
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index fbebe6f1935e..336bfcd8b9d5 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	0
 
 COMMENT=	PDF and PostScript viewer plugin for Claws Mail
 
-LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 
 USE_GHOSTSCRIPT=yes
 
diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
index b3618dfec2e0..854815a12df0 100644
--- a/mail/claws-mail-perl/Makefile
+++ b/mail/claws-mail-perl/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	0
 
 COMMENT=	Perl filtering plugin for Claws Mail
 
-USE_PERL5=	yes
+USES+=		perl5
 
 PLIST_FILES+=	share/claws-mail/matcherrc2perlfilter.pl
 
diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
index 89b495d092c4..5a5ac73811b4 100644
--- a/mail/claws-mail-pgp/Makefile
+++ b/mail/claws-mail-pgp/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	0
 
 COMMENT=	PGP plugins for Claws Mail
 
-LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme
+LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
 
 CLAWS_PLUGINS_BUILD=	pgpcore pgpinline pgpmime smime
 
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index f6de105c7ec7..714ef8edaa12 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,10 +6,10 @@ CATEGORIES=	mail news ipv6
 
 COMMENT=	Lightweight and very featureful GTK+ based e-mail and news client
 
-LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
-		etpan:${PORTSDIR}/mail/libetpan \
-		gnutls:${PORTSDIR}/security/gnutls \
-		gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+		libetpan.so:${PORTSDIR}/mail/libetpan \
+		libgnutls.so:${PORTSDIR}/security/gnutls \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
 USE_GNOME=	gtk20
@@ -32,17 +32,17 @@ THEMES_DESC=		Additional themes
 OPTIONS_DEFAULT=	COMPFACE ENCHANT MANUAL STARTUP THEMES
 
 COMPFACE_CONFIGURE_ENABLE=	compface
-COMPFACE_LIB_DEPENDS=	compface:${PORTSDIR}/mail/faces
+COMPFACE_LIB_DEPENDS=	libcompface.so:${PORTSDIR}/mail/faces
 
 DEBUG_CONFIGURE_ON=	--enable-maintainer-mode
 
 ENCHANT_CONFIGURE_ENABLE=	enchant
-ENCHANT_LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant
+ENCHANT_LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 JPILOT_CONFIGURE_ENABLE=	jpilot
-JPILOT_LIB_DEPENDS=	pisock:${PORTSDIR}/palm/pilot-link
+JPILOT_LIB_DEPENDS=	libpisock.so:${PORTSDIR}/palm/pilot-link
 JPILOT_RUN_DEPENDS=	jpilot:${PORTSDIR}/palm/jpilot
 
 LDAP_CONFIGURE_ENABLE=	ldap
@@ -55,7 +55,7 @@ NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=		gettext
 
 STARTUP_CONFIGURE_ENABLE=	startup-notification
-STARTUP_LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification
+STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 
 THEMES_RUN_DEPENDS=	${LOCALBASE}/share/claws-mail/themes/ZX-0_1.1/down_arrow.xpm:${PORTSDIR}/x11-themes/claws-mail-themes
 
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index c7da62baf3c9..95bd7501959b 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -11,7 +11,6 @@ LICENSE=	GPLv3
 USE_BZIP2=	yes
 USES+=		gmake
 GNU_CONFIGURE=	yes
-MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--disable-dbus
diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile
index e25bbe4192cc..fb52dc8b4186 100644
--- a/mail/clawsker/Makefile
+++ b/mail/clawsker/Makefile
@@ -15,9 +15,8 @@ RUN_DEPENDS=	claws-mail>=3.9.1:${PORTSDIR}/mail/claws-mail \
 		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
 
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	${PORTNAME}
-USE_PERL5=	yes
 
 MAN1=		clawsker.1
 PORTDOCS=	NEWS README
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 8d67befc581c..1e64426955bc 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Mail framework for C language
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		expat:${PORTSDIR}/textproc/expat2 \
-		sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 
 USE_AUTOTOOLS=	libtool autoconf
 AUTOTOOLSFILES=	aclocal.m4
@@ -30,8 +30,8 @@ OPTIONS_SINGLE_CRYPTO=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	OPENSSL
 
 GNUTLS_CONFIGURE_ON=	--without-openssl --with-gnutls
-GNUTLS_LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
-			gcrypt:${PORTSDIR}/security/libgcrypt
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
+			libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 IPV6_CONFIGURE_ENABLE=	ipv6