4 files changed, 193 insertions, 11 deletions

diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index 2828230dd088..74c9cca85fbb 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -1,4 +1,3 @@
-
 # New ports collection makefile for:    astrometry
 # Date created:                         7 July 2009
 # Whom:                                 Dereckson <dereckson@gmail.com>
@@ -7,8 +6,7 @@
 #
 
 PORTNAME=	astrometry
-PORTVERSION=	0.25
-PORTREVISION=	3
+PORTVERSION=	0.34
 CATEGORIES=	astro
 MASTER_SITES=	http://www.astrometry.net/downloads/
 DISTNAME=	astrometry.net-${PORTVERSION}
diff --git a/astro/astrometry/distinfo b/astro/astrometry/distinfo
index 82b5f21ac321..2122d1cc7594 100644
--- a/astro/astrometry/distinfo
+++ b/astro/astrometry/distinfo
@@ -1,3 +1,3 @@
-MD5 (astrometry.net-0.25.tar.gz) = c38ffead18008e616293f4bd7e4d3df2
-SHA256 (astrometry.net-0.25.tar.gz) = b6d0a80fe452c8bb2cc359a06fb9a79cbf62575f349077367ca86dd4696d8dbf
-SIZE (astrometry.net-0.25.tar.gz) = 4929438
+MD5 (astrometry.net-0.34.tar.gz) = dd700b4bd80f556b528a065eaa959781
+SHA256 (astrometry.net-0.34.tar.gz) = 77d42ea31566f0486cce0ce4cab22e82001a5d7c8d40acc95631505e4f590d72
+SIZE (astrometry.net-0.34.tar.gz) = 5540368
diff --git a/astro/astrometry/pkg-descr b/astro/astrometry/pkg-descr
index c3257f8072a4..2f308bbf9de3 100644
--- a/astro/astrometry/pkg-descr
+++ b/astro/astrometry/pkg-descr
@@ -1,7 +1,7 @@
 If you have astronomical imaging of the sky with celestial coordinates you do
 not know or do not trust then is for you. Input an image and we'll give you
 back astrometric calibration meta-data, plus lists of known objects falling
-inside the field of view.Astrometry.net
+inside the field of view.
 
 We have built this astrometric calibration service to create correct,
 standards-compliant astrometric meta-data for every useful astronomical image
diff --git a/astro/astrometry/pkg-plist b/astro/astrometry/pkg-plist
index 98fe19314edb..f070533dc7ff 100644
--- a/astro/astrometry/pkg-plist
+++ b/astro/astrometry/pkg-plist
@@ -3,17 +3,20 @@ astrometry/bin/add-healpix-column
 astrometry/bin/add-text
 astrometry/bin/agreeable
 astrometry/bin/an-fitstopnm
+astrometry/bin/an-pnmtofits
 astrometry/bin/augment-xylist
 astrometry/bin/backend
 astrometry/bin/blind
 astrometry/bin/build-an-catalog
+astrometry/bin/build-index
 astrometry/bin/certifiable
 astrometry/bin/checktree
 astrometry/bin/codetree
 astrometry/bin/column-merge
 astrometry/bin/control-program
 astrometry/bin/cut-an
-astrometry/bin/endian-flip-index
+astrometry/bin/downsample-fits
+astrometry/bin/fits-dedup
 astrometry/bin/fits-flip-endian
 astrometry/bin/fits-guess-scale
 astrometry/bin/fits2fits.py
@@ -30,37 +33,51 @@ astrometry/bin/image2xy
 astrometry/bin/imarith
 astrometry/bin/imcopy
 astrometry/bin/imstat
+astrometry/bin/index-info
 astrometry/bin/index-to-table
 astrometry/bin/listhead
 astrometry/bin/liststruc
+astrometry/bin/local-index
 astrometry/bin/merge-index
 astrometry/bin/mergesolved
 astrometry/bin/modhead
 astrometry/bin/new-wcs
 astrometry/bin/nomadtofits
+astrometry/bin/pad-file
 astrometry/bin/plot-constellations
 astrometry/bin/plotcat
 astrometry/bin/plotquad
+astrometry/bin/plotstuff
 astrometry/bin/plotxy
 astrometry/bin/printsolved
+astrometry/bin/query-starkd
 astrometry/bin/rdlsinfo
+astrometry/bin/removelines.py
 astrometry/bin/resort-xylist
+astrometry/bin/search-index
 astrometry/bin/setsolved
+astrometry/bin/smooth-image
 astrometry/bin/solve-field
 astrometry/bin/solvedserver
 astrometry/bin/startree
+astrometry/bin/startree2
 astrometry/bin/subtable
+astrometry/bin/subwcs
 astrometry/bin/tablist
 astrometry/bin/tabmerge
 astrometry/bin/tabsort
 astrometry/bin/tycho2tofits
+astrometry/bin/uniformize-catalog
+astrometry/bin/uniformize.py
 astrometry/bin/unpermute-quads
 astrometry/bin/unpermute-stars
 astrometry/bin/usnobtofits
-astrometry/bin/wcs-annotate
+astrometry/bin/wcs-grab
 astrometry/bin/wcs-rd2xy
+astrometry/bin/wcs-resample
 astrometry/bin/wcs-xy2rd
 astrometry/bin/wcsinfo
+astrometry/bin/whynot
 astrometry/bin/xylist2fits
 astrometry/bin/xylsinfo
 astrometry/doc/CREDITS
@@ -82,25 +99,192 @@ astrometry/examples/apod5.jpg
 astrometry/examples/apod5.xyls
 astrometry/examples/sdss.jpg
 astrometry/examples/sdss.xyls
+astrometry/include/2mass-fits.h
+astrometry/include/2mass.h
+astrometry/include/allquads.h
+astrometry/include/an-bool.h
+astrometry/include/an-catalog.h
+astrometry/include/an-endian.h
+astrometry/include/an-opts.h
+astrometry/include/an-thread-pthreads.h
+astrometry/include/an-thread.h
+astrometry/include/anqfits.h
+astrometry/include/augment-xylist.h
+astrometry/include/axyfile.h
+astrometry/include/backend.h
+astrometry/include/bl-nl.h
+astrometry/include/bl-nl.inc
+astrometry/include/bl-nl.ph
+astrometry/include/bl.h
+astrometry/include/bl.inc
+astrometry/include/bl.ph
+astrometry/include/blind.h
+astrometry/include/blind_wcs.h
+astrometry/include/blindutils.h
+astrometry/include/brightstars.h
+astrometry/include/bt.h
+astrometry/include/build-index.h
+astrometry/include/cairoutils.h
+astrometry/include/catalog.h
+astrometry/include/coadd.h
+astrometry/include/codefile.h
+astrometry/include/codekd.h
+astrometry/include/codetree.h
+astrometry/include/constellations.h
+astrometry/include/convolve-image.h
+astrometry/include/ctmf.h
+astrometry/include/dimage.h
+astrometry/include/dualtree.h
+astrometry/include/dualtree_nearestneighbour.h
+astrometry/include/dualtree_rangesearch.h
+astrometry/include/errors.h
+astrometry/include/fits-guess-scale.h
+astrometry/include/fitsbin.h
+astrometry/include/fitsfile.h
+astrometry/include/fitsioutils.h
+astrometry/include/fitstable.h
+astrometry/include/gslutils.h
+astrometry/include/hd.h
+astrometry/include/healpix-utils.h
+astrometry/include/healpix.h
+astrometry/include/hpquads.h
+astrometry/include/image2xy-files.h
+astrometry/include/image2xy.h
+astrometry/include/index.h
+astrometry/include/intmap.h
+astrometry/include/ioutils.h
+astrometry/include/kdtree.h
+astrometry/include/kdtree_fits_io.h
+astrometry/include/keywords.h
+astrometry/include/log.h
+astrometry/include/matchfile.h
+astrometry/include/matchobj.h
+astrometry/include/mathutil.h
+astrometry/include/merge-index.h
+astrometry/include/new-wcs.h
+astrometry/include/ngc2000.h
+astrometry/include/ngcic-accurate.h
+astrometry/include/nomad-fits.h
+astrometry/include/nomad.h
+astrometry/include/os-features-config.h
+astrometry/include/os-features.h
+astrometry/include/permutedsort.h
+astrometry/include/plotannotations.h
+astrometry/include/plotfill.h
+astrometry/include/plotgrid.h
+astrometry/include/plotimage.h
+astrometry/include/plotoutline.h
+astrometry/include/plotstuff.h
+astrometry/include/plotxy.h
+astrometry/include/qfits.h
+astrometry/include/qfits_cache.h
+astrometry/include/qfits_convert.h
+astrometry/include/qfits_error.h
+astrometry/include/qfits_filename.h
+astrometry/include/qfits_header.h
+astrometry/include/qfits_image.h
+astrometry/include/qfits_keywords.h
+astrometry/include/qfits_md5.h
+astrometry/include/qfits_memory.h
+astrometry/include/qfits_rw.h
+astrometry/include/qfits_std.h
+astrometry/include/qfits_table.h
+astrometry/include/qfits_time.h
+astrometry/include/qfits_tools.h
+astrometry/include/qidxfile.h
+astrometry/include/quad-builder.h
+astrometry/include/quad-utils.h
+astrometry/include/quadfile.h
+astrometry/include/radix.h
+astrometry/include/rdlist.h
+astrometry/include/resort-xylist.h
+astrometry/include/scamp-catalog.h
+astrometry/include/scamp.h
+astrometry/include/simplexy-common.h
+astrometry/include/simplexy.h
+astrometry/include/sip-utils.h
+astrometry/include/sip.h
+astrometry/include/sip_qfits.h
+astrometry/include/solvedclient.h
+astrometry/include/solvedfile.h
+astrometry/include/solver.h
+astrometry/include/starkd.h
+astrometry/include/starutil.h
+astrometry/include/starutil.inc
+astrometry/include/starxy.h
+astrometry/include/svn.h
+astrometry/include/tabsort.h
+astrometry/include/tic.h
+astrometry/include/tweak.h
+astrometry/include/tweak2.h
+astrometry/include/tycho2-fits.h
+astrometry/include/tycho2.h
+astrometry/include/uniformize-catalog.h
+astrometry/include/unpermute-quads.h
+astrometry/include/unpermute-stars.h
+astrometry/include/usnob-fits.h
+astrometry/include/usnob.h
+astrometry/include/verify.h
+astrometry/include/wcs-rd2xy.h
+astrometry/include/wcs-xy2rd.h
+astrometry/include/xylist.h
+astrometry/lib/libanfiles.a
+astrometry/lib/libanutils.a
+astrometry/lib/libbackend.a
+astrometry/lib/libbackend.so
+astrometry/lib/libkd.a
+astrometry/lib/libqfits.a
 astrometry/python/astrometry/__init__.py
+astrometry/python/astrometry/libkd/__init__.py
+astrometry/python/astrometry/libkd/spherematch.py
+astrometry/python/astrometry/libkd/spherematch_c.so
 astrometry/python/astrometry/util/__init__.py
 astrometry/python/astrometry/util/_healpix.so
 astrometry/python/astrometry/util/_sip.so
+astrometry/python/astrometry/util/casjobs.py
 astrometry/python/astrometry/util/file.py
 astrometry/python/astrometry/util/filetype.py
+astrometry/python/astrometry/util/find_data_file.py
 astrometry/python/astrometry/util/fits2fits.py
+astrometry/python/astrometry/util/fix_sdss_idr.py
 astrometry/python/astrometry/util/healpix.py
 astrometry/python/astrometry/util/image2pnm.py
+astrometry/python/astrometry/util/lsstutils.py
+astrometry/python/astrometry/util/ngc2000.py
+astrometry/python/astrometry/util/pyfits_utils.py
+astrometry/python/astrometry/util/removelines.py
 astrometry/python/astrometry/util/run_command.py
+astrometry/python/astrometry/util/sdss_das.py
+astrometry/python/astrometry/util/sdss_filenames.py
+astrometry/python/astrometry/util/sdss_get_catalog.py
+astrometry/python/astrometry/util/sdss_noise.py
+astrometry/python/astrometry/util/sdss_psf.py
+astrometry/python/astrometry/util/sdss_psfield.py
+astrometry/python/astrometry/util/sdss_radec_to_rcf.py
 astrometry/python/astrometry/util/shell.py
 astrometry/python/astrometry/util/sip.py
+astrometry/python/astrometry/util/sqlcl.py
 astrometry/python/astrometry/util/starutil.py
+astrometry/python/astrometry/util/starutil_numpy.py
+astrometry/python/astrometry/util/uniformize.py
+astrometry/python/astrometry/util/usnob_catalog.py
+astrometry/python/astrometry/util/usnob_get_image.py
+astrometry/python/astrometry/util/usnob_get_region.py
 astrometry/python/astrometry/util/w3c_validator.py
-astrometry/python/pyfits.py
-astrometry/python/rec.py
+astrometry/python/pyfits/NA_pyfits.py
+astrometry/python/pyfits/NP_pyfits.py
+astrometry/python/pyfits/__init__.py
+astrometry/python/pyfits/rec.py
+astrometry/python/pyfits/svn_version.py
+astrometry/ups/astrometry_net.table
+@dirrm astrometry/ups
+@dirrm astrometry/python/pyfits
 @dirrm astrometry/python/astrometry/util
+@dirrm astrometry/python/astrometry/libkd
 @dirrm astrometry/python/astrometry
 @dirrm astrometry/python
+@dirrm astrometry/lib
+@dirrm astrometry/include
 @dirrm astrometry/examples
 @dirrm astrometry/etc
 @dirrm astrometry/doc