cpet
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 7.11, because siril says our antiquated version is very buggy. 

okay rsadowski@
This commit is contained in:
espie 2022-07-24 17:21:50 +00:00
parent cb596c6bb4
commit c7f7745cdb
7 changed files with 75 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
astro/wcslib/Makefile
View File

@ -1,18 +1,17 @@
BROKEN-hppa= ICE on prj.c:4381
#BROKEN-hppa= ICE on prj.c:4381
COMMENT = implementation of the FITS WCS standard
CATEGORIES = astro devel
DISTNAME = wcslib-5.19.1
REVISION = 1
DISTNAME = wcslib-7.11
HOMEPAGE = https://www.atnf.csiro.au/people/mcalabre/WCS/wcslib/
SHARED_LIBS = wcs 1.1
SHARED_LIBS = wcs 2.0
# LGPLv3+
PERMIT_PACKAGE = Yes
WANTLIB = c cfitsio m
MASTER_SITES = ftp://ftp.atnf.csiro.au/pub/software/wcslib/
MASTER_SITES = http://www.atnf.csiro.au/people/mcalabre/WCS/
EXTRACT_SUFX = .tar.bz2
MODULES = gcc4

4
astro/wcslib/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (wcslib-5.19.1.tar.bz2) = Wbnw5aLAQHc8yEbGhNhMCbmGwTk+l7N4pBuS2dPfD5g=
SIZE (wcslib-5.19.1.tar.bz2) = 2290052
SHA256 (wcslib-7.11.tar.bz2) = Rr77/fUM1JU4lmdqfVcAlNx2YeKulnewkuf7E87j2l8=
SIZE (wcslib-7.11.tar.bz2) = 2946962

15
astro/wcslib/patches/patch-C_GNUmakefile Normal file
View File

@ -0,0 +1,15 @@
Suppresses linked static library nonsense
Index: C/GNUmakefile
--- C/GNUmakefile.orig
+++ C/GNUmakefile
@@ -332,10 +332,6 @@ install : build
$(INSTALL) -m 644 $(WCSLIB) $(LIBDIR) ; \
fi
$(RANLIB) $(LIBDIR)/$(WCSLIB)
- - if [ -h "$(LIBDIR)/libwcs.a" ] ; then \
- $(RM) $(LIBDIR)/libwcs.a ; \
- fi
- $(LN_S) $(WCSLIB) $(LIBDIR)/libwcs.a
if [ "$(SHRLIB)" != "" ] ; then \
$(INSTALL) -m 755 $(SHRLIB) $(LIBDIR) ; \
if [ -h "$(LIBDIR)/$(SONAME)" ] ; then \

37
astro/wcslib/patches/patch-configure_ac
View File

@ -1,7 +1,9 @@
- OpenBSD porting glue
- allow the gmake test to find gmake
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -12,8 +12,13 @@ AC_REVISION([$Revision: 1.5 $])
@@ -12,8 +12,13 @@ AC_REVISION([$Revision: 1.6 $])
AC_SUBST([PACKAGE_VERSION])
AC_DEFINE_UNQUOTED([WCSLIB_VERSION], [$PACKAGE_VERSION], [Define wcslib version])
@ -17,16 +19,25 @@ Index: configure.ac
AC_SUBST([LIBVER])
AC_CONFIG_SRCDIR([C/wcs.h])
@@ -252,6 +257,12 @@ if test "x$ac_cv_c_compiler_gnu" = xyes ; then
CFLAGS="$CFLAGS -mdynamic-no-pic"
@@ -319,6 +324,12 @@ if test "x$ac_cv_c_compiler_gnu" = xyes ; then
SHRLD="$SHRLD -shared -Wl,-h\$(SONAME)"
SHRLN="libwcs.dll"
;;
esac
+ ;;
+ openbsd*)
+ SHRLIB="libwcs.so.$LIBVER"
+ SONAME="$SHRLIB"
+ SHRLD="$SHRLD -shared -Wl,-h\$(SONAME)"
+ SHRLN=
;;
*)
# Covers Linux and Solaris at least.
+ openbsd*)
+ SHRLIB="libwcs.so.$LIBVER"
+ SONAME="$SHRLIB"
+ SHRLD="$SHRLD -shared -Wl,-h\$(SONAME)"
+ SHRLN=
+ ;;
*)
# Covers Linux and Solaris at least.
SHRLIB="libwcs.so.$LIBVER"
@@ -343,7 +354,7 @@ AC_PROG_INSTALL
# Older versions of GNU make do not have the -O option, which only facilitates
# legibility of the output from parallel builds (make -j).
-make --help | grep '\-O' >/dev/null 2>&1 && MAKEFLAGS="-Otarget"
+gmake --help | grep '\-O' >/dev/null 2>&1 && MAKEFLAGS="-Otarget"
AC_SUBST([MAKEFLAGS])
AC_MSG_NOTICE([End of primary configuration.

4
astro/wcslib/patches/patch-makedefs_in
View File

@ -1,7 +1,7 @@
Index: makedefs.in
--- makedefs.in.orig
+++ makedefs.in
@@ -101,7 +101,7 @@
@@ -104,7 +104,7 @@
FFLAGS := @FFLAGS@
# Static object library.
@ -10,7 +10,7 @@ Index: makedefs.in
ARFLAGS := @ARFLAGS@
RANLIB := @RANLIB@
@@ -132,7 +132,7 @@
@@ -135,7 +135,7 @@
LIBDIR := $(DESTDIR)@libdir@
BINDIR := $(DESTDIR)@bindir@

13
astro/wcslib/patches/patch-utils_sundazel_c Normal file
View File

@ -0,0 +1,13 @@
Use pedantically correct definition of _POSIX_C_SOURCE (reported to upstream)
Index: utils/sundazel.c
--- utils/sundazel.c.orig
+++ utils/sundazel.c
@@ -95,7 +95,7 @@ char usage[] =
"effective.\n";
// To get the declaration of localtime_r() from time.h.
-#define _POSIX_C_SOURCE 1
+#define _POSIX_C_SOURCE 199506L
#include <math.h>
#include <time.h>

17
astro/wcslib/pkg/PLIST
View File

@ -1,5 +1,7 @@
@bin bin/HPXcvt
@bin bin/fitshdr
@bin bin/sundazel
@bin bin/tofits
@bin bin/wcsware
include/wcslib
include/${DISTNAME}/
@ -43,11 +45,14 @@ include/${DISTNAME}/wcstrig.h
include/${DISTNAME}/wcsunits.h
include/${DISTNAME}/wcsunits.inc
include/${DISTNAME}/wcsutil.h
lib/libwcs.a
include/${DISTNAME}/wtbarr.h
@static-lib lib/libwcs.a
@lib lib/libwcs.so.${LIBwcs_VERSION}
lib/pkgconfig/wcslib.pc
@man man/man1/HPXcvt.1
@man man/man1/fitshdr.1
@man man/man1/sundazel.1
@man man/man1/tofits.1
@man man/man1/wcsware.1
share/doc/wcslib/
share/doc/wcslib/CHANGES
@ -70,7 +75,7 @@ share/doc/wcslib/html/dis_8h.html
share/doc/wcslib/html/dis_8h_source.html
share/doc/wcslib/html/doc.png
share/doc/wcslib/html/doxygen.css
share/doc/wcslib/html/doxygen.png
share/doc/wcslib/html/doxygen.svg
share/doc/wcslib/html/dynsections.js
share/doc/wcslib/html/files.html
share/doc/wcslib/html/fitshdr_8h.html
@ -163,6 +168,7 @@ share/doc/wcslib/html/functions_d.html
share/doc/wcslib/html/functions_e.html
share/doc/wcslib/html/functions_f.html
share/doc/wcslib/html/functions_g.html
share/doc/wcslib/html/functions_h.html
share/doc/wcslib/html/functions_i.html
share/doc/wcslib/html/functions_j.html
share/doc/wcslib/html/functions_k.html
@ -183,6 +189,7 @@ share/doc/wcslib/html/functions_vars_d.html
share/doc/wcslib/html/functions_vars_e.html
share/doc/wcslib/html/functions_vars_f.html
share/doc/wcslib/html/functions_vars_g.html
share/doc/wcslib/html/functions_vars_h.html
share/doc/wcslib/html/functions_vars_i.html
share/doc/wcslib/html/functions_vars_j.html
share/doc/wcslib/html/functions_vars_k.html
@ -224,6 +231,7 @@ share/doc/wcslib/html/globals_func_f.html
share/doc/wcslib/html/globals_func_h.html
share/doc/wcslib/html/globals_func_l.html
share/doc/wcslib/html/globals_func_m.html
share/doc/wcslib/html/globals_func_o.html
share/doc/wcslib/html/globals_func_p.html
share/doc/wcslib/html/globals_func_q.html
share/doc/wcslib/html/globals_func_s.html
@ -239,6 +247,7 @@ share/doc/wcslib/html/globals_k.html
share/doc/wcslib/html/globals_l.html
share/doc/wcslib/html/globals_m.html
share/doc/wcslib/html/globals_n.html
share/doc/wcslib/html/globals_o.html
share/doc/wcslib/html/globals_p.html
share/doc/wcslib/html/globals_q.html
share/doc/wcslib/html/globals_r.html
@ -254,6 +263,7 @@ share/doc/wcslib/html/globals_z.html
share/doc/wcslib/html/index.html
share/doc/wcslib/html/intro.html
share/doc/wcslib/html/jquery.js
share/doc/wcslib/html/limits.html
share/doc/wcslib/html/lin_8h.html
share/doc/wcslib/html/lin_8h_source.html
share/doc/wcslib/html/log_8h.html
@ -278,6 +288,7 @@ share/doc/wcslib/html/sph_8h_source.html
share/doc/wcslib/html/splitbar.png
share/doc/wcslib/html/spx_8h.html
share/doc/wcslib/html/spx_8h_source.html
share/doc/wcslib/html/structauxprm.html
share/doc/wcslib/html/structcelprm.html
share/doc/wcslib/html/structdisprm.html
share/doc/wcslib/html/structdpkey.html
@ -327,4 +338,6 @@ share/doc/wcslib/html/wcsunits_8h.html
share/doc/wcslib/html/wcsunits_8h_source.html
share/doc/wcslib/html/wcsutil_8h.html
share/doc/wcslib/html/wcsutil_8h_source.html
share/doc/wcslib/html/wtbarr_8h.html
share/doc/wcslib/html/wtbarr_8h_source.html
share/doc/wcslib/wcslib.pdf