Switch to new USES=perl5 framework. Old style was removed. This should unbreak

these ports. [1]
While here switch to new LIB_DEPEND syntax. Let me know if I screwed
something up.

Noticed by:	Gustau [1]


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18682 df743ca5-7f9a-e211-a948-0013205c9059

11 files changed, 38 insertions, 46 deletions

diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index 84e826995..79c793146 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -11,14 +11,13 @@ MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Contacts manager for gnome
 
 BUILD_DEPENDS=	vala>=0.14.0:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	goa-1.0:${PORTSDIR}/net/gnome-online-accounts \
-		folks.25:${PORTSDIR}/net-im/folks \
-		notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
+		libfolks.so.25:${PORTSDIR}/net-im/folks \
+		libnotify.so:${PORTSDIR}/devel/libnotify
 
 USE_XZ=		yes
 USE_GNOME=	intlhack gtk30 gnomedesktop3 evolutiondataserver3
-USES=		gettext gmake pathfix pkgconfig
-USE_PERL5=	yes
+USES=		gettext gmake pathfix perl5 pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/anjuta3/Makefile b/devel/anjuta3/Makefile
index 4405cb59c..99daf9fd4 100644
--- a/devel/anjuta3/Makefile
+++ b/devel/anjuta3/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Integrated Development Environment for C and C++
 
 BUILD_DEPENDS=	glade>=3.12.0:${PORTSDIR}/devel/glade \
 		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
-		gladeui-2:${PORTSDIR}/devel/glade \
-		gdl-3:${PORTSDIR}/x11-toolkits/gdl3
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
+		libgladeui-2.so:${PORTSDIR}/devel/glade \
+		libgdl-3.so:${PORTSDIR}/x11-toolkits/gdl3
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
 		autogen:${PORTSDIR}/devel/autogen \
 		automake-1.12:${PORTSDIR}/devel/automake \
@@ -28,9 +28,8 @@ CONFLICTS=	anjuta-2.[0-9]*
 
 LATEST_LINK=	anjuta3
 USE_XZ=		yes
-USES=		bison gettext gmake pathfix pkgconfig shared-mime-info
+USES=		bison gettext gmake pathfix perl5 pkgconfig shared-mime-info
 INSTALLS_ICONS=	yes
-USE_PERL5=	yes
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix vte3 gtksourceview3 libgda5 libwnck3
@@ -72,8 +71,8 @@ VALA_DESC=	Vala support
 
 .if ${PORT_OPTIONS:MSVN}
 BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
-LIB_DEPENDS+=	neon:${PORTSDIR}/www/neon29
+LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+=	libneon.so:${PORTSDIR}/www/neon29
 RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 PLIST_SUB+=	SVN=""
 .else
@@ -82,7 +81,7 @@ PLIST_SUB+=	SVN="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEVHELP}
-LIB_DEPENDS+=	devhelp-3:${PORTSDIR}/devel/devhelp3
+LIB_DEPENDS+=	libdevhelp-3.so:${PORTSDIR}/devel/devhelp3
 PLIST_SUB+=	DEVHELP=""
 .else
 CONFIGURE_ARGS+=--disable-plugin-devhelp
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index be0e2b4e0..b7c1da444 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -20,15 +20,14 @@ PORTSCOUT=	limitw:1,even
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
-		ffi:${PORTSDIR}/devel/libffi
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
+		libffi.so:${PORTSDIR}/devel/libffi
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USES=		gettext gmake iconv pathfix pkgconfig shebangfix
+USES=		gettext gmake iconv pathfix perl5 pkgconfig shebangfix
 USE_GNOME=	ltverhack
 USE_PYTHON=	2.5+
-USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 89798b440..ec95c00ed 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -21,9 +21,8 @@ PLIST_SUB=	VERSION="2.4" API_VERSION="2.4"
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix perl5 pkgconfig
 USE_GNOME=	glib20 ltverhack libsigc++20
-USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static --disable-documentation
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index a71311502..3d8b7dfe7 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 top library
 
 USE_XZ=		yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 USE_XORG=	xau
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix perl5 pkgconfig
 USE_GNOME=	gnomeprefix glib20 ltverhack intlhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 00f6d7f55..e225b33c9 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -14,10 +14,10 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_AUTOTOOLS=	libtool
 USE_XZ=		yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 LATEST_LINK=	libsigc++20
 USE_LDCONFIG=	yes
-USES=		gmake pathfix
+USES=		gmake pathfix perl5
 GNU_CONFIGURE=	yes
 
 PLIST_SUB=	VERSION="2.0" API_VERSION="2.0"
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index 54a6ad745..96745f1c2 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -19,10 +19,9 @@ BUILD_DEPENDS=	intltoolize:${PORTSDIR}/textproc/intltool \
 
 CONFLICTS=	ekiga-2.*
 
-USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix perl5 pkgconfig
 USE_XORG=	xv
 USE_GNOME=	gtk20
 DIST_SUBDIR=	gnome2
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 727b37de3..07298263f 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -12,13 +12,12 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Backend system admin scripts for gnome-system-tools
 
 BUILD_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
-LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		polkit-gobject-1:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 RUN_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
 
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USES=		gmake pathfix
+USES=		gmake pathfix perl5
 USE_GNOME=	intlhack glib20
 GNU_CONFIGURE=	yes
 USE_GNOME_SUBR=	yes
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index dc71c115a..549a8c185 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -26,9 +26,8 @@ XMLCATMGR=		${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
 USE_XZ=		yes
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig
+USES=		gmake pathfix perl5 pkgconfig
 USE_GNOME=	gnomeprefix libxslt gnomedocutils
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index ada9f56f7..77ad249e1 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -15,19 +15,18 @@ COMMENT=	An opensource browser engine
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
-		icutu:${PORTSDIR}/devel/icu \
-		curl:${PORTSDIR}/ftp/curl \
-		soup-2.4:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
+		libicutu.so:${PORTSDIR}/devel/icu \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
 USE_XZ=		yes
 USE_GSTREAMER=	yes
 USE_XORG=	xt
-USES=		bison gettext gmake pkgconfig
+USES=		bison gettext gmake perl5 pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 libxslt ltverhack introspection:build
 USE_SQLITE=	yes
-USE_PERL5=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 276a809c8..3d8a58a17 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -15,26 +15,26 @@ COMMENT=	Opensource browser engine using the GTK+ 3 toolkit
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
 		gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	enchant:${PORTSDIR}/textproc/enchant \
-		secret-1:${PORTSDIR}/security/libsecret \
-		icutu:${PORTSDIR}/devel/icu \
-		harfbuzz:${PORTSDIR}/print/harfbuzz \
-		webp:${PORTSDIR}/graphics/webp \
-		curl:${PORTSDIR}/ftp/curl \
-		soup-2.4:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
+		libsecret-1.so:${PORTSDIR}/security/libsecret \
+		libicutu.so:${PORTSDIR}/devel/icu \
+		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
+		libwebp.so:${PORTSDIR}/graphics/webp \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 USE_XZ=		yes
 USE_GSTREAMER1=	yes
 USE_XORG=	xt xdamage xcomposite
-USES=		bison gettext gmake pkgconfig shebangfix
+USES=		bison gettext gmake perl5 pkgconfig shebangfix
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=yes
 USE_GNOME=	cairo gnomehier gtk20 gtk30 introspection:build \
 		libxslt:build
 USE_SQLITE=	3
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \