I attached revised patch. I did not use EPOCH, because in upstream release note, the version is 3.470 , but the they offered distfile is 3.47. I guess it is a mistake.
I removed www/nghttp2 from LIB_DEPENDS, since it is dependence pulled in by curl, as pointed by Stuart. Comments? OK? wen ________________________________ 发件人: Stuart Henderson <s...@spacehopper.org> 发送时间: 2019年9月13日 19:12 收件人: wen heping <wenheping2...@hotmail.com> 抄送: Rafael Sadowski <raf...@sizeofvoid.org>; ports@openbsd.org <ports@openbsd.org> 主题: Re: 回复: 回复: 回复: [Update] math/cfitsio : Update to 3.47 On 2019/09/12 23:10, wen heping wrote: > ping ... > ________________________________ > 发件人: owner-po...@openbsd.org <owner-po...@openbsd.org> 代表 wen heping > <wenheping2...@hotmail.com> > 发送时间: 2019年8月23日 22:27 > 收件人: Rafael Sadowski <raf...@sizeofvoid.org> > 抄送: ports@openbsd.org <ports@openbsd.org> > 主题: 回复: 回复: [Update] math/cfitsio : Update to 3.47 > > Hi, > > Here is the revised patch, set PKGNAME=${DISTNAME}0. Better to set EPOCH rather than modifying the version number. > > @@ -33,8 +31,6 @@ LIB_DEPENDS+= net/curl \ > > www/nghttp2 It isn't new in your diff, but www/nghttp2 should not be in LIB_DEPENDS, it is an inter-library dependency pulled in by curl.
Index: Makefile =================================================================== RCS file: /cvs/ports/math/cfitsio/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile 12 Jul 2019 20:47:40 -0000 1.13 +++ Makefile 16 Sep 2019 09:59:50 -0000 @@ -5,9 +5,8 @@ CATEGORIES= math graphics devel HOMEPAGE= https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html -DISTNAME= cfitsio3450 - -PKGNAME= cfitsio-3.450 +DISTNAME= cfitsio-3.47 +PKGNAME= ${DISTNAME}0 SHARED_LIBS += cfitsio 1.0 # 0.0 @@ -22,19 +21,16 @@ WANTLIB += c crypto curl m nghttp2 ssl z CONFIGURE_STYLE=gnu #ALL_TARGET= all fitscopy imcopy shared fpack funpack -ALL_TARGET= utils shared +ALL_TARGET= libcfitsio.a shared utils SHLIB_SUFFIX= .so.${LIBcfitsio_VERSION} MAKE_FLAGS= SHLIB_SUFFIX=${SHLIB_SUFFIX} MODULES+= fortran MODFORTRAN_COMPILER= gfortran -LIB_DEPENDS+= net/curl \ - www/nghttp2 +LIB_DEPENDS+= net/curl DOCDIR=${PREFIX}/share/doc/cfitsio - -WRKDIST= ${WRKDIR}/cfitsio post-patch: sed -i 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/*.[chl] ${WRKSRC}/zlib/*.h Index: distinfo =================================================================== RCS file: /cvs/ports/math/cfitsio/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 2 May 2019 13:13:08 -0000 1.5 +++ distinfo 16 Sep 2019 09:59:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (cfitsio3450.tar.gz) = v2AS2+Zo7LIsOZxLeygUVX7igsdKfV3HBOsXww2fuS4= -SIZE (cfitsio3450.tar.gz) = 4738748 +SHA256 (cfitsio-3.47.tar.gz) = QYUW8Q7h4PG1IJJu7Ka3fOY5vtiIBMfFRedPJrPt9O8= +SIZE (cfitsio-3.47.tar.gz) = 4853990 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/math/cfitsio/patches/patch-configure,v retrieving revision 1.1 diff -u -p -r1.1 patch-configure --- patches/patch-configure 2 May 2019 13:13:08 -0000 1.1 +++ patches/patch-configure 16 Sep 2019 09:59:50 -0000 @@ -1,9 +1,9 @@ -$OpenBSD: patch-configure,v 1.1 2019/05/02 13:13:08 rsadowski Exp $ +$OpenBSD$ Index: configure --- configure.orig +++ configure -@@ -4768,7 +4768,7 @@ esac +@@ -4851,7 +4851,7 @@ esac # Darwin uses gcc (=cc), but needs different flags (see above) if test "x$EXT" != xdarwin && test "x$EXT" != xcygwin && test "x$EXT" != xmingw32; then if test "x$GCC" = xyes; then Index: patches/patch-fitsio2_h =================================================================== RCS file: /cvs/ports/math/cfitsio/patches/patch-fitsio2_h,v retrieving revision 1.3 diff -u -p -r1.3 patch-fitsio2_h --- patches/patch-fitsio2_h 3 May 2019 13:32:57 -0000 1.3 +++ patches/patch-fitsio2_h 16 Sep 2019 09:59:50 -0000 @@ -1,4 +1,5 @@ -$OpenBSD: patch-fitsio2_h,v 1.3 2019/05/03 13:32:57 kn Exp $ +$OpenBSD$ + Index: fitsio2.h --- fitsio2.h.orig +++ fitsio2.h