diff -urN astrometry.orig/Makefile astrometry/Makefile --- astrometry.orig/Makefile 2020-04-28 12:47:38.000000000 +0200 +++ astrometry/Makefile 2020-04-30 12:49:14.298513000 +0200 @@ -3,12 +3,13 @@ PORTNAME= astrometry PORTVERSION= 0.80 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= http://astrometry.net/downloads/ DISTNAME= ${PORTNAME}.net-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= Software for describing astronomical images +COMMENT= Astronomic calibration service LICENSE= GPLv2 @@ -18,22 +19,49 @@ 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 + libnetpbm.so:graphics/netpbm \ + libwcs.so:astro/wcslib RUN_DEPENDS= ${PYNUMPY} -USES= gmake jpeg pkgconfig python shebangfix +USES= gmake jpeg localbase pkgconfig python shebangfix SHEBANG_FILES= bin/* blind/*.py sdss/*.py util/[!c]*.py -USE_LDCONFIG= ${PREFIX}/${PORTNAME}/lib +USE_LDCONFIG= yes + ALL_TARGET= all extra -MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME} \ +MAKE_ARGS= NETPBM_INC="-I${LOCALBASE}/include/netpbm" \ + NETPBM_LIB="-L${LOCALBASE}/lib -lnetpbm" \ + SYSTEM_GSL=yes +MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX} \ + DOC_INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME}/doc \ + EXAMPLE_INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME}/examples \ + MAN1_INSTALL_DIR=${STAGEDIR}${PREFIX}/man/man1 \ PYTHON=${PYTHON_CMD} PYTHON_SCRIPT=${PYTHON_CMD} MAKE_JOBS_UNSAFE= yes +# Changes search path in astrometry-engine +DATA_INSTALL_DIR= ${STAGEDIR}${DATADIR} +# Need this to get gzipped man pages +MANDIRS= ${MANPREFIX}/man/man1 SUB_FILES= pkg-message LDFLAGS+= -lz +# DATA_INSTALL_DIR does not work globally :( post-install: - @${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \ - ${STAGEDIR}${PREFIX}/${PORTNAME}/etc/${PORTNAME}.cfg + @${REINPLACE_CMD} -i '' \ + -e 's|${STAGEDIR}/usr/local/data|${DATADIR}|' \ + ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cfg + @${RMDIR} ${STAGEDIR}${PREFIX}/data + @${MKDIR} ${STAGEDIR}${DATADIR}/sdss + @${MKDIR} ${STAGEDIR}${DATADIR}/blind + @${MKDIR} ${STAGEDIR}${DATADIR}/catalogs + @${INSTALL_DATA} ${WRKSRC}/sdss/testdata/*.fit* ${STAGEDIR}${DATADIR}/sdss + @${INSTALL_DATA} ${WRKSRC}/blind/index-9918.fits ${STAGEDIR}${DATADIR}/blind + @${INSTALL_DATA} ${WRKSRC}/catalogs/*.fit* ${STAGEDIR}${DATADIR}/catalogs +## doc/install_astrometry_on_linux.sh: +# download and install index files +#rm -rf /usr/local/astrometry/data/* && \ +#wget -r -nd -np -P /usr/local/astrometry/data/ "data.astrometry.net/4100/" && \ +#wget -r -nd -np -P /usr/local/astrometry/data/ "data.astrometry.net/5000/" .include diff -urN astrometry.orig/files/os-features-config.h astrometry/files/os-features-config.h --- astrometry.orig/files/os-features-config.h 2018-03-07 07:01:03.000000000 +0100 +++ astrometry/files/os-features-config.h 2020-04-29 18:13:57.852138000 +0200 @@ -2,4 +2,4 @@ #define NEED_DECLARE_QSORT_R 1 #define NEED_QSORT_R 0 #define NEED_SWAP_QSORT_R 0 -#define HAVE_NETPBM 0 +#define HAVE_NETPBM 1 diff -urN astrometry.orig/files/pkg-message.in astrometry/files/pkg-message.in --- astrometry.orig/files/pkg-message.in 2019-08-14 07:39:38.000000000 +0200 +++ astrometry/files/pkg-message.in 2020-04-30 11:49:44.193337000 +0200 @@ -3,11 +3,14 @@ message: <