Some OCD cleanups on some of the perl@ ports.

- Remove dependencies in core
- Put testing depends in TEST_DEPENDS
- Remove unnecessary bsd.port.options.mk inclusions
- Remove checks for Perl versions that no longer exist in the ports tree
- Sort plists, some of which were so jumbled that I have to assume
  the plist was randomized before committing

A lot of the plist changes in this commit are moving PERL5_MAN3 after
SITE_PERL. It's repo churn now, but it makes updating the ports later
far easier.

8 files changed, 64 insertions, 65 deletions

diff --git a/astro/p5-Astro-Catalog/pkg-plist b/astro/p5-Astro-Catalog/pkg-plist
index 80c707a9ce00..27fe7752ac07 100644
--- a/astro/p5-Astro-Catalog/pkg-plist
+++ b/astro/p5-Astro-Catalog/pkg-plist
@@ -1,43 +1,5 @@
 etc/skycat.cfg.sample
 etc/sss.cfg.sample
-%%PERL5_MAN3%%/Astro::Catalog.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::ASCII.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::ASSM.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::Astrom.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::Binary.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::Cluster.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::FINDOFF.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::FITSTable.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::GaiaPick.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::JCMT.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::LCOGTFITSTable.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::Northstar.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::RITMatch.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::SExtractor.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::STL.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::Simple.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::TST.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::UKIRTBS.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::VOTable.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::IO::XY.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Item.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Item::Morphology.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query::2MASS.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query::CMC.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query::GSC.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query::MPC.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query::SIMBAD.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query::Sesame.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query::SkyCat.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query::SuperCOSMOS.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query::USNOA2.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Query::Vizier.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Star.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Star::Morphology.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Transport::REST.3.gz
-%%PERL5_MAN3%%/Astro::Catalog::Transport::WebService.3.gz
-%%PERL5_MAN3%%/Tk::AstroCatalog.3.gz
 %%SITE_PERL%%/Astro/Catalog.pm
 %%SITE_PERL%%/Astro/Catalog/IO/ASCII.pm
 %%SITE_PERL%%/Astro/Catalog/IO/ASSM.pm
@@ -76,3 +38,41 @@ etc/sss.cfg.sample
 %%SITE_PERL%%/Astro/Catalog/Transport/REST.pm
 %%SITE_PERL%%/Astro/Catalog/Transport/WebService.pm
 %%SITE_PERL%%/Tk/AstroCatalog.pm
+%%PERL5_MAN3%%/Astro::Catalog.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::ASCII.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::ASSM.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::Astrom.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::Binary.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::Cluster.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::FINDOFF.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::FITSTable.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::GaiaPick.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::JCMT.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::LCOGTFITSTable.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::Northstar.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::RITMatch.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::SExtractor.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::STL.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::Simple.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::TST.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::UKIRTBS.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::VOTable.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::IO::XY.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Item.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Item::Morphology.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::2MASS.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::CMC.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::GSC.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::MPC.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::SIMBAD.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::Sesame.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::SkyCat.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::SuperCOSMOS.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::USNOA2.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Query::Vizier.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Star.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Star::Morphology.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Transport::REST.3.gz
+%%PERL5_MAN3%%/Astro::Catalog::Transport::WebService.3.gz
+%%PERL5_MAN3%%/Tk::AstroCatalog.3.gz
diff --git a/astro/p5-Astro-FITS-Header/pkg-plist b/astro/p5-Astro-FITS-Header/pkg-plist
index eaacd5245054..7f93c6e386f4 100644
--- a/astro/p5-Astro-FITS-Header/pkg-plist
+++ b/astro/p5-Astro-FITS-Header/pkg-plist
@@ -1,12 +1,12 @@
-%%PERL5_MAN3%%/Astro::FITS::Header.3.gz
-%%PERL5_MAN3%%/Astro::FITS::Header::AST.3.gz
-%%PERL5_MAN3%%/Astro::FITS::Header::CFITSIO.3.gz
-%%PERL5_MAN3%%/Astro::FITS::Header::GSD.3.gz
-%%PERL5_MAN3%%/Astro::FITS::Header::Item.3.gz
-%%PERL5_MAN3%%/Astro::FITS::Header::NDF.3.gz
 %%SITE_PERL%%/Astro/FITS/Header.pm
 %%SITE_PERL%%/Astro/FITS/Header/AST.pm
 %%SITE_PERL%%/Astro/FITS/Header/CFITSIO.pm
 %%SITE_PERL%%/Astro/FITS/Header/GSD.pm
 %%SITE_PERL%%/Astro/FITS/Header/Item.pm
 %%SITE_PERL%%/Astro/FITS/Header/NDF.pm
+%%PERL5_MAN3%%/Astro::FITS::Header.3.gz
+%%PERL5_MAN3%%/Astro::FITS::Header::AST.3.gz
+%%PERL5_MAN3%%/Astro::FITS::Header::CFITSIO.3.gz
+%%PERL5_MAN3%%/Astro::FITS::Header::GSD.3.gz
+%%PERL5_MAN3%%/Astro::FITS::Header::Item.3.gz
+%%PERL5_MAN3%%/Astro::FITS::Header::NDF.3.gz
diff --git a/astro/p5-Astro-Hipparcos/Makefile b/astro/p5-Astro-Hipparcos/Makefile
index c7080b4b69d6..6be52ee43330 100644
--- a/astro/p5-Astro-Hipparcos/Makefile
+++ b/astro/p5-Astro-Hipparcos/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Astro-Hipparcos
 PORTVERSION=	0.09
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for reading the Hipparcos star catalog
 
-BUILD_DEPENDS=	p5-ExtUtils-XSpp>=0.06:${PORTSDIR}/devel/p5-ExtUtils-XSpp \
-		p5-ExtUtils-ParseXS>=2.22:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
+BUILD_DEPENDS=	p5-ExtUtils-XSpp>=0.06:${PORTSDIR}/devel/p5-ExtUtils-XSpp
 
 MAKE_ARGS+=	CC="${CXX}"
 USES=		perl5
diff --git a/astro/p5-Astro-satpass/pkg-plist b/astro/p5-Astro-satpass/pkg-plist
index a0c0a2ae746c..0183598f8c0f 100644
--- a/astro/p5-Astro-satpass/pkg-plist
+++ b/astro/p5-Astro-satpass/pkg-plist
@@ -1,14 +1,4 @@
 bin/satpass
-%%PERL5_MAN3%%/Astro::Coord::ECI.3.gz
-%%PERL5_MAN3%%/Astro::Coord::ECI::Mixin.3.gz
-%%PERL5_MAN3%%/Astro::Coord::ECI::Moon.3.gz
-%%PERL5_MAN3%%/Astro::Coord::ECI::OVERVIEW.3.gz
-%%PERL5_MAN3%%/Astro::Coord::ECI::Star.3.gz
-%%PERL5_MAN3%%/Astro::Coord::ECI::Sun.3.gz
-%%PERL5_MAN3%%/Astro::Coord::ECI::TLE.3.gz
-%%PERL5_MAN3%%/Astro::Coord::ECI::TLE::Iridium.3.gz
-%%PERL5_MAN3%%/Astro::Coord::ECI::TLE::Set.3.gz
-%%PERL5_MAN3%%/Astro::Coord::ECI::Utils.3.gz
 %%SITE_PERL%%/Astro/Coord/ECI.pm
 %%SITE_PERL%%/Astro/Coord/ECI/Mixin.pm
 %%SITE_PERL%%/Astro/Coord/ECI/Moon.pm
@@ -19,4 +9,14 @@ bin/satpass
 %%SITE_PERL%%/Astro/Coord/ECI/TLE/Iridium.pm
 %%SITE_PERL%%/Astro/Coord/ECI/TLE/Set.pm
 %%SITE_PERL%%/Astro/Coord/ECI/Utils.pm
+%%PERL5_MAN3%%/Astro::Coord::ECI.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::Mixin.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::Moon.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::OVERVIEW.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::Star.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::Sun.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::TLE.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::TLE::Iridium.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::TLE::Set.3.gz
+%%PERL5_MAN3%%/Astro::Coord::ECI::Utils.3.gz
 man/man1/satpass.1.gz
diff --git a/astro/p5-GPS-Babel/pkg-plist b/astro/p5-GPS-Babel/pkg-plist
index 93daf2503da3..90971ad74311 100644
--- a/astro/p5-GPS-Babel/pkg-plist
+++ b/astro/p5-GPS-Babel/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/GPS::Babel.3.gz
 %%SITE_PERL%%/GPS/Babel.pm
+%%PERL5_MAN3%%/GPS::Babel.3.gz
diff --git a/astro/p5-GPS-OID/pkg-plist b/astro/p5-GPS-OID/pkg-plist
index be3fd883f8b7..c1bd48230c5d 100644
--- a/astro/p5-GPS-OID/pkg-plist
+++ b/astro/p5-GPS-OID/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/GPS::OID.3.gz
 %%SITE_PERL%%/GPS/OID.pm
+%%PERL5_MAN3%%/GPS::OID.3.gz
diff --git a/astro/p5-Geo-METAR/pkg-plist b/astro/p5-Geo-METAR/pkg-plist
index 34435ad7db2a..f7f88cbee6e3 100644
--- a/astro/p5-Geo-METAR/pkg-plist
+++ b/astro/p5-Geo-METAR/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/Geo::METAR.3.gz
 %%SITE_PERL%%/Geo/METAR.pm
+%%PERL5_MAN3%%/Geo::METAR.3.gz
diff --git a/astro/p5-Starlink-AST/pkg-plist b/astro/p5-Starlink-AST/pkg-plist
index a645e03113ec..bab117d5c545 100644
--- a/astro/p5-Starlink-AST/pkg-plist
+++ b/astro/p5-Starlink-AST/pkg-plist
@@ -1,9 +1,9 @@
-%%PERL5_MAN3%%/Starlink::AST.3.gz
-%%PERL5_MAN3%%/Starlink::AST::PGPLOT.3.gz
-%%PERL5_MAN3%%/Starlink::AST::Tk.3.gz
-%%PERL5_MAN3%%/Starlink::AST::PLplot.3.gz
 %%SITE_ARCH%%/auto/Starlink/AST/AST.so
-%%SITE_ARCH%%/Starlink/AST/Tk.pm
 %%SITE_ARCH%%/Starlink/AST/PGPLOT.pm
 %%SITE_ARCH%%/Starlink/AST/PLplot.pm
+%%SITE_ARCH%%/Starlink/AST/Tk.pm
 %%SITE_ARCH%%/Starlink/AST.pm
+%%PERL5_MAN3%%/Starlink::AST.3.gz
+%%PERL5_MAN3%%/Starlink::AST::PGPLOT.3.gz
+%%PERL5_MAN3%%/Starlink::AST::PLplot.3.gz
+%%PERL5_MAN3%%/Starlink::AST::Tk.3.gz