UPDATE: graphics/freeimage

Update freeimage to the latest stable version. All 3 consumers are
happy. OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/freeimage/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile 31 Mar 2022 14:20:40 -0000 1.18
+++ Makefile 6 Jul 2022 07:20:01 -0000
@@ -1,11 +1,10 @@
COMMENT= c++ library for common image format

-DISTNAME= FreeImage3152
-PKGNAME= freeimage-3.15.2
-REVISION= 8
+DISTNAME= FreeImage3180
+PKGNAME= freeimage-3.18.0
CATEGORIES= graphics

-SHARED_LIBS+= freeimage 2.0
+SHARED_LIBS+= freeimage 3.0

HOMEPAGE= http://freeimage.sourceforge.net/

Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/freeimage/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 18 Jan 2015 03:14:09 -0000 1.3
+++ distinfo 6 Jul 2022 07:20:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (FreeImage3152.zip) = tV2eTWzGoimq8MBtSfcAHsOn3117xOMLsoT6kvR/Tuc=
-SIZE (FreeImage3152.zip) = 4618626
+SHA256 (FreeImage3180.zip) = 9BN5aC+a2pTqezT+hr+e4Ak1oxR75BtlaclgWlPkOP0=
+SIZE (FreeImage3180.zip) = 7415716
Index: patches/patch-Makefile_gnu
===================================================================
RCS file: /cvs/ports/graphics/freeimage/patches/patch-Makefile_gnu,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Makefile_gnu
--- patches/patch-Makefile_gnu 11 Mar 2022 19:22:19 -0000 1.4
+++ patches/patch-Makefile_gnu 6 Jul 2022 07:20:01 -0000
@@ -1,7 +1,7 @@
Index: Makefile.gnu
--- Makefile.gnu.orig
+++ Makefile.gnu
-@@ -5,13 +5,13 @@ include Makefile.srcs
+@@ -5,9 +5,10 @@ include Makefile.srcs

# General configuration variables:
DESTDIR ?= /
@@ -10,16 +10,18 @@ Index: Makefile.gnu
+INCDIR ?= $(PREFIX)/include
+INSTALLDIR ?= $(PREFIX)/lib

++
# Converts cr/lf to just lf
DOS2UNIX = dos2unix

--LIBRARIES = -lstdc++
-+LIBRARIES =
-
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
-@@ -20,16 +20,13 @@ CFLAGS += $(INCLUDE)
- CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
+@@ -23,19 +24,17 @@ CFLAGS += -DNO_LCMS
+ # LibJXR
+ CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
+ CFLAGS += $(INCLUDE)
+-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
++CXXFLAGS ?= -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
+ # LibJXR
+ CXXFLAGS += -D__ANSI__
CXXFLAGS += $(INCLUDE)

-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
@@ -34,20 +36,17 @@ Index: Makefile.gnu
-SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
+SHAREDLIB = lib$(TARGET).so.$(LIBfreeimage_VERSION)
LIBNAME = lib$(TARGET).so
--VERLIBNAME = $(LIBNAME).$(VER_MAJOR)
+ VERLIBNAME = $(LIBNAME).$(VER_MAJOR)
HEADER = Source/FreeImage.h
-
-
-@@ -40,7 +37,7 @@ all: dist
-
+@@ -49,7 +48,6 @@ all: dist
dist: FreeImage
- cp *.a Dist
-- cp *.so Dist
-+ cp *.so.* Dist
- cp Source/FreeImage.h Dist
+ mkdir -p Dist
+ cp *.a Dist/
+- cp *.so Dist/
+ cp Source/FreeImage.h Dist/

dos2unix:
-@@ -58,16 +55,13 @@ $(STATICLIB): $(MODULES)
+@@ -67,16 +65,13 @@ $(STATICLIB): $(MODULES)
$(AR) r $@ $(MODULES)

$(SHAREDLIB): $(MODULES)
@@ -61,7 +60,7 @@ Index: Makefile.gnu
- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
-- ldconfig
+-# ldconfig
+ install -m 644 -o root -g bin $(HEADER) $(INCDIR)
+ install -m 644 -o root -g bin $(STATICLIB) $(INSTALLDIR)
+ install -m 755 -o root -g bin $(SHAREDLIB) $(INSTALLDIR)
Index: patches/patch-Source_FreeImage_PluginPSD_cpp
===================================================================
RCS file: patches/patch-Source_FreeImage_PluginPSD_cpp
diff -N patches/patch-Source_FreeImage_PluginPSD_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_FreeImage_PluginPSD_cpp 6 Jul 2022 07:20:01 -0000
@@ -0,0 +1,12 @@
+Index: Source/FreeImage/PluginPSD.cpp
+--- Source/FreeImage/PluginPSD.cpp.orig
++++ Source/FreeImage/PluginPSD.cpp
+@@ -127,7 +127,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int
+ static BOOL DLL_CALLCONV
+ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) {
+ if(!handle) {
+- return NULL;
++ return FALSE;
+ }
+ try {
+ psdParser parser;
Index: patches/patch-Source_LibOpenJPEG_opj_malloc_h
===================================================================
RCS file: /cvs/ports/graphics/freeimage/patches/patch-Source_LibOpenJPEG_opj_malloc_h,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Source_LibOpenJPEG_opj_malloc_h
--- patches/patch-Source_LibOpenJPEG_opj_malloc_h 11 Mar 2022 19:22:19 -0000 1.3
+++ patches/patch-Source_LibOpenJPEG_opj_malloc_h 6 Jul 2022 07:20:01 -0000
@@ -1,13 +1,12 @@
---- Source/LibOpenJPEG/opj_malloc.h.orig Sat Feb 18 15:33:18 2012
-+++ Source/LibOpenJPEG/opj_malloc.h Thu Jan 21 19:13:05 2016
-@@ -84,8 +84,8 @@ Allocate memory aligned to a 16 byte boundry
- #if defined(__sun)
- #define HAVE_MEMALIGN
+Index: Source/LibOpenJPEG/opj_malloc.h
+--- Source/LibOpenJPEG/opj_malloc.h.orig
++++ Source/LibOpenJPEG/opj_malloc.h
+@@ -96,7 +96,7 @@ Allocate memory aligned to a 16 byte boundry
+ #elif defined(__FreeBSD__)
+ #define HAVE_POSIX_MEMALIGN
/* Linux x86_64 and OSX always align allocations to 16 bytes */
-- #elif !defined(__amd64__) && !defined(__APPLE__)
-- #define HAVE_MEMALIGN
-+ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(__OpenBSD__)
-+ #define HAVE_POSIX_MEMALIGN
+- #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)
++ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) && !defined(__OpenBSD__)
+ #define HAVE_MEMALIGN
#include <malloc.h>