From: Rafael Sadowski Subject: wcslib-8.4: Replace gcc4 with fortran To: The OpenBSD ports mailing-list Date: Tue, 29 Jul 2025 17:31:05 +0200 Simple tweak diff. OK? Cheers Rafael diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile index b73f5e9b337..2f5564311b0 100644 --- a/astro/wcslib/Makefile +++ b/astro/wcslib/Makefile @@ -2,6 +2,7 @@ COMMENT = implementation of the FITS WCS standard CATEGORIES = astro devel DISTNAME = wcslib-8.4 HOMEPAGE = https://www.atnf.csiro.au/people/mcalabre/WCS/wcslib/ +REVISION = 0 SHARED_LIBS = wcs 3.0 @@ -13,18 +14,15 @@ WANTLIB = c cfitsio m SITES = https://www.atnf.csiro.au/people/mcalabre/WCS/ EXTRACT_SUFX = .tar.bz2 -MODULES = gcc4 -MODGCC4_ARCHS = * -MODGCC4_LANGS = fortran +MODULES = fortran LIB_DEPENDS = math/cfitsio -TEST_DEPENDS = lang/gcc/${MODGCC4_VERSION},-f95 -# failure in Fortran tunits test; some strings are not printed -# as expected, instead replaced by NULs. -# diff -a Fortran/test/tunits.out Fortran/tunits.out | cat -v USE_GMAKE = Yes CONFIGURE_STYLE = autoconf +AUTOCONF_VERSION = 2.71 +MAKE_FILE = GNUmakefile + CONFIGURE_ENV = LIBwcs_VERSION=${LIBwcs_VERSION} CONFIGURE_ARGS = --docdir=${PREFIX}/share/doc/wcslib \ @@ -33,8 +31,11 @@ CONFIGURE_ARGS = --docdir=${PREFIX}/share/doc/wcslib \ # non-free licensed dependency CONFIGURE_ARGS += --without-pgplot -AUTOCONF_VERSION = 2.71 -MAKE_FILE = GNUmakefile SUBST_VARS = DISTNAME +# XXX Tests +# failure in Fortran tunits test; some strings are not printed +# as expected, instead replaced by NULs. +# diff -a Fortran/test/tunits.out Fortran/tunits.out | cat -v + .include diff --git a/astro/wcslib/patches/patch-configure_ac b/astro/wcslib/patches/patch-configure_ac index 2420d455974..dd7222217f5 100644 --- a/astro/wcslib/patches/patch-configure_ac +++ b/astro/wcslib/patches/patch-configure_ac @@ -3,7 +3,7 @@ Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -12,8 +12,13 @@ AC_REVISION([$Revision: 1.7 $]) +@@ -12,8 +12,13 @@ AC_REVISION([$Revision: 8.4 $]) AC_SUBST([PACKAGE_VERSION]) AC_DEFINE_UNQUOTED([WCSLIB_VERSION], [$PACKAGE_VERSION], [Define wcslib version])