12 files changed, 33 insertions, 42 deletions

diff --git a/databases/drizzle/Makefile b/databases/drizzle/Makefile
index 1f77b25fe216..bb1f8440658c 100644
--- a/databases/drizzle/Makefile
+++ b/databases/drizzle/Makefile
@@ -12,10 +12,9 @@ MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	A database optimized for Cloud and Net applications
 
 USE_GCC=	4.2+
-USE_PERL5=	yes
+USES=		gmake perl5
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/drizzle
 
 BROKEN=		fails to build
diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index 9179adf7d342..e0c431101839 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	databases
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
 
 MAINTAINER=	m.tsatsenko@gmail.com
-COMMENT=	A C and C++ client library to the memcached server
+COMMENT=	C and C++ client library to the memcached server
 
 LIB_DEPENDS?=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		event-1.4.4:${PORTSDIR}/devel/libevent
@@ -21,26 +21,15 @@ CONFIGURE_ARGS=	--without-memcached
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
 CXXFLAGS+=	-D__STDC_CONSTANT_MACROS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if exists(${LOCALBASE}/lib/libsasl.so.3)
 LIB_DEPENDS+=	sasl2.3:${PORTSDIR}/security/cyrus-sasl2
 .endif
 
-.if ${OSVERSION} < 800000
-BROKEN=		does not compile on FreeBSD 7.x
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^pkgconfigdir.*|pkgconfigdir = $${PREFIX}/libdata/pkgconfig|' \
-			 -e '/^LDFLAGS *=/ s/$$/ $${LTLIBSASL2}/' \
-			${WRKSRC}/Makefile.in ${WRKSRC}/support/include.am
-.if defined(NO_INSTALL_MANPAGES)
-	@${REINPLACE_CMD} -e 's|^SUBDIRS = docs |SUBDIRS = |' ${WRKSRC}/Makefile.in
-.endif
-
 .if !defined(NO_INSTALL_MANPAGES)
-USE_PERL5_BUILD=yes # pod2man
+USES=	perl5
+USE_PERL5=	build
 MAN1=		memaslap.1 \
 		memcapable.1 \
 		memcat.1 \
@@ -156,4 +145,12 @@ MAN3=		hashkit_clone.3 \
 		memcached_version.3
 .endif
 
-.include <bsd.port.post.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's|^pkgconfigdir.*|pkgconfigdir = $${PREFIX}/libdata/pkgconfig|' \
+			 -e '/^LDFLAGS *=/ s/$$/ $${LTLIBSASL2}/' \
+			${WRKSRC}/Makefile.in ${WRKSRC}/support/include.am
+.if defined(NO_INSTALL_MANPAGES)
+	@${REINPLACE_CMD} -e 's|^SUBDIRS = docs |SUBDIRS = |' ${WRKSRC}/Makefile.in
+.endif
+
+.include <bsd.port.mk>
diff --git a/databases/mysqldumper/Makefile b/databases/mysqldumper/Makefile
index 8016a61d6fe8..2c073c4f933a 100644
--- a/databases/mysqldumper/Makefile
+++ b/databases/mysqldumper/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	p5-DBI>=1.48:${PORTSDIR}/databases/p5-DBI
 
 USE_ZIP=	yes
 USE_MYSQL=	yes
-USE_PERL5=	yes
+USES=		perl5
 USE_PHP=	session mysql zlib ftp
 
 NO_BUILD=	yes
diff --git a/databases/p5-Class-DBI-Plugin-Senna/Makefile b/databases/p5-Class-DBI-Plugin-Senna/Makefile
index 055a79f17bbb..839a6b97ddd2 100644
--- a/databases/p5-Class-DBI-Plugin-Senna/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Senna/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Class-DBI-Plugin-Senna
-# Date created:		18 Feb 2006
-# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Class-DBI-Plugin-Senna
 PORTVERSION=	0.01
@@ -17,7 +13,8 @@ COMMENT=	Add Instant Fulltext Search Capability With Senna to Class::DBI
 BUILD_DEPENDS=	p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
 	p5-Senna>=0:${PORTSDIR}/textproc/p5-Senna
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 MAN3=		Class::DBI::Plugin::Senna.3
 
 .include <bsd.port.pre.mk>
diff --git a/databases/p5-DBIx-QueryLog/Makefile b/databases/p5-DBIx-QueryLog/Makefile
index ca8d0ed5204d..62f29698d02f 100644
--- a/databases/p5-DBIx-QueryLog/Makefile
+++ b/databases/p5-DBIx-QueryLog/Makefile
@@ -17,7 +17,8 @@ TEST_DEPENDS=	\
 	p5-Class-Method-Modifiers>0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
 	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=	DBIx::QueryLog.3
 
diff --git a/databases/p5-DBIx-Simple/Makefile b/databases/p5-DBIx-Simple/Makefile
index 6de07deb771c..db82aa9bde17 100644
--- a/databases/p5-DBIx-Simple/Makefile
+++ b/databases/p5-DBIx-Simple/Makefile
@@ -18,7 +18,8 @@ SQL_ABSTRACT_DESC=	Generate SQL from Perl data structures
 DBIX_XHTML_TABLE_DESC=	Create XHTML tables from SQL queries
 TEXT_TABLE_DESC=	Create plain text table from data
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	DBIx::Simple.3 \
 	DBIx::Simple::Examples.3 \
diff --git a/databases/postgis20/Makefile b/databases/postgis20/Makefile
index 87c9a40aa856..dbdb13103f4e 100644
--- a/databases/postgis20/Makefile
+++ b/databases/postgis20/Makefile
@@ -19,11 +19,10 @@ LATEST_LINK=	postgis20
 
 USE_GNOME=	libxml2
 USE_PGSQL=	yes
-USE_GMAKE=	yes
-USES=		iconv
+USES=		gmake iconv perl5
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 
 OPTIONS_DEFINE=		LOADERGUI RASTER TOPOLOGY
 OPTIONS_DEFAULT=	TOPOLOGY
diff --git a/databases/postgis21/Makefile b/databases/postgis21/Makefile
index b9a61f76bae7..1641bfcc39a2 100644
--- a/databases/postgis21/Makefile
+++ b/databases/postgis21/Makefile
@@ -18,10 +18,10 @@ LATEST_LINK=	postgis21
 
 USE_GNOME=	libxml2
 USE_PGSQL=	yes
-USES=		gmake iconv pkgconfig
+USES=		gmake iconv perl5 pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 
 OPTIONS_DEFINE=		LOADERGUI RASTER TOPOLOGY
 OPTIONS_DEFAULT=	TOPOLOGY
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index b12ed5b1e65e..e7188d4da70c 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -14,8 +14,7 @@ BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USES=		gettext iconv
-USE_PERL5=	yes
+USES=		gettext iconv perl5
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index f5449d19e7bc..d45403666098 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -25,7 +25,6 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
-WANT_PERL=	yes
 USE_GNOME=	gnomehack intltool
 
 CONFIGURE_ARGS=	--disable-tcl
@@ -68,7 +67,7 @@ PLIST_SUB+=	WITH_RUBY="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL_MODULE}
-USE_PERL5=	yes
+USES=		perl5
 CONFIGURE_ARGS+=	--enable-perl --enable-perl-site-install
 PLIST_SUB+=	WITH_PERL=""
 .else
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index f03878efb2b7..9174d434054c 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -21,15 +21,14 @@ CONFLICTS=	rrdtool-1.0* rrdtool-1.3*
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-WANT_PERL=	yes
+USES=		gmake
 
 CONFIGURE_ARGS=	--disable-tcl
 
 OPTIONS_DEFINE=	PYTHON RUBY PERL DOCS EXAMPLES
 OPTIONS_DEFAULT=	PERL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
@@ -54,7 +53,7 @@ PLIST_SUB+=	WITH_RUBY="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=	yes
+USES=		perl5
 CONFIGURE_ARGS+=	--enable-perl --enable-perl-site-install
 PLIST_SUB+=	WITH_PERL=""
 .else
@@ -97,4 +96,4 @@ post-install:
 	@${ECHO_MSG} "############################################################################"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/slony1/Makefile b/databases/slony1/Makefile
index dc62c6471e96..bcfe2f8faf46 100644
--- a/databases/slony1/Makefile
+++ b/databases/slony1/Makefile
@@ -31,7 +31,7 @@ CONFLICTS?=	slony1v2-2*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPERLTOOLS}
-USE_PERL5=	yes
+USES=		perl5
 CONFIGURE_ARGS+=	--with-perltools=${LOCALBASE}/sbin
 RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 BUILD_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg