diff --git a/science/minc2/Makefile b/science/minc2/Makefile index 4d3ae192e619..60f4ed80542d 100644 --- a/science/minc2/Makefile +++ b/science/minc2/Makefile @@ -1,46 +1,43 @@ PORTNAME= minc PORTVERSION= 2.2.00 DISTVERSIONPREFIX= release- -PORTREVISION= 12 +PORTREVISION= 13 PORTEPOCH= 1 CATEGORIES= science biology PKGNAMESUFFIX= 2 MAINTAINER= ports@FreeBSD.org COMMENT= Medical Imaging NetCDF WWW= https://www.bic.mni.mcgill.ca/ServicesSoftware/MINC LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_13= ld: error: duplicate symbol: matrix_errno -BROKEN_FreeBSD_14= ld: error: duplicate symbol: matrix_errno - LIB_DEPENDS= libhdf5.so:science/hdf5 \ libnetcdf.so:science/netcdf RUN_DEPENDS= bash:shells/bash USE_GITHUB= yes GH_ACCOUNT= BIC-MNI MAKE_JOBS_UNSAFE= yes USES= autoreconf bison gmake libtool perl5 shebangfix SHEBANG_FILES= progs/mincview/mincview GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared=yes --enable-static=yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes CFLAGS+= -Wno-error=return-type CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFLICTS= minc-1* zh-tk pre-patch: @${RM} ${WRKSRC}/ac_config_aux/* @${RM} ${WRKSRC}/progs/minccalc/gram.[ch] @${RM} ${WRKSRC}/progs/mincgen/ncgentab.[ch] .include diff --git a/science/minc2/files/patch-conversion_minctoecat_ecat__write.c b/science/minc2/files/patch-conversion_minctoecat_ecat__write.c new file mode 100644 index 000000000000..4369323f90d8 --- /dev/null +++ b/science/minc2/files/patch-conversion_minctoecat_ecat__write.c @@ -0,0 +1,12 @@ +--- conversion/minctoecat/ecat_write.c.orig 2023-04-11 00:36:34 UTC ++++ conversion/minctoecat/ecat_write.c +@@ -11,6 +11,9 @@ + #define ERROR -1 + #define V7 70 + ++MatrixErrorCode matrix_errno; ++ ++char matrix_errtxt[132]; + + char* dstypecode[NumDataSetTypes] = + { "u","s","i","a","n","pm","v8","v","p8","p","i8","S","S8","N", "FS"}; diff --git a/science/minc2/files/patch-conversion_minctoecat_ecat__write.h b/science/minc2/files/patch-conversion_minctoecat_ecat__write.h new file mode 100644 index 000000000000..902eafc23a84 --- /dev/null +++ b/science/minc2/files/patch-conversion_minctoecat_ecat__write.h @@ -0,0 +1,14 @@ +--- conversion/minctoecat/ecat_write.h.orig 2023-04-11 00:36:27 UTC ++++ conversion/minctoecat/ecat_write.h +@@ -39,9 +39,9 @@ typedef enum { + BitData + } MatrixDataType; + +-MatrixErrorCode matrix_errno; ++extern MatrixErrorCode matrix_errno; + +-char matrix_errtxt[132]; ++extern char matrix_errtxt[132]; + + typedef struct XMAIN_HEAD { + char magic_number[14];