[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openbsd-ports
Subject:    Re: cfitsio
From:       Marc Espie <espie () nerim ! net>
Date:       2022-07-19 9:16:45
Message-ID: YtZ2fXKRWX8iwrrf () nausicaa ! home
[Download RAW message or body]

On Sun, Jul 17, 2022 at 03:57:33PM +0200, Jeremie Courreges-Anglas wrote:
> On Sun, Jul 17 2022, Marc Espie <espie@nerim.net> wrote:
> > Anyone got an update for cfitsio ?
> > our port is somewhat ancient.
> 
> I have an update to 4.1.0, but I'd like to clean up the existing
> ports first.
> 
> > I noticed while looking at siril, which tries to detect
> > cfitsio thru pkgconfig, and it seems easier to update
> > cfitsio than patching siril ;)
> 
> Does the diff below (which adds the pkgconfig file) help, or do you
> really need an update for your siril port?
> 
> ok?
> 
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/cfitsio/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile	11 Mar 2022 19:36:13 -0000	1.15
> +++ Makefile	17 Jul 2022 13:55:24 -0000
> @@ -6,7 +6,7 @@ HOMEPAGE=	https://heasarc.gsfc.nasa.gov/
>  DISTNAME=	cfitsio3450
>  
>  PKGNAME=	cfitsio-3.450
> -REVISION=	0
> +REVISION=	1
>  
>  SHARED_LIBS +=  cfitsio                   1.0 # 0.0
>  
> @@ -37,24 +37,17 @@ WRKDIST=	${WRKDIR}/cfitsio
>  post-patch:
>  	sed -i 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/*.[chl] ${WRKSRC}/zlib/*.h
>  
> -do-install:
> -	${INSTALL_DATA} ${WRKDIST}/{fitsio.h,fitsio2.h,longnam.h,drvrsmem.h,fpack.h} \
> -		${PREFIX}/include
> -	${INSTALL_DATA}	${WRKBUILD}/libcfitsio.a ${PREFIX}/lib
> -	${INSTALL_DATA} ${WRKBUILD}/libcfitsio${SHLIB_SUFFIX} ${PREFIX}/lib
> +post-install:
>  	${INSTALL_DATA_DIR} ${DOCDIR}
>  	${INSTALL_DATA} ${WRKDIST}/License.txt ${DOCDIR}
>  	${INSTALL_DATA} ${WRKDIST}/README ${DOCDIR}
>  	${INSTALL_DATA} ${WRKDIST}/docs/*.doc ${DOCDIR}
> -	${INSTALL_PROGRAM} ${WRKBUILD}/{fitscopy,imcopy,funpack,fpack} \
> -		${PREFIX}/bin
>  	${INSTALL_DATA} ${WRKBUILD}/cookbook.c ${DOCDIR}
> -
> -TEST_DEPENDS=	${BASE_PKGPATH}
> +	rm -f ${PREFIX}/bin/{cookbook,speed,testprog}
>  
>  do-test:
>  	cd ${WRKBUILD} && ${MAKE} testprog
> -	cd ${WRKBUILD} && ./testprog >testprog.lis
> +	cd ${WRKBUILD} && LD_LIBRARY_PATH="${WRKBUILD}:" ./testprog >testprog.lis
>  	diff ${WRKBUILD}/testprog.lis ${WRKBUILD}/testprog.out
>  	cmp ${WRKBUILD}/testprog.fit ${WRKBUILD}/testprog.std
>  
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/math/cfitsio/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST	11 Mar 2022 19:36:13 -0000	1.4
> +++ pkg/PLIST	17 Jul 2022 13:55:24 -0000
> @@ -2,13 +2,14 @@
>  @bin bin/fpack
>  @bin bin/funpack
>  @bin bin/imcopy
> +@bin bin/smem
>  include/drvrsmem.h
>  include/fitsio.h
>  include/fitsio2.h
> -include/fpack.h
>  include/longnam.h
> -lib/libcfitsio.a
> +@static-lib lib/libcfitsio.a
>  @lib lib/libcfitsio.so.${LIBcfitsio_VERSION}
> +lib/pkgconfig/cfitsio.pc
>  share/doc/cfitsio/
>  share/doc/cfitsio/License.txt
>  share/doc/cfitsio/README
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 
> 
This seems to do the job, where siril is concerned.

Please add "astro" to CATEGORIES.  I'm pretty sure the format is only
ever used for astronomical images ;)

[prev in list] [next in list] [prev in thread] [next in thread]