24 files changed, 166 insertions, 166 deletions

diff --git a/devel/p5-Config-YAML/Makefile b/devel/p5-Config-YAML/Makefile
index 832c84b4919f..3d3c55a939a6 100644
--- a/devel/p5-Config-YAML/Makefile
+++ b/devel/p5-Config-YAML/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Simple configuration automation
 
-BUILD_DEPENDS=	${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 
 PERL_CONFIGURE=	yes
 
diff --git a/devel/p5-libxml-enno/Makefile b/devel/p5-libxml-enno/Makefile
index 9d6c1c74cef2..0a61b9103e8d 100644
--- a/devel/p5-libxml-enno/Makefile
+++ b/devel/p5-libxml-enno/Makefile
@@ -15,16 +15,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	A group of perl modules for XML parsing
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
-		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-		${SITE_PERL}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml \
-		${SITE_PERL}/Parse/Yapp/Parse.pm:${PORTSDIR}/devel/p5-Parse-Yapp
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
-		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-		${SITE_PERL}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml \
-		${SITE_PERL}/Parse/Yapp/Parse.pm:${PORTSDIR}/devel/p5-Parse-Yapp
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
+		p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
+		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
+RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
+		p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
+		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
 
 CONFLICTS=	p5-XML-DOM-[0-9]* p5-XML-Filter-DetectWS-[0-9]* \
 		p5-XML-Filter-Reindent-[0-9]* p5-XML-Filter-SAXT-[0-9]* \
diff --git a/math/p5-Math-SigFigs/Makefile b/math/p5-Math-SigFigs/Makefile
index 3d8da8ee69c8..1edc03cededa 100644
--- a/math/p5-Math-SigFigs/Makefile
+++ b/math/p5-Math-SigFigs/Makefile
@@ -14,10 +14,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Do math with correct handling of significant figures
 
-BUILD_DEPENDS=	${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \
-		${SITE_PERL}/Test/Pod/Coverage.pm:${PORTSDIR}/devel/p5-Test-Pod-Coverage
-RUN_DEPENDS=	${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \
-		${SITE_PERL}/Test/Pod/Coverage.pm:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+BUILD_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+RUN_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
 
 PERL_CONFIGURE=	yes
 
diff --git a/science/p5-Chemistry-3DBuilder/Makefile b/science/p5-Chemistry-3DBuilder/Makefile
index 1a64fa76f2ec..5442f4b14084 100644
--- a/science/p5-Chemistry-3DBuilder/Makefile
+++ b/science/p5-Chemistry-3DBuilder/Makefile
@@ -15,18 +15,18 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Generate 3D coordinates from a connection table
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/File/SMILES.pm:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		${SITE_PERL}/Chemistry/File/SMARTS.pm:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
-		${SITE_PERL}/Chemistry/Ring.pm:${PORTSDIR}/science/p5-Chemistry-Ring \
-		${SITE_PERL}/Chemistry/InternalCoords.pm:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
-		${SITE_PERL}/Math/VectorReal.pm:${PORTSDIR}/math/p5-Math-VectorReal
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/File/SMILES.pm:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		${SITE_PERL}/Chemistry/File/SMARTS.pm:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
-		${SITE_PERL}/Chemistry/Ring.pm:${PORTSDIR}/science/p5-Chemistry-Ring \
-		${SITE_PERL}/Chemistry/InternalCoords.pm:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
-		${SITE_PERL}/Math/VectorReal.pm:${PORTSDIR}/math/p5-Math-VectorReal
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-File-SMARTS>=0:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
+		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
+		p5-Math-VectorReal>=0:${PORTSDIR}/math/p5-Math-VectorReal
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-File-SMARTS>=0:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
+		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
+		p5-Math-VectorReal>=0:${PORTSDIR}/math/p5-Math-VectorReal
 
 PERL_CONFIGURE=	yes
 
diff --git a/science/p5-Chemistry-Bond-Find/Makefile b/science/p5-Chemistry-Bond-Find/Makefile
index e8f7001e689d..920c97278719 100644
--- a/science/p5-Chemistry-Bond-Find/Makefile
+++ b/science/p5-Chemistry-Bond-Find/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Detect bonds in a molecule and assign formal bond orders
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
 
 MAN3=	Chemistry::Bond::Find.3
 
diff --git a/science/p5-Chemistry-Canonicalize/Makefile b/science/p5-Chemistry-Canonicalize/Makefile
index 878c20315bde..5165e04733a4 100644
--- a/science/p5-Chemistry-Canonicalize/Makefile
+++ b/science/p5-Chemistry-Canonicalize/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Number the atoms in a molecule in a unique way
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
 
 MAN3=	Chemistry::Canonicalize.3
 
diff --git a/science/p5-Chemistry-File-MDLMol/Makefile b/science/p5-Chemistry-File-MDLMol/Makefile
index 7aab92ac89aa..263832e40c1c 100644
--- a/science/p5-Chemistry-File-MDLMol/Makefile
+++ b/science/p5-Chemistry-File-MDLMol/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	MDL molfile reader/write
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Ring/Find.pm:${PORTSDIR}/science/p5-Chemistry-Ring
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Ring/Find.pm:${PORTSDIR}/science/p5-Chemistry-Ring
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring
 
 MAN3=	Chemistry::File::MDLMol.3 Chemistry::File::SDF.3
 
diff --git a/science/p5-Chemistry-File-Mopac/Makefile b/science/p5-Chemistry-File-Mopac/Makefile
index 1bec43115fc2..e9bfa6cce2d2 100644
--- a/science/p5-Chemistry-File-Mopac/Makefile
+++ b/science/p5-Chemistry-File-Mopac/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	MOPAC 6 input file reader/writer
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/InternalCoords.pm:${PORTSDIR}/science/p5-Chemistry-InternalCoords
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/InternalCoords.pm:${PORTSDIR}/science/p5-Chemistry-InternalCoords
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords
 
 MAN3=	Chemistry::File::Mopac.3
 
diff --git a/science/p5-Chemistry-File-SLN/Makefile b/science/p5-Chemistry-File-SLN/Makefile
index 4b37f5cc9c24..86264056a93a 100644
--- a/science/p5-Chemistry-File-SLN/Makefile
+++ b/science/p5-Chemistry-File-SLN/Makefile
@@ -15,16 +15,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	SLN linear notation parser/writer
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Ring/Find.pm:${PORTSDIR}/science/p5-Chemistry-Ring \
-		${SITE_PERL}/Chemistry/Canonicalize.pm:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		${SITE_PERL}/Chemistry/Bond/Find.pm:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		${SITE_PERL}/Parse/Yapp/Parse.pm:${PORTSDIR}/devel/p5-Parse-Yapp
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Ring/Find.pm:${PORTSDIR}/science/p5-Chemistry-Ring \
-		${SITE_PERL}/Chemistry/Canonicalize.pm:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		${SITE_PERL}/Chemistry/Bond/Find.pm:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		${SITE_PERL}/Parse/Yapp/Parse.pm:${PORTSDIR}/devel/p5-Parse-Yapp
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
+		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
+		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
+		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
+		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
 
 MAN3=	Chemistry::File::SLN.3
 
diff --git a/science/p5-Chemistry-File-SMARTS/Makefile b/science/p5-Chemistry-File-SMARTS/Makefile
index 5f7f452dd518..b23fe9d6fb75 100644
--- a/science/p5-Chemistry-File-SMARTS/Makefile
+++ b/science/p5-Chemistry-File-SMARTS/Makefile
@@ -15,14 +15,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	SMARTS chemical substructure pattern linear notation parser
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Ring/Find.pm:${PORTSDIR}/science/p5-Chemistry-Ring \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern \
-		${SITE_PERL}/Chemistry/File/SMILES.pm:${PORTSDIR}/science/p5-Chemistry-File-SMILES
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Ring/Find.pm:${PORTSDIR}/science/p5-Chemistry-Ring \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern \
-		${SITE_PERL}/Chemistry/File/SMILES.pm:${PORTSDIR}/science/p5-Chemistry-File-SMILES
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern \
+		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern \
+		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES
 
 MAN3=	Chemistry::File::SMARTS.3
 
diff --git a/science/p5-Chemistry-File-SMILES/Makefile b/science/p5-Chemistry-File-SMILES/Makefile
index 445605e87d35..6241b618f8f4 100644
--- a/science/p5-Chemistry-File-SMILES/Makefile
+++ b/science/p5-Chemistry-File-SMILES/Makefile
@@ -15,14 +15,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	SMILES linear notation parser/writer
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Bond/Find.pm:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		${SITE_PERL}/Chemistry/Canonicalize.pm:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		${SITE_PERL}/Chemistry/Ring.pm:${PORTSDIR}/science/p5-Chemistry-Ring
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Bond/Find.pm:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		${SITE_PERL}/Chemistry/Canonicalize.pm:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		${SITE_PERL}/Chemistry/Ring.pm:${PORTSDIR}/science/p5-Chemistry-Ring
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring
 
 MAN3=	Chemistry::File::SMILES.3
 
diff --git a/science/p5-Chemistry-File-VRML/Makefile b/science/p5-Chemistry-File-VRML/Makefile
index 7f6a380e02c5..69a16b1693c3 100644
--- a/science/p5-Chemistry-File-VRML/Makefile
+++ b/science/p5-Chemistry-File-VRML/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Generate VRML models for molecules
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
 
 MAN3=	Chemistry::File::VRML.3
 
diff --git a/science/p5-Chemistry-File-XYZ/Makefile b/science/p5-Chemistry-File-XYZ/Makefile
index 7e114083d54d..5da0f4732fde 100644
--- a/science/p5-Chemistry-File-XYZ/Makefile
+++ b/science/p5-Chemistry-File-XYZ/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	XYZ molecule format reader/writer
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
 
 MAN3=	Chemistry::File::XYZ.3
 
diff --git a/science/p5-Chemistry-FormulaPattern/Makefile b/science/p5-Chemistry-FormulaPattern/Makefile
index 8adc555cc2cd..c63d35c40df0 100644
--- a/science/p5-Chemistry-FormulaPattern/Makefile
+++ b/science/p5-Chemistry-FormulaPattern/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Match molecule by formula
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
 
 MAN3=	Chemistry::FormulaPattern.3 Chemistry::File::FormulaPattern.3
 
diff --git a/science/p5-Chemistry-InternalCoords/Makefile b/science/p5-Chemistry-InternalCoords/Makefile
index 3b3dad21b818..e9687243181d 100644
--- a/science/p5-Chemistry-InternalCoords/Makefile
+++ b/science/p5-Chemistry-InternalCoords/Makefile
@@ -15,12 +15,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Represent the position of an atom using internal coordinates
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Bond/Find.pm:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		${SITE_PERL}/Chemistry/Canonicalize.pm:${PORTSDIR}/science/p5-Chemistry-Canonicalize
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/Bond/Find.pm:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		${SITE_PERL}/Chemistry/Canonicalize.pm:${PORTSDIR}/science/p5-Chemistry-Canonicalize
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize
 
 MAN3=	Chemistry::InternalCoords.3 Chemistry::InternalCoords::Builder.3
 
diff --git a/science/p5-Chemistry-MidasPattern/Makefile b/science/p5-Chemistry-MidasPattern/Makefile
index 2b9f6b8a12f5..bf768e2aba73 100644
--- a/science/p5-Chemistry-MidasPattern/Makefile
+++ b/science/p5-Chemistry-MidasPattern/Makefile
@@ -15,14 +15,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Select atoms in macromolecules
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/File/PDB.pm:${PORTSDIR}/science/p5-Chemistry-File-PDB \
-		${SITE_PERL}/Chemistry/MacroMol.pm:${PORTSDIR}/science/p5-Chemistry-MacroMol \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/File/PDB.pm:${PORTSDIR}/science/p5-Chemistry-File-PDB \
-		${SITE_PERL}/Chemistry/MacroMol.pm:${PORTSDIR}/science/p5-Chemistry-MacroMol \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-File-PDB>=0:${PORTSDIR}/science/p5-Chemistry-File-PDB \
+		p5-Chemistry-MacroMol>=0:${PORTSDIR}/science/p5-Chemistry-MacroMol \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-File-PDB>=0:${PORTSDIR}/science/p5-Chemistry-File-PDB \
+		p5-Chemistry-MacroMol>=0:${PORTSDIR}/science/p5-Chemistry-MacroMol \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
 
 MAN3=	Chemistry::MidasPattern.3 Chemistry::File::MidasPattern.3
 
diff --git a/science/p5-Chemistry-Mok/Makefile b/science/p5-Chemistry-Mok/Makefile
index 26a5a7b978fa..6e04d65a92bb 100644
--- a/science/p5-Chemistry-Mok/Makefile
+++ b/science/p5-Chemistry-Mok/Makefile
@@ -15,14 +15,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Molecular awk interpreter
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/File/SMILES.pm:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		${SITE_PERL}/Chemistry/Bond/Find.pm:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/File/SMILES.pm:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		${SITE_PERL}/Chemistry/Bond/Find.pm:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
 
 MAN1=	mok.1
 MAN3=	Chemistry::Mok.3
diff --git a/science/p5-Chemistry-Pattern/Makefile b/science/p5-Chemistry-Pattern/Makefile
index 5f544ee92a2a..55e851fc74ef 100644
--- a/science/p5-Chemistry-Pattern/Makefile
+++ b/science/p5-Chemistry-Pattern/Makefile
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Chemical substructure pattern matching
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
 
 MAN3=	Chemistry::Pattern.3 Chemistry::Pattern::Atom.3 Chemistry::Pattern::Bond.3
 
diff --git a/science/p5-Chemistry-Reaction/Makefile b/science/p5-Chemistry-Reaction/Makefile
index a63a656af3d2..6e55a365c762 100644
--- a/science/p5-Chemistry-Reaction/Makefile
+++ b/science/p5-Chemistry-Reaction/Makefile
@@ -15,14 +15,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Represent a ring as a substructure of a molecule 
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/File/SMILES.pm:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		${SITE_PERL}/Statistics/Regression.pm:${PORTSDIR}/math/p5-Statistics-Regression \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/File/SMILES.pm:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		${SITE_PERL}/Statistics/Regression.pm:${PORTSDIR}/math/p5-Statistics-Regression \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
+		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
+		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
 
 MAN3=	Chemistry::Reaction.3
 
diff --git a/science/p5-Chemistry-Ring/Makefile b/science/p5-Chemistry-Ring/Makefile
index d51da95ce19d..f8b5d735996c 100644
--- a/science/p5-Chemistry-Ring/Makefile
+++ b/science/p5-Chemistry-Ring/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Represent a ring as a substructure of a molecule
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Statistics/Regression.pm:${PORTSDIR}/math/p5-Statistics-Regression
-RUN_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Statistics/Regression.pm:${PORTSDIR}/math/p5-Statistics-Regression
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression
 
 MAN3=	Chemistry::Ring.3 Chemistry::Ring::Find.3
 
diff --git a/science/p5-PerlMol/Makefile b/science/p5-PerlMol/Makefile
index 9f5c0a1a2008..12ed99ffd4e6 100644
--- a/science/p5-PerlMol/Makefile
+++ b/science/p5-PerlMol/Makefile
@@ -15,52 +15,52 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl modules for molecular chemistry
 
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/MacroMol.pm:${PORTSDIR}/science/p5-Chemistry-MacroMol \
-		${SITE_PERL}/Parse/Yapp/Parse.pm:${PORTSDIR}/devel/p5-Parse-Yapp \
-		${SITE_PERL}/Chemistry/File/SMILES.pm:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		${SITE_PERL}/Chemistry/File/SMARTS.pm:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
-		${SITE_PERL}/Chemistry/InternalCoords.pm:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern \
-		${SITE_PERL}/Chemistry/Ring.pm:${PORTSDIR}/science/p5-Chemistry-Ring \
-		${SITE_PERL}/Chemistry/Isotope.pm:${PORTSDIR}/science/p5-Chemistry-Isotope \
-		${SITE_PERL}/Chemistry/3DBuilder.pm:${PORTSDIR}/science/p5-Chemistry-3DBuilder \
-		${SITE_PERL}/Chemistry/Bond/Find.pm:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		${SITE_PERL}/Chemistry/Canonicalize.pm:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		${SITE_PERL}/Chemistry/File/PDB.pm:${PORTSDIR}/science/p5-Chemistry-File-PDB \
-		${SITE_PERL}/Chemistry/File/XYZ.pm:${PORTSDIR}/science/p5-Chemistry-File-XYZ \
-		${SITE_PERL}/Chemistry/File/VRML.pm:${PORTSDIR}/science/p5-Chemistry-File-VRML \
-		${SITE_PERL}/Chemistry/File/SLN.pm:${PORTSDIR}/science/p5-Chemistry-File-SLN \
-		${SITE_PERL}/Chemistry/File/Mopac.pm:${PORTSDIR}/science/p5-Chemistry-File-Mopac \
-		${SITE_PERL}/Chemistry/File/MDLMol.pm:${PORTSDIR}/science/p5-Chemistry-File-MDLMol \
-		${SITE_PERL}/Chemistry/Reaction.pm:${PORTSDIR}/science/p5-Chemistry-Reaction \
-		${SITE_PERL}/Chemistry/FormulaPattern.pm:${PORTSDIR}/science/p5-Chemistry-FormulaPattern \
-		${SITE_PERL}/Chemistry/MidasPattern.pm:${PORTSDIR}/science/p5-Chemistry-MidasPattern \
-		${SITE_PERL}/Chemistry/Mok.pm:${PORTSDIR}/science/p5-Chemistry-Mok \
-		${SITE_PERL}/Statistics/Regression.pm:${PORTSDIR}/math/p5-Statistics-Regression
-BUILD_DEPENDS=	${SITE_PERL}/Chemistry/Mol.pm:${PORTSDIR}/science/p5-Chemistry-Mol \
-		${SITE_PERL}/Chemistry/MacroMol.pm:${PORTSDIR}/science/p5-Chemistry-MacroMol \
-		${SITE_PERL}/Parse/Yapp/Parse.pm:${PORTSDIR}/devel/p5-Parse-Yapp \
-		${SITE_PERL}/Chemistry/File/SMILES.pm:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		${SITE_PERL}/Chemistry/File/SMARTS.pm:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
-		${SITE_PERL}/Chemistry/InternalCoords.pm:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
-		${SITE_PERL}/Chemistry/Pattern.pm:${PORTSDIR}/science/p5-Chemistry-Pattern \
-		${SITE_PERL}/Chemistry/Ring.pm:${PORTSDIR}/science/p5-Chemistry-Ring \
-		${SITE_PERL}/Chemistry/Isotope.pm:${PORTSDIR}/science/p5-Chemistry-Isotope \
-		${SITE_PERL}/Chemistry/3DBuilder.pm:${PORTSDIR}/science/p5-Chemistry-3DBuilder \
-		${SITE_PERL}/Chemistry/Bond/Find.pm:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		${SITE_PERL}/Chemistry/Canonicalize.pm:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		${SITE_PERL}/Chemistry/File/PDB.pm:${PORTSDIR}/science/p5-Chemistry-File-PDB \
-		${SITE_PERL}/Chemistry/File/XYZ.pm:${PORTSDIR}/science/p5-Chemistry-File-XYZ \
-		${SITE_PERL}/Chemistry/File/VRML.pm:${PORTSDIR}/science/p5-Chemistry-File-VRML \
-		${SITE_PERL}/Chemistry/File/SLN.pm:${PORTSDIR}/science/p5-Chemistry-File-SLN \
-		${SITE_PERL}/Chemistry/File/Mopac.pm:${PORTSDIR}/science/p5-Chemistry-File-Mopac \
-		${SITE_PERL}/Chemistry/File/MDLMol.pm:${PORTSDIR}/science/p5-Chemistry-File-MDLMol \
-		${SITE_PERL}/Chemistry/Reaction.pm:${PORTSDIR}/science/p5-Chemistry-Reaction \
-		${SITE_PERL}/Chemistry/FormulaPattern.pm:${PORTSDIR}/science/p5-Chemistry-FormulaPattern \
-		${SITE_PERL}/Chemistry/MidasPattern.pm:${PORTSDIR}/science/p5-Chemistry-MidasPattern \
-		${SITE_PERL}/Chemistry/Mok.pm:${PORTSDIR}/science/p5-Chemistry-Mok \
-		${SITE_PERL}/Statistics/Regression.pm:${PORTSDIR}/math/p5-Statistics-Regression
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-MacroMol>=0:${PORTSDIR}/science/p5-Chemistry-MacroMol \
+		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp \
+		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-File-SMARTS>=0:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
+		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
+		p5-Chemistry-Isotope>=0:${PORTSDIR}/science/p5-Chemistry-Isotope \
+		p5-Chemistry-3DBuilder>=0:${PORTSDIR}/science/p5-Chemistry-3DBuilder \
+		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-File-PDB>=0:${PORTSDIR}/science/p5-Chemistry-File-PDB \
+		p5-Chemistry-File-XYZ>=0:${PORTSDIR}/science/p5-Chemistry-File-XYZ \
+		p5-Chemistry-File-VRML>=0:${PORTSDIR}/science/p5-Chemistry-File-VRML \
+		p5-Chemistry-File-SLN>=0:${PORTSDIR}/science/p5-Chemistry-File-SLN \
+		p5-Chemistry-File-Mopac>=0:${PORTSDIR}/science/p5-Chemistry-File-Mopac \
+		p5-Chemistry-File-MDLMol>=0:${PORTSDIR}/science/p5-Chemistry-File-MDLMol \
+		p5-Chemistry-Reaction>=0:${PORTSDIR}/science/p5-Chemistry-Reaction \
+		p5-Chemistry-FormulaPattern>=0:${PORTSDIR}/science/p5-Chemistry-FormulaPattern \
+		p5-Chemistry-MidasPattern>=0:${PORTSDIR}/science/p5-Chemistry-MidasPattern \
+		p5-Chemistry-Mok>=0:${PORTSDIR}/science/p5-Chemistry-Mok \
+		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
+		p5-Chemistry-MacroMol>=0:${PORTSDIR}/science/p5-Chemistry-MacroMol \
+		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp \
+		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-File-SMARTS>=0:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
+		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
+		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern \
+		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
+		p5-Chemistry-Isotope>=0:${PORTSDIR}/science/p5-Chemistry-Isotope \
+		p5-Chemistry-3DBuilder>=0:${PORTSDIR}/science/p5-Chemistry-3DBuilder \
+		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-File-PDB>=0:${PORTSDIR}/science/p5-Chemistry-File-PDB \
+		p5-Chemistry-File-XYZ>=0:${PORTSDIR}/science/p5-Chemistry-File-XYZ \
+		p5-Chemistry-File-VRML>=0:${PORTSDIR}/science/p5-Chemistry-File-VRML \
+		p5-Chemistry-File-SLN>=0:${PORTSDIR}/science/p5-Chemistry-File-SLN \
+		p5-Chemistry-File-Mopac>=0:${PORTSDIR}/science/p5-Chemistry-File-Mopac \
+		p5-Chemistry-File-MDLMol>=0:${PORTSDIR}/science/p5-Chemistry-File-MDLMol \
+		p5-Chemistry-Reaction>=0:${PORTSDIR}/science/p5-Chemistry-Reaction \
+		p5-Chemistry-FormulaPattern>=0:${PORTSDIR}/science/p5-Chemistry-FormulaPattern \
+		p5-Chemistry-MidasPattern>=0:${PORTSDIR}/science/p5-Chemistry-MidasPattern \
+		p5-Chemistry-Mok>=0:${PORTSDIR}/science/p5-Chemistry-Mok \
+		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression
 
 PERL_CONFIGURE=	yes
 
diff --git a/textproc/p5-Spreadsheet-ReadSXC/Makefile b/textproc/p5-Spreadsheet-ReadSXC/Makefile
index 0d9929eb0a4a..75a262afab61 100644
--- a/textproc/p5-Spreadsheet-ReadSXC/Makefile
+++ b/textproc/p5-Spreadsheet-ReadSXC/Makefile
@@ -15,10 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Extract OpenOffice 1.x spreadsheet data
 
-BUILD_DEPENDS=	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		${SITE_PERL}/mach/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-RUN_DEPENDS=	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		${SITE_PERL}/mach/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-CGI-Application-Plugin-Config-YAML/Makefile b/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
index 14215c24af5b..efa3a796f1df 100644
--- a/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
+++ b/www/p5-CGI-Application-Plugin-Config-YAML/Makefile
@@ -15,9 +15,9 @@ MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Add Config::YAML support to CGI::Application
 
 BUILD_DEPENDS=	p5-CGI-Application>4.01:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/Config/YAML.pm:${PORTSDIR}/devel/p5-Config-YAML
+		p5-Config-YAML>=0:${PORTSDIR}/devel/p5-Config-YAML
 RUN_DEPENDS=	p5-CGI-Application>4.01:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/Config/YAML.pm:${PORTSDIR}/devel/p5-Config-YAML
+		p5-Config-YAML>=0:${PORTSDIR}/devel/p5-Config-YAML
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-CGI-Application-Plugin-JSON/Makefile b/www/p5-CGI-Application-Plugin-JSON/Makefile
index 6678e12888aa..facbe0a1632f 100644
--- a/www/p5-CGI-Application-Plugin-JSON/Makefile
+++ b/www/p5-CGI-Application-Plugin-JSON/Makefile
@@ -15,11 +15,11 @@ MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Easy manipulation of JSON headers for CGI::Application
 
 BUILD_DEPENDS=	p5-CGI-Application>4.01:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/JSON/Any.pm:${PORTSDIR}/converters/p5-JSON \
-		${SITE_PERL}/JSON.pm:${PORTSDIR}/converters/p5-JSON-Any
+		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
+		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any
 RUN_DEPENDS=	p5-CGI-Application>4.01:${PORTSDIR}/www/p5-CGI-Application \
-		${SITE_PERL}/JSON/Any.pm:${PORTSDIR}/converters/p5-JSON \
-		${SITE_PERL}/JSON.pm:${PORTSDIR}/converters/p5-JSON-Any
+		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
+		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any
 
 PERL_MODBUILD=	yes