astro/astrometry: Move man to share/man

While here, also
- update LIB_DEPENDS=graphics/png
- add augment-xylist to strip list
- correct pkg-message paths
- update pkg-plist

3 files changed, 41 insertions, 39 deletions

diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index fb5919ed36df..26a3d7a07341 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	astrometry
 PORTVERSION=	0.94
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	https://github.com/dstndstn/${PORTNAME}.net/releases/download/${DISTVERSION}/
 DISTNAME=	${PORTNAME}.net-${PORTVERSION}
@@ -17,8 +18,8 @@ BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libcfitsio.so:astro/cfitsio \
 		libgsl.so:math/gsl \
-		libpng.so:graphics/png \
 		libnetpbm.so:graphics/netpbm \
+		libpng16.so:graphics/png \
 		libwcs.so:astro/wcslib
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astropy>0:astro/py-astropy@${PY_FLAVOR} \
 		${PYNUMPY}
@@ -35,7 +36,7 @@ MAKE_ENV=	INSTALL_DIR=${STAGEDIR}${PREFIX} \
 		DATA_INSTALL_DIR=${STAGEDIR}${DATADIR} \
 		DOC_INSTALL_DIR=${STAGEDIR}${DOCSDIR} \
 		EXAMPLE_INSTALL_DIR=${STAGEDIR}${EXAMPLESDIR} \
-		MAN1_INSTALL_DIR=${STAGEDIR}${PREFIX}/man/man1 \
+		MAN1_INSTALL_DIR=${STAGEDIR}${PREFIX}/share/man/man1 \
 		PY_BASE_INSTALL_DIR=${STAGEDIR}${PYTHON_LIBDIR}/astrometry \
 		PYTHON=${PYTHON_CMD} PYTHON_SCRIPT=${PYTHON_CMD}
 MAKE_JOBS_UNSAFE=	yes
@@ -49,7 +50,7 @@ SUB_FILES=	pkg-message
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	EXAMPLES
 
-FILES=	an-fitstopnm an-pnmtofits astrometry-engine \
+FILES=	an-fitstopnm an-pnmtofits astrometry-engine augment-xylist \
 	build-astrometry-index downsample-fits fit-wcs \
 	fits-column-merge fits-flip-endian fits-guess-scale \
 	fitscopy fitsgetext fitsverify get-healpix get-wcs \
diff --git a/astro/astrometry/files/pkg-message.in b/astro/astrometry/files/pkg-message.in
index 37484df4e176..fc9881d595b6 100644
--- a/astro/astrometry/files/pkg-message.in
+++ b/astro/astrometry/files/pkg-message.in
@@ -3,14 +3,15 @@
   message: <<EOM
 Astrometry was successfully installed.
 
-You'll find this distribution under %%PREFIX%%. Examples are found
-under %%PREFIX%%/astrometry/examples. See %%PREFIX%%/astrometry/doc/
-for some info, more detailed at http://astrometry.net/use.html and
-http://astrometry.net/doc/readme.html.
+You'll find this distribution under %%PREFIX%%.
+Examples are found under %%EXAMPLESDIR%%.
+See %%DOCSDIR%% for some info, more detailed at
+http://astrometry.net/use.html and http://astrometry.net/doc/readme.html.
 
 Although the code is released under a GPL license, you will also need
 to download some data files, and these are distributed under different
-license. Data files (indexes) should be stored under %%DATADIR%%/
+licenses. Data files (indexes) should be stored under
+%%DATADIR%%/
 EOM
 }
 ]
diff --git a/astro/astrometry/pkg-plist b/astro/astrometry/pkg-plist
index 30533c19b021..5ea6505470f4 100644
--- a/astro/astrometry/pkg-plist
+++ b/astro/astrometry/pkg-plist
@@ -253,37 +253,6 @@ lib/libqfits.a
 %%PYTHON_LIBDIR%%/astrometry/util/usnob_get_image.py
 %%PYTHON_LIBDIR%%/astrometry/util/usnob_get_region.py
 %%PYTHON_LIBDIR%%/astrometry/util/util.py
-man/man1/an-fitstopnm.1.gz
-man/man1/an-pnmtofits.1.gz
-man/man1/astrometry-engine.1.gz
-man/man1/build-astrometry-index.1.gz
-man/man1/coadd.1.gz
-man/man1/downsample-fits.1.gz
-man/man1/fit-wcs.1.gz
-man/man1/fits-flip-endian.1.gz
-man/man1/fits-guess-scale.1.gz
-man/man1/fitsgetext.1.gz
-man/man1/get-healpix.1.gz
-man/man1/get-wcs.1.gz
-man/man1/hpsplit.1.gz
-man/man1/image2xy.1.gz
-man/man1/new-wcs.1.gz
-man/man1/pad-file.1.gz
-man/man1/plot-constellations.1.gz
-man/man1/plotquad.1.gz
-man/man1/plotxy.1.gz
-man/man1/query-starkd.1.gz
-man/man1/solve-field.1.gz
-man/man1/subtable.1.gz
-man/man1/tabsort.1.gz
-man/man1/wcs-grab.1.gz
-man/man1/wcs-match.1.gz
-man/man1/wcs-pv2sip.1.gz
-man/man1/wcs-rd2xy.1.gz
-man/man1/wcs-resample.1.gz
-man/man1/wcs-to-tan.1.gz
-man/man1/wcs-xy2rd.1.gz
-man/man1/wcsinfo.1.gz
 %%DATADIR%%/catalogs/abell-all.fits
 %%DATADIR%%/catalogs/brightstars.fits
 %%DATADIR%%/catalogs/openngc-ic.fits
@@ -322,3 +291,34 @@ man/man1/wcsinfo.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sdss.jpg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sdss.xyls
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tycho2-mag6.fits
+share/man/man1/an-fitstopnm.1.gz
+share/man/man1/an-pnmtofits.1.gz
+share/man/man1/astrometry-engine.1.gz
+share/man/man1/build-astrometry-index.1.gz
+share/man/man1/coadd.1.gz
+share/man/man1/downsample-fits.1.gz
+share/man/man1/fit-wcs.1.gz
+share/man/man1/fits-flip-endian.1.gz
+share/man/man1/fits-guess-scale.1.gz
+share/man/man1/fitsgetext.1.gz
+share/man/man1/get-healpix.1.gz
+share/man/man1/get-wcs.1.gz
+share/man/man1/hpsplit.1.gz
+share/man/man1/image2xy.1.gz
+share/man/man1/new-wcs.1.gz
+share/man/man1/pad-file.1.gz
+share/man/man1/plot-constellations.1.gz
+share/man/man1/plotquad.1.gz
+share/man/man1/plotxy.1.gz
+share/man/man1/query-starkd.1.gz
+share/man/man1/solve-field.1.gz
+share/man/man1/subtable.1.gz
+share/man/man1/tabsort.1.gz
+share/man/man1/wcs-grab.1.gz
+share/man/man1/wcs-match.1.gz
+share/man/man1/wcs-pv2sip.1.gz
+share/man/man1/wcs-rd2xy.1.gz
+share/man/man1/wcs-resample.1.gz
+share/man/man1/wcs-to-tan.1.gz
+share/man/man1/wcs-xy2rd.1.gz
+share/man/man1/wcsinfo.1.gz