4 files changed, 101 insertions, 26 deletions

diff --git a/astro/p5-Astro-Catalog/Makefile b/astro/p5-Astro-Catalog/Makefile
index f876f670234c..ede26aba7f2c 100644
--- a/astro/p5-Astro-Catalog/Makefile
+++ b/astro/p5-Astro-Catalog/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:	Astro-Catalog
-# Date created:			Oct 19, 2002
-# Whom:				ijliao
+# Date created:				Oct 19, 2002
+# Whom:					ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Astro-Catalog
-PORTVERSION=	2.1.3
+PORTVERSION=	3.9.9
 CATEGORIES=	astro perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		http://www.estar.org.uk/software/
@@ -22,12 +22,55 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN1=	catalogs.1 supercosmos.1 finder.1
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=	Astro::Catalog.3 \
-	Astro::Catalog::GSC::Query.3 \
-	Astro::Catalog::Star.3 \
-	Astro::Catalog::SuperCOSMOS::Query.3 \
-	Astro::Catalog::USNOA2::Query.3
+CONFIG=		sss.cfg skycat.cfg
 
-.include <bsd.port.mk>
+MAN3=		Astro::Catalog.3 \
+		Astro::Catalog::IO::ASCII.3 \
+		Astro::Catalog::IO::Astrom.3 \
+		Astro::Catalog::IO::Binary.3 \
+		Astro::Catalog::IO::Cluster.3 \
+		Astro::Catalog::IO::FINDOFF.3 \
+		Astro::Catalog::IO::FITSTable.3 \
+		Astro::Catalog::IO::GaiaPick.3 \
+		Astro::Catalog::IO::JCMT.3 \
+		Astro::Catalog::IO::SExtractor.3 \
+		Astro::Catalog::IO::STL.3 \
+		Astro::Catalog::IO::Simple.3 \
+		Astro::Catalog::IO::TST.3 \
+		Astro::Catalog::IO::UKIRTBS.3 \
+		Astro::Catalog::IO::VOTable.3 \
+		Astro::Catalog::Query.3 \
+		Astro::Catalog::Query::2MASS.3 \
+		Astro::Catalog::Query::CMC.3 \
+		Astro::Catalog::Query::GSC.3 \
+		Astro::Catalog::Query::MPC.3 \
+		Astro::Catalog::Query::SIMBAD.3 \
+		Astro::Catalog::Query::Sesame.3 \
+		Astro::Catalog::Query::SkyCat.3 \
+		Astro::Catalog::Query::SuperCOSMOS.3 \
+		Astro::Catalog::Query::USNOA2.3 \
+		Astro::Catalog::Query::Vizier.3 \
+		Astro::Catalog::Star.3 \
+		Astro::Catalog::Star::Morphology.3 \
+		Astro::Catalog::Transport::REST.3 \
+		Astro::Catalog::Transport::WebService.3 \
+		Tk::AstroCatalog.3
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500601
+IGNORE=		requires perl 5.6.x or later. Install lang/perl5 then try again
+.endif
+
+post-patch:
+	@${PERL} -pi -e "s!^(my.*cfg_to_install).*!\$$1=\"\";!;" ${WRKSRC}/Makefile.PL
+
+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}
+.endif
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/astro/p5-Astro-Catalog/distinfo b/astro/p5-Astro-Catalog/distinfo
index bfada9a8a2ed..796b02337e30 100644
--- a/astro/p5-Astro-Catalog/distinfo
+++ b/astro/p5-Astro-Catalog/distinfo
@@ -1,3 +1,3 @@
-MD5 (Astro-Catalog-2.1.3.tar.gz) = 7a48f16dff53ec5f496ea938fc8279cb
-SHA256 (Astro-Catalog-2.1.3.tar.gz) = 0558b144bae8a3712d720d00c65cdcbba0652231c4b23d0934f0fbe836b71c6e
-SIZE (Astro-Catalog-2.1.3.tar.gz) = 72121
+MD5 (Astro-Catalog-3.9.9.tar.gz) = 1678c1d471b18d0a4de2944165a03d91
+SHA256 (Astro-Catalog-3.9.9.tar.gz) = 0880fafd18ca283030e30abd14fa351f7d80b0d6ce0c08f730cf158f3cab92b3
+SIZE (Astro-Catalog-3.9.9.tar.gz) = 207437
diff --git a/astro/p5-Astro-Catalog/pkg-descr b/astro/p5-Astro-Catalog/pkg-descr
index 89b891928bb2..e13a8c878c5b 100644
--- a/astro/p5-Astro-Catalog/pkg-descr
+++ b/astro/p5-Astro-Catalog/pkg-descr
@@ -1,3 +1,3 @@
 A generic object orientated astronomical catalogue object.
 
-WWW: http://www.estar.org.uk/
+WWW: http://search.cpan.org/dist/Astro-Catalog/
diff --git a/astro/p5-Astro-Catalog/pkg-plist b/astro/p5-Astro-Catalog/pkg-plist
index d3b9597b8666..276ff06132c8 100644
--- a/astro/p5-Astro-Catalog/pkg-plist
+++ b/astro/p5-Astro-Catalog/pkg-plist
@@ -1,16 +1,48 @@
-bin/catalogs
-bin/finder
-bin/supercosmos
+@comment $FreeBSD$
+@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
 %%SITE_PERL%%/Astro/Catalog.pm
-%%SITE_PERL%%/Astro/Catalog/GSC/Query.pm
+%%SITE_PERL%%/Astro/Catalog/Query.pm
 %%SITE_PERL%%/Astro/Catalog/Star.pm
-%%SITE_PERL%%/Astro/Catalog/SuperCOSMOS/Query.pm
-%%SITE_PERL%%/Astro/Catalog/USNOA2/Query.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Catalog/.packlist
-@dirrm %%SITE_PERL%%/Astro/Catalog/GSC
-@dirrm %%SITE_PERL%%/Astro/Catalog/SuperCOSMOS
-@dirrm %%SITE_PERL%%/Astro/Catalog/USNOA2
-@dirrm %%SITE_PERL%%/Astro/Catalog
+%%SITE_PERL%%/Astro/Catalog/IO/Simple.pm
+%%SITE_PERL%%/Astro/Catalog/IO/FINDOFF.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/TST.pm
+%%SITE_PERL%%/Astro/Catalog/IO/ASCII.pm
+%%SITE_PERL%%/Astro/Catalog/Query/SkyCat.pm
+%%SITE_PERL%%/Astro/Catalog/Query/2MASS.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/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/Query
+@dirrm %%SITE_PERL%%/Astro/Catalog/Star
+@dirrm %%SITE_PERL%%/Astro/Catalog/Transport
+@dirrm %%SITE_PERL%%/Astro/Catalog
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
 @unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true