From 8025aa10ceb960b62c9a826fb56eb1ac68ea1ce3 Mon Sep 17 00:00:00 2001 From: Benjamin Jacobs Date: Mon, 11 Mar 2024 22:43:46 +0100 Subject: lang/ocaml: Update to 4.14.1 The 'force-safe-string; setting is NOT enabled, as opposed to the new upstream default. OCaml users are encouraged to migrate to safe strings as soon as possible. - The X11 library isn't part of lang/ocaml anymore, users should install x11-toolkits/ocaml-graphics. - Add new 'ocaml' USES - Bump PORTREVISION on dependent ports, due to ABI Change. The update includes the following updates to existing ports (needed to keep them working): - devel/ocaml-camlp4: Updated to 4.14+1 - devel/ocaml-camlp5: Updated to 8.02.01, homepage updated - devel/ocaml-dune: Patch to allow overriding the stublibs directory, strip binary and shared libraries - devel/ocaml-findlib: Improve port - devel/ocaml-lwt: Fix build with OCaml 4.14 - deve/ocaml-re: Update to 1.11.0, use new dune USES - devel/ocaml-sdl: Fix build with new ocaml - games/freetennis: Fix build, tidy Makefile - graphics/ocaml-images: Updated to 5.0.4, new homepage, use new dune USES, undeprecate - graphics/ocaml-lablgl: Moved into site-lib, dynamic objects stripped, add missing GL dependencies - math/coq: Updated to 8.19.0 - math/ocaml-zarith: strip shared libraries, fixed usage of USE_OCAML_LDCONFIG, use new dune USES - math/teyjus: Fix build - net/unison240: Fix build with new compiler - net/unison248: Fix build with new compiler, add MAKE_JOBS_UNSAFE - net-p2p/mldonkey: Fix build with new compiler, fix build on i386 - sysutils/ledit: Updated to 2.06, install native binary, Use github, fix man page installation - www/geneweb: Build fix for OCaml and Camlp5 updates - x11-toolkits/ocaml-lablgtk2: Fix build with new compiler - x11-toolkits/ocaml-lablgtk3: Updated to 3.1.4, added ocaml-camlp-stream dependency, build fix patch - x11-toolkits/ocaml-labltk: Updated to 8.06.12, Improve Makefile Added the following ports: - devel/ocaml-astring - devel/ocaml-base - devel/ocaml-bos - devel/ocaml-camlp-streams - devel/ocaml-csexp - devel/ocaml-fmt - devel/ocaml-fpath - devel/ocaml-logs - devel/ocaml-mtime - devel/ocaml-pcre2 - devel/ocaml-rresult - devel/ocaml-seq - devel/ocaml-stdio - x11-toolkits/ocaml-graphics PR: 250408 [1], 262781 [1], 262788 [3], 262789 [1], 262792 [1], 263006 [1], 263162 [3], 263206 [2], 276893 [1], 276945 [4], 276953 [1], 277026 [5], 277241 [1], 277242 [1], 277243 [1], 277244 [1], 277245 [1], 277246 [1], 277247 [1], 277248 [1], 277249 [1], 277250 [1], 277251 [1], 277252 [1], 277253 [1], 277254 [1], 277255 [1], 277256 [4], 277257 [1], 277258 [1] Approved by: maintainer timeout [1], yuri (maintainer) [2], overcome by events, fixit [3], madpilot (maintainer) [4] Reviewed by: madpilot Exp-run by: antoine [5] Differential Revision: https://reviews.freebsd.org/D43861 --- graphics/ocaml-images/files/patch-src_gifwrite.c | 55 ------------------------ 1 file changed, 55 deletions(-) delete mode 100644 graphics/ocaml-images/files/patch-src_gifwrite.c (limited to 'graphics/ocaml-images/files/patch-src_gifwrite.c') diff --git a/graphics/ocaml-images/files/patch-src_gifwrite.c b/graphics/ocaml-images/files/patch-src_gifwrite.c deleted file mode 100644 index 0fbcede2549c..000000000000 --- a/graphics/ocaml-images/files/patch-src_gifwrite.c +++ /dev/null @@ -1,55 +0,0 @@ ---- src/gifwrite.c.orig 2011-06-22 18:04:32 UTC -+++ src/gifwrite.c -@@ -25,7 +25,7 @@ - - #include - --int list_length( value list ) -+static int list_length( value list ) - { - CAMLparam1(list); - CAMLlocal1(l); -@@ -52,7 +52,11 @@ ColorMapObject *ColorMapObject_val( valu - fprintf(stderr, "Creating map with length = %d ...\n", len); - fflush(stderr); - */ -+#if GIFLIB_MAJOR >= 5 -+ cmapobj = GifMakeMapObject( len, NULL ); -+#else - cmapobj = MakeMapObject( len, NULL ); -+#endif - for(i=0; i< len; i++){ - cmapobj->Colors[i].Red = Int_val(Field(Field(cmap,i),0)); - cmapobj->Colors[i].Green = Int_val(Field(Field(cmap,i),1)); -@@ -68,7 +72,11 @@ value eGifOpenFileName( name ) - - GifFileType *GifFileOut; - -+#if GIFLIB_MAJOR >= 5 -+ if ((GifFileOut = EGifOpenFileName( String_val( name ), 0, NULL) )== NULL) { -+#else - if ((GifFileOut = EGifOpenFileName( String_val( name ), 0) )== NULL) { -+#endif - failwith("EGifOpenFileName"); - } - /* gcc -fwritable-strings is required to compile libungif */ -@@ -88,7 +96,11 @@ value eGifCloseFile( value hdl ) - segmentation faults */ - ((GifFileType *)hdl)->Image.ColorMap = NULL; - -+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5 -+ EGifCloseFile( (GifFileType *) hdl, NULL ); -+#else - EGifCloseFile( (GifFileType *) hdl ); -+#endif - CAMLreturn(Val_unit); - } - -@@ -133,7 +145,6 @@ value eGifPutLine( value oc, value buf ) - - if ( EGifPutLine(GifFileOut, String_val(buf), GifFileOut->Image.Width) - == GIF_ERROR ){ -- PrintGifError (); - failwith("EGifPutLine"); - } - CAMLreturn(Val_unit); -- cgit v1.2.3