3 files changed, 63 insertions, 49 deletions

diff --git a/astro/p5-Astro-Catalog/Makefile b/astro/p5-Astro-Catalog/Makefile
index 9d9cbb13ac87..f95976c3dfc1 100644
--- a/astro/p5-Astro-Catalog/Makefile
+++ b/astro/p5-Astro-Catalog/Makefile
@@ -7,24 +7,37 @@
 #
 
 PORTNAME=	Astro-Catalog
-PORTVERSION=	4.1.0
+PORTVERSION=	4.2.4
 CATEGORIES=	astro perl5
-MASTER_SITES=	CPAN \
-		http://www.estar.org.uk/software/
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A generic stellar catalogue object
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+LICENSE=	GPLv3
 
-PERL_CONFIGURE=	yes
+# p5-Astro-FITS-CFITSIO is a recommended dependency
+BUILD_DEPENDS=	p5-Astro-Coords>=0.12:${PORTSDIR}/astro/p5-Astro-Coords \
+		p5-Astro-FITS-CFITSIO>=1.03:${PORTSDIR}/astro/p5-Astro-FITS-CFITSIO \
+		p5-Astro-Flux>=0.01:${PORTSDIR}/astro/p5-Astro-Flux \
+		p5-Astro-Telescope>=0.50:${PORTSDIR}/astro/p5-Astro-Telescope \
+		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
+		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
+		p5-Misc-Quality>=0.1:${PORTSDIR}/astro/p5-Misc-Quality \
+		p5-Number-Uncertainty>=0.1:${PORTSDIR}/math/p5-Number-Uncertainty \
+		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
+		p5-libwww>=5.53:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-CONFIG=		sss.cfg skycat.cfg
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+PERL_MODBUILD=	yes
 
 MAN3=		Astro::Catalog.3 \
 		Astro::Catalog::IO::ASCII.3 \
+		Astro::Catalog::IO::ASSM.3 \
 		Astro::Catalog::IO::Astrom.3 \
 		Astro::Catalog::IO::Binary.3 \
 		Astro::Catalog::IO::Cluster.3 \
@@ -32,6 +45,8 @@ MAN3=		Astro::Catalog.3 \
 		Astro::Catalog::IO::FITSTable.3 \
 		Astro::Catalog::IO::GaiaPick.3 \
 		Astro::Catalog::IO::JCMT.3 \
+		Astro::Catalog::IO::LCOGTFITSTable.3 \
+		Astro::Catalog::IO::Northstar.3 \
 		Astro::Catalog::IO::RITMatch.3 \
 		Astro::Catalog::IO::SExtractor.3 \
 		Astro::Catalog::IO::STL.3 \
@@ -39,6 +54,7 @@ MAN3=		Astro::Catalog.3 \
 		Astro::Catalog::IO::TST.3 \
 		Astro::Catalog::IO::UKIRTBS.3 \
 		Astro::Catalog::IO::VOTable.3 \
+		Astro::Catalog::IO::XY.3 \
 		Astro::Catalog::Item.3 \
 		Astro::Catalog::Item::Morphology.3 \
 		Astro::Catalog::Query.3 \
@@ -58,15 +74,14 @@ MAN3=		Astro::Catalog.3 \
 		Astro::Catalog::Transport::WebService.3 \
 		Tk::AstroCatalog.3
 
-post-patch:
-	@${PERL} -pi -e "s!^(my.*cfg_to_install).*!\$$1=\"\";!;" ${WRKSRC}/Makefile.PL
+.include <bsd.port.pre.mk>
 
-post-install:
-.for f in ${CONFIG}
-	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}.default
-.if !exists(${PREFIX}/etc/${f})
-	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}
+.if ${PERL_LEVEL} < 501000
+BUILD_DEPENDS+=	p5-Time-Piece>=1.08:${PORTSDIR}/devel/p5-Time-Piece
+RUN_DEPENDS+=	p5-Time-Piece>=1.08:${PORTSDIR}/devel/p5-Time-Piece
 .endif
-.endfor
 
-.include <bsd.port.mk>
+post-patch:
+	@${REINPLACE_CMD} -e '/\.cfg/ s|\.cfg|&.sample|2' ${WRKSRC}/Build.PL
+
+.include <bsd.port.post.mk>
diff --git a/astro/p5-Astro-Catalog/distinfo b/astro/p5-Astro-Catalog/distinfo
index 355bbf297241..358cb058ef73 100644
--- a/astro/p5-Astro-Catalog/distinfo
+++ b/astro/p5-Astro-Catalog/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Astro-Catalog-4.1.0.tar.gz) = 57f6f0e55ae94a92d65add225f22e31d4833e72bbc152ce0a289ae8bda8f7d58
-SIZE (Astro-Catalog-4.1.0.tar.gz) = 222394
+SHA256 (Astro-Catalog-4.24.tar.gz) = a5fc92128c1b4bba2c300fdc838adf8e84de4ab95f6062e41e4ef1327a0586d0
+SIZE (Astro-Catalog-4.24.tar.gz) = 264714
diff --git a/astro/p5-Astro-Catalog/pkg-plist b/astro/p5-Astro-Catalog/pkg-plist
index 78bac0b25cd8..aff97b920bd3 100644
--- a/astro/p5-Astro-Catalog/pkg-plist
+++ b/astro/p5-Astro-Catalog/pkg-plist
@@ -1,51 +1,50 @@
-@unexec if cmp -s %D/etc/sss.cfg %D/etc/sss.cfg.default; then rm -f %D/etc/sss.cfg; fi
-etc/sss.cfg.default
-@exec [ -f %B/sss.cfg ] || cp %B/%f %B/sss.cfg
-@unexec if cmp -s %D/etc/skycat.cfg %D/etc/skycat.cfg.default; then rm -f %D/etc/skycat.cfg; fi
-etc/skycat.cfg.default
-@exec [ -f %B/skycat.cfg ] || cp %B/%f %B/skycat.cfg
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Catalog/.packlist
+etc/skycat.cfg.sample
+etc/sss.cfg.sample
 %%SITE_PERL%%/Astro/Catalog.pm
-%%SITE_PERL%%/Astro/Catalog/Query.pm
-%%SITE_PERL%%/Astro/Catalog/Star.pm
-%%SITE_PERL%%/Astro/Catalog/IO/Simple.pm
+%%SITE_PERL%%/Astro/Catalog/IO/ASCII.pm
+%%SITE_PERL%%/Astro/Catalog/IO/ASSM.pm
+%%SITE_PERL%%/Astro/Catalog/IO/Astrom.pm
+%%SITE_PERL%%/Astro/Catalog/IO/Binary.pm
+%%SITE_PERL%%/Astro/Catalog/IO/Cluster.pm
 %%SITE_PERL%%/Astro/Catalog/IO/FINDOFF.pm
+%%SITE_PERL%%/Astro/Catalog/IO/FITSTable.pm
+%%SITE_PERL%%/Astro/Catalog/IO/GaiaPick.pm
+%%SITE_PERL%%/Astro/Catalog/IO/JCMT.pm
+%%SITE_PERL%%/Astro/Catalog/IO/LCOGTFITSTable.pm
+%%SITE_PERL%%/Astro/Catalog/IO/Northstar.pm
 %%SITE_PERL%%/Astro/Catalog/IO/RITMatch.pm
 %%SITE_PERL%%/Astro/Catalog/IO/SExtractor.pm
-%%SITE_PERL%%/Astro/Catalog/IO/GaiaPick.pm
-%%SITE_PERL%%/Astro/Catalog/IO/Binary.pm
 %%SITE_PERL%%/Astro/Catalog/IO/STL.pm
-%%SITE_PERL%%/Astro/Catalog/IO/Cluster.pm
-%%SITE_PERL%%/Astro/Catalog/IO/VOTable.pm
-%%SITE_PERL%%/Astro/Catalog/IO/Astrom.pm
-%%SITE_PERL%%/Astro/Catalog/IO/JCMT.pm
-%%SITE_PERL%%/Astro/Catalog/IO/FITSTable.pm
-%%SITE_PERL%%/Astro/Catalog/IO/UKIRTBS.pm
+%%SITE_PERL%%/Astro/Catalog/IO/Simple.pm
 %%SITE_PERL%%/Astro/Catalog/IO/TST.pm
-%%SITE_PERL%%/Astro/Catalog/IO/ASCII.pm
+%%SITE_PERL%%/Astro/Catalog/IO/UKIRTBS.pm
+%%SITE_PERL%%/Astro/Catalog/IO/VOTable.pm
+%%SITE_PERL%%/Astro/Catalog/IO/XY.pm
 %%SITE_PERL%%/Astro/Catalog/Item.pm
 %%SITE_PERL%%/Astro/Catalog/Item/Morphology.pm
-%%SITE_PERL%%/Astro/Catalog/Query/SkyCat.pm
+%%SITE_PERL%%/Astro/Catalog/Query.pm
 %%SITE_PERL%%/Astro/Catalog/Query/2MASS.pm
+%%SITE_PERL%%/Astro/Catalog/Query/CMC.pm
+%%SITE_PERL%%/Astro/Catalog/Query/GSC.pm
+%%SITE_PERL%%/Astro/Catalog/Query/MPC.pm
+%%SITE_PERL%%/Astro/Catalog/Query/SIMBAD.pm
+%%SITE_PERL%%/Astro/Catalog/Query/Sesame.pm
+%%SITE_PERL%%/Astro/Catalog/Query/SkyCat.pm
 %%SITE_PERL%%/Astro/Catalog/Query/SuperCOSMOS.pm
 %%SITE_PERL%%/Astro/Catalog/Query/USNOA2.pm
 %%SITE_PERL%%/Astro/Catalog/Query/Vizier.pm
-%%SITE_PERL%%/Astro/Catalog/Query/Sesame.pm
-%%SITE_PERL%%/Astro/Catalog/Query/SIMBAD.pm
-%%SITE_PERL%%/Astro/Catalog/Query/MPC.pm
-%%SITE_PERL%%/Astro/Catalog/Query/CMC.pm
-%%SITE_PERL%%/Astro/Catalog/Query/GSC.pm
+%%SITE_PERL%%/Astro/Catalog/Star.pm
 %%SITE_PERL%%/Astro/Catalog/Star/Morphology.pm
 %%SITE_PERL%%/Astro/Catalog/Transport/REST.pm
 %%SITE_PERL%%/Astro/Catalog/Transport/WebService.pm
 %%SITE_PERL%%/Tk/AstroCatalog.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Catalog
-@dirrm %%SITE_PERL%%/Astro/Catalog/IO
-@dirrm %%SITE_PERL%%/Astro/Catalog/Item
-@dirrm %%SITE_PERL%%/Astro/Catalog/Query
-@dirrm %%SITE_PERL%%/Astro/Catalog/Star
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
+@dirrmtry %%SITE_PERL%%/Tk
 @dirrm %%SITE_PERL%%/Astro/Catalog/Transport
+@dirrm %%SITE_PERL%%/Astro/Catalog/Star
+@dirrm %%SITE_PERL%%/Astro/Catalog/Query
+@dirrm %%SITE_PERL%%/Astro/Catalog/Item
+@dirrm %%SITE_PERL%%/Astro/Catalog/IO
 @dirrm %%SITE_PERL%%/Astro/Catalog
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
 @dirrmtry %%SITE_PERL%%/Astro
-@dirrmtry %%SITE_PERL%%/Tk