git: 3ee07bfd8d74 - main - astro/wcslib: Update to 7.7

Tue Sep 21 18:21:25 UTC 2021

The branch main has been updated by danilo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3ee07bfd8d740c974302a363db0b634d58da774b

commit 3ee07bfd8d740c974302a363db0b634d58da774b
Author:     Danilo Egea Gondolfo <danilo at FreeBSD.org>
AuthorDate: 2021-09-21 18:19:51 +0000
Commit:     Danilo Egea Gondolfo <danilo at FreeBSD.org>
CommitDate: 2021-09-21 18:21:13 +0000

    astro/wcslib: Update to 7.7
    
    Drop maintainership.
---
 astro/astrometry/Makefile            |  2 +-
 astro/gnuastro/Makefile              |  2 +-
 astro/kstars/Makefile                |  1 +
 astro/stellarsolver/Makefile         |  1 +
 astro/wcslib/Makefile                |  5 ++---
 astro/wcslib/distinfo                |  6 +++---
 astro/wcslib/files/patch-GNUmakefile | 25 +++++++++++++------------
 astro/wcslib/pkg-plist               |  6 +++++-
 8 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index 182738c1f8f7..7588113e85ee 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	astrometry
 PORTVERSION=	0.85
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	http://astrometry.net/downloads/
 DISTNAME=	${PORTNAME}.net-${PORTVERSION}
diff --git a/astro/gnuastro/Makefile b/astro/gnuastro/Makefile
index cb759943ed23..291037a24c7e 100644
--- a/astro/gnuastro/Makefile
+++ b/astro/gnuastro/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gnuastro
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	GNU
 
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 3c6063a48701..7f23acc04fd6 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kstars
 DISTVERSION=	3.5.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	astro kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
diff --git a/astro/stellarsolver/Makefile b/astro/stellarsolver/Makefile
index 3d633d899f3d..dd8cf78424dd 100644
--- a/astro/stellarsolver/Makefile
+++ b/astro/stellarsolver/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	stellarsolver
 DISTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	astro
 
 MAINTAINER=	acm at FreeBSD.org
diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile
index 85c305bc60c7..d0aa19896b7a 100644
--- a/astro/wcslib/Makefile
+++ b/astro/wcslib/Makefile
@@ -1,12 +1,11 @@
 # Created by: Tony Maher <tonymaher at optusnet.com.au>
 
 PORTNAME=	wcslib
-PORTVERSION=	7.3.1
-PORTREVISION=	1
+PORTVERSION=	7.7
 CATEGORIES=	astro
 MASTER_SITES=	ftp://ftp.atnf.csiro.au/pub/software/wcslib/
 
-MAINTAINER=	danilo at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Library for parsing/generating FITS headers
 
 LICENSE=	GPLv3
diff --git a/astro/wcslib/distinfo b/astro/wcslib/distinfo
index 1455774e5dda..c1ed8943ae89 100644
--- a/astro/wcslib/distinfo
+++ b/astro/wcslib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603992247
-SHA256 (wcslib-7.3.1.tar.bz2) = ccfc220d353b489c72a8cfce8fe5c4479e2ad0dc0824a4480262274ae5b80b5c
-SIZE (wcslib-7.3.1.tar.bz2) = 2434274
+TIMESTAMP = 1632217196
+SHA256 (wcslib-7.7.tar.bz2) = a708e6b4e90e2cd6427434715b591bb9c3d4005c99725ec494b8e0bed2de5355
+SIZE (wcslib-7.7.tar.bz2) = 2515760
diff --git a/astro/wcslib/files/patch-GNUmakefile b/astro/wcslib/files/patch-GNUmakefile
index 5f9edbf17df0..cdbfea8d462d 100644
--- a/astro/wcslib/files/patch-GNUmakefile
+++ b/astro/wcslib/files/patch-GNUmakefile
@@ -1,8 +1,16 @@
---- GNUmakefile.orig	2017-10-17 22:17:55 UTC
+--- GNUmakefile.orig	2021-09-21 09:42:55 UTC
 +++ GNUmakefile
-@@ -81,26 +81,14 @@ install :
+@@ -83,27 +83,15 @@ install :
+ 	 @ for DIR in $(INSTDIR) ; do \
  	     $(MAKE) -k -C $$DIR $@ ; \
  	   done
+-	   if [ ! -d "$(LIBDIR)/pkgconfig" ] ; then \
+-	     $(INSTALL) -d -m 775 $(LIBDIR)/pkgconfig ; \
++	   if [ ! -d "%%PKGDIR%%/pkgconfig" ] ; then \
++	     $(INSTALL) -d -m 775 %%PKGDIR%%/pkgconfig ; \
+ 	   fi
+-	   $(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc
++	   $(INSTALL) -m 444 wcslib.pc %%PKGDIR%%/pkgconfig/wcslib.pc
  	   $(INSTALL) -m 444 wcsconfig.h wcsconfig_f77.h $(INCDIR)
 -	-  if [ ! -d "$(DOCDIR)" ] ; then \
 -	     $(INSTALL) -d -m 775 $(DOCDIR) ; \
@@ -14,19 +22,12 @@
  	   fi
 -	-  if [ ! -d "$(PDFDIR)" ] ; then \
 -	     $(INSTALL) -d -m 775 $(PDFDIR) ; \
-+	   if [ ! -d "%%PKGDIR%%/pkgconfig" ] ; then \
-+	     $(INSTALL) -d -m 775 "%%PKGDIR%%/pkgconfig" ; \
- 	   fi
+-	   fi
 -	   $(INSTALL) -m 444 wcslib.pdf $(PDFDIR)
 -	-  if [ ! -d "$(HTMLDIR)/html" ] ; then \
 -	     $(INSTALL) -d -m 775 $(HTMLDIR)/html ; \
 -	   fi
 -	   $(INSTALL) -m 444 html/* $(HTMLDIR)/html
--	   if [ ! -d "$(LIBDIR)/pkgconfig" ] ; then \
--	     $(INSTALL) -d -m 775 $(LIBDIR)/pkgconfig ; \
--	   fi
--	   $(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc
-+	   $(INSTALL) -m 444 wcslib.pc %%PKGDIR%%/pkgconfig/wcslib.pc
  
- clean cleaner :
- 	   for DIR in $(SUBDIRS) doxygen ; do \
+ uninstall :
+ 	 @ for DIR in $(INSTDIR) ; do \
diff --git a/astro/wcslib/pkg-plist b/astro/wcslib/pkg-plist
index 8c4ffc7f53b8..53f3a155025a 100644
--- a/astro/wcslib/pkg-plist
+++ b/astro/wcslib/pkg-plist
@@ -1,5 +1,7 @@
 %%CFITSIO%%bin/HPXcvt
 bin/fitshdr
+bin/sundazel
+bin/tofits
 %%CFITSIO%%%%PGPLOT%%bin/wcsgrid
 %%CFITSIO%%bin/wcsware
 include/wcslib
@@ -55,10 +57,12 @@ lib/libwcs-%%VERSION%%.a
 lib/libwcs.a
 lib/libwcs.so
 lib/libwcs.so.7
-lib/libwcs.so.7.3.1
+lib/libwcs.so.7.7
 libdata/pkgconfig/wcslib.pc
 %%CFITSIO%%man/man1/HPXcvt.1.gz
 man/man1/fitshdr.1.gz
+man/man1/sundazel.1.gz
+man/man1/tofits.1.gz
 %%CFITSIO%%%%PGPLOT%%man/man1/wcsgrid.1.gz
 %%CFITSIO%%man/man1/wcsware.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
