This is an update to freeimage 3.12.0. Eric.
Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/freeimage/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 20 Mar 2009 13:53:04 -0000 1.1.1.1 +++ Makefile 6 Aug 2009 09:56:55 -0000 @@ -2,11 +2,11 @@ COMMENT= c++ library for common image format -DISTNAME= FreeImage3110 -PKGNAME= freeimage-3.11.0 +DISTNAME= FreeImage3120 +PKGNAME= freeimage-3.12.0 CATEGORIES= graphics -SHARED_LIBS+= freeimage 1.0 +SHARED_LIBS+= freeimage 2.0 HOMEPAGE= http://freeimage.sourceforge.net/ @@ -28,7 +28,6 @@ WRKDIST= ${WRKDIR}/FreeImage USE_GMAKE= Yes MAKE_ENV= LIBfreeimage_VERSION=${LIBfreeimage_VERSION} -MAKE_TARGET= Makefile.gnu .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/freeimage/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 20 Mar 2009 13:53:04 -0000 1.1.1.1 +++ distinfo 6 Aug 2009 09:56:55 -0000 @@ -1,5 +1,5 @@ -MD5 (FreeImage3110.zip) = rR2zZBQ5FBdlS6e/HAJ30w== -RMD160 (FreeImage3110.zip) = PA7Y9sb96f1/qE1hqo7+yxpjcno= -SHA1 (FreeImage3110.zip) = WcrsW2KUtNprZBh4fxW0vpppp/w= -SHA256 (FreeImage3110.zip) = hAIbjAuG5YAUeUdK2amcGNEhUI7hbTY+At3L8kGVNAw= -SIZE (FreeImage3110.zip) = 4250382 +MD5 (FreeImage3120.zip) = R7JZEC93akvNev/ACULztA== +RMD160 (FreeImage3120.zip) = Qh3b2BND0UVhrehExnwxgCq0RK0= +SHA1 (FreeImage3120.zip) = 2aXvyVkMtF4XbH5VUq/vlhWUocs= +SHA256 (FreeImage3120.zip) = pDH8y/18Bv0yFVs5Nh1SCnEO6HhEDMo+EXBsC9GubMM= +SIZE (FreeImage3120.zip) = 4335135 Index: patches/patch-Makefile_gnu =================================================================== RCS file: /cvs/ports/graphics/freeimage/patches/patch-Makefile_gnu,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Makefile_gnu --- patches/patch-Makefile_gnu 20 Mar 2009 13:53:04 -0000 1.1.1.1 +++ patches/patch-Makefile_gnu 6 Aug 2009 09:56:55 -0000 @@ -1,24 +1,30 @@ $OpenBSD: patch-Makefile_gnu,v 1.1.1.1 2009/03/20 13:53:04 eric Exp $ ---- Makefile.gnu.orig Sun Aug 26 07:44:24 2007 -+++ Makefile.gnu Tue Feb 17 18:02:33 2009 -@@ -8,13 +8,13 @@ CC = gcc - CXX = g++ - AR = ar - --INCDIR = /usr/include --INSTALLDIR = /usr/lib -+INCDIR = ${PREFIX}/include -+INSTALLDIR = ${PREFIX}/lib +--- Makefile.gnu.orig Sun Feb 15 23:29:40 2009 ++++ Makefile.gnu Wed Aug 5 17:51:45 2009 +@@ -5,8 +5,8 @@ include Makefile.srcs + + # General configuration variables: + DESTDIR ?= / +-INCDIR ?= $(DESTDIR)/usr/include +-INSTALLDIR ?= $(DESTDIR)/usr/lib ++INCDIR ?= $(DESTDIR)$(LOCALBASE)/include ++INSTALLDIR ?= $(DESTDIR)$(LOCALBASE)/lib # Converts cr/lf to just lf DOS2UNIX = dos2unix - --COMPILERFLAGS = -O3 -fPIC -fexceptions -fvisibility=hidden -+COMPILERFLAGS = -O2 -fPIC - LIBRARIES = -lstdc++ +@@ -15,9 +15,9 @@ LIBRARIES = -lstdc++ MODULES = $(SRCS:.c=.o) -@@ -24,9 +24,8 @@ CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $( + MODULES := $(MODULES:.cpp=.o) +-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden ++CFLAGS ?= -O2 -fPIC -fexceptions + CFLAGS += $(INCLUDE) +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy ++CXXFLAGS ?= -O2 -fPIC -fexceptions -Wno-ctor-dtor-privacy + CXXFLAGS += $(INCLUDE) + + ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) +@@ -27,9 +27,8 @@ endif TARGET = freeimage STATICLIB = lib$(TARGET).a @@ -29,7 +35,7 @@ $OpenBSD: patch-Makefile_gnu,v 1.1.1.1 2 HEADER = Source/FreeImage.h -@@ -37,7 +36,7 @@ all: dist +@@ -40,7 +39,7 @@ all: dist dist: FreeImage cp *.a Dist @@ -38,20 +44,18 @@ $OpenBSD: patch-Makefile_gnu,v 1.1.1.1 2 cp Source/FreeImage.h Dist dos2unix: -@@ -55,15 +54,12 @@ $(STATICLIB): $(MODULES) +@@ -58,13 +57,12 @@ $(STATICLIB): $(MODULES) $(AR) r $@ $(MODULES) $(SHAREDLIB): $(MODULES) -- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES) -+ $(CC) -O2 -fPIC -s -shared -o $@ $(MODULES) $(LIBRARIES) +- $(CC) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) ++ $(CC) -shared $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES) install: +- install -d $(INCDIR) $(INSTALLDIR) - install -m 644 -o root -g root $(HEADER) $(INCDIR) - install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) - install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) -- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) -- 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_LibOpenJPEG_opj_malloc_h =================================================================== RCS file: patches/patch-Source_LibOpenJPEG_opj_malloc_h diff -N patches/patch-Source_LibOpenJPEG_opj_malloc_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Source_LibOpenJPEG_opj_malloc_h 6 Aug 2009 09:56:55 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- Source/LibOpenJPEG/opj_malloc.h.orig Wed Aug 5 17:58:35 2009 ++++ Source/LibOpenJPEG/opj_malloc.h Wed Aug 5 17:58:23 2009 +@@ -77,7 +77,6 @@ Allocate memory aligned to a 16 byte boundry + #define HAVE_MEMALIGN + /* Linux x86_64 and OSX always align allocations to 16 bytes */ + #elif !defined(__amd64__) && !defined(__APPLE__) +- #define HAVE_MEMALIGN + #include <malloc.h> + #endif + #endif
