ports/110176: [PATCH] graphics/freeimage: update to 3.9.3
Gea-Suan Lin
gslin at gslin.org
Sun Mar 11 02:10:05 UTC 2007
>Number: 110176
>Category: ports
>Synopsis: [PATCH] graphics/freeimage: update to 3.9.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 11 02:10:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Gea-Suan Lin
>Release: FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD netnews.NCTU.edu.tw 6.2-RELEASE FreeBSD 6.2-RELEASE #1: Sun Jan 14 14:05:12 CST 2007
>Description:
- Update to 3.9.3
Added file(s):
- files/patch-Makefile.gnu
Removed file(s):
- files/patch-Makefile
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- freeimage-3.9.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/freeimage/Makefile /home/staff/gslin/work/ports/freeimage/Makefile
--- /usr/ports/graphics/freeimage/Makefile Thu Dec 14 03:15:03 2006
+++ /home/staff/gslin/work/ports/freeimage/Makefile Sun Mar 11 09:58:28 2007
@@ -6,7 +6,7 @@
#
PORTNAME= freeimage
-PORTVERSION= 3.8.0
+PORTVERSION= 3.9.3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,11 +15,16 @@
MAINTAINER= ports at FreeBSD.org
COMMENT= An open source graphics library
-WRKSRC= ${WRKDIR}/FreeImage
+EXTRACT_BEFORE_ARGS= -qoa
USE_GMAKE= yes
+USE_LDCONFIG= yes
USE_ZIP= yes
-# convert CRLF to LF for gcc-2.95
-EXTRACT_BEFORE_ARGS= -qoa
-INSTALLS_SHLIB= yes
+WRKSRC= ${WRKDIR}/FreeImage
+
+post-install:
+ ${MKDIR} ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/license-*.txt ${DATADIR}
+ ${MKDIR} ${EXAMPLESDIR}
+ ${CP} -R ${WRKSRC}/Examples/ ${EXAMPLESDIR}
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/freeimage/distinfo /home/staff/gslin/work/ports/freeimage/distinfo
--- /usr/ports/graphics/freeimage/distinfo Mon May 15 13:35:01 2006
+++ /home/staff/gslin/work/ports/freeimage/distinfo Sun Mar 11 09:19:21 2007
@@ -1,3 +1,3 @@
-MD5 (FreeImage380.zip) = aff6c252030bda5cff2bb32efcf726fa
-SHA256 (FreeImage380.zip) = 787ea946aef51bb0a21bd89715ce88cfc3ab7a16d37bbabc0467af8e7c9b56cc
-SIZE (FreeImage380.zip) = 2358545
+MD5 (FreeImage393.zip) = bf3574fa4e6135cf511d5ff4bc871ec3
+SHA256 (FreeImage393.zip) = 59f6b75d778e40eff7cb4068e556c65230f9fe1af8d17ad74fec48f334a34fc0
+SIZE (FreeImage393.zip) = 2507055
diff -ruN --exclude=CVS /usr/ports/graphics/freeimage/files/patch-Makefile /home/staff/gslin/work/ports/freeimage/files/patch-Makefile
--- /usr/ports/graphics/freeimage/files/patch-Makefile Mon Sep 5 06:25:41 2005
+++ /home/staff/gslin/work/ports/freeimage/files/patch-Makefile Thu Jan 1 08:00:00 1970
@@ -1,60 +0,0 @@
---- Makefile.orig Tue May 3 18:53:46 2005
-+++ Makefile Mon Sep 5 00:21:22 2005
-@@ -4,27 +4,27 @@
- include Makefile.srcs
-
- # General configuration variables:
--CC = gcc
--CXX = g++
-+CC ?= gcc
-+CXX ?= g++
- AR = ar
-
--INSTALLDIR = /usr/lib
-+INSTALLDIR = ${PREFIX}/lib
-
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
-
--COMPILERFLAGS = -O3
-+COMPILERFLAGS := ${CFLAGS}
- LIBRARIES = -lstdc++
-
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
--CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
--CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)
-+CFLAGS = $(COMPILERFLAGS) -fPIC $(INCLUDE)
-+CXXFLAGS = $(COMPILERFLAGS) -fPIC -Wno-ctor-dtor-privacy $(INCLUDE)
-
- TARGET = freeimage
- STATICLIB = lib$(TARGET).a
--SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
--LIBNAME = lib$(TARGET).so.$(VER_MAJOR)
-+SHAREDLIB = lib$(TARGET).so.$(VER_MAJOR)
-+LIBNAME = lib$(TARGET).so
-
-
-
-@@ -34,7 +34,7 @@
-
- dist: FreeImage
- cp *.a Dist
-- cp *.so Dist
-+ cp *.so.* Dist
- cp Source/FreeImage.h Dist
-
- dos2unix:
-@@ -55,10 +55,9 @@
- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-
- install:
-- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
-- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+ install -m 644 -o root -g wheel $(STATICLIB) $(INSTALLDIR)
-+ install -m 755 -o root -g wheel $(SHAREDLIB) $(INSTALLDIR)
- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME)
-- ldconfig
-
- clean:
- rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
diff -ruN --exclude=CVS /usr/ports/graphics/freeimage/files/patch-Makefile.gnu /home/staff/gslin/work/ports/freeimage/files/patch-Makefile.gnu
--- /usr/ports/graphics/freeimage/files/patch-Makefile.gnu Thu Jan 1 08:00:00 1970
+++ /home/staff/gslin/work/ports/freeimage/files/patch-Makefile.gnu Sun Mar 11 09:37:50 2007
@@ -0,0 +1,48 @@
+--- Makefile.gnu.orig Wed Dec 20 15:22:08 2006
++++ Makefile.gnu Sun Mar 11 09:37:44 2007
+@@ -4,23 +4,23 @@
+ include Makefile.srcs
+
+ # General configuration variables:
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ AR = ar
+
+ INCDIR = /usr/include
+-INSTALLDIR = /usr/lib
++INSTALLDIR = $(PREFIX)/lib
+
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+
+-COMPILERFLAGS = -O3 -fPIC
++COMPILERFLAGS := $(CFLAGS)
+ LIBRARIES = -lstdc++
+
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+-CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
+-CXXFLAGS = $(COMPILERFLAGS) -Wno-ctor-dtor-privacy $(INCLUDE)
++CFLAGS = $(COMPILERFLAGS) -fPIC $(INCLUDE)
++CXXFLAGS = $(COMPILERFLAGS) -fPIC -Wno-ctor-dtor-privacy $(INCLUDE)
+
+ TARGET = freeimage
+ STATICLIB = lib$(TARGET).a
+@@ -58,12 +58,11 @@
+ $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) -o $@ $(MODULES) $(LIBRARIES)
+
+ install:
+- 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)
++ install -m 644 -o root -g wheel $(HEADER) $(INCDIR)
++ install -m 644 -o root -g wheel $(STATICLIB) $(INSTALLDIR)
++ install -m 755 -o root -g wheel $(SHAREDLIB) $(INSTALLDIR)
+ ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+- ldconfig
+
+ clean:
+ rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
diff -ruN --exclude=CVS /usr/ports/graphics/freeimage/pkg-plist /home/staff/gslin/work/ports/freeimage/pkg-plist
--- /usr/ports/graphics/freeimage/pkg-plist Mon May 15 13:35:01 2006
+++ /home/staff/gslin/work/ports/freeimage/pkg-plist Sun Mar 11 10:03:50 2007
@@ -1,3 +1,27 @@
+ at comment $FreeBSD$
+%%DATADIR%%/license-fi.txt
+%%DATADIR%%/license-gpl.txt
+%%EXAMPLESDIR%%/Generic/BatchLoad.cpp
+%%EXAMPLESDIR%%/Generic/CloneMultiPage.cpp
+%%EXAMPLESDIR%%/Generic/CreateAlpha.cpp
+%%EXAMPLESDIR%%/Generic/FIFImportExport.cpp
+%%EXAMPLESDIR%%/Generic/FIIO_Mem.cpp
+%%EXAMPLESDIR%%/Generic/FIIO_Mem.h
+%%EXAMPLESDIR%%/Generic/LoadFromHandle.cpp
+%%EXAMPLESDIR%%/Generic/LoadFromMemory-classified.cpp
+%%EXAMPLESDIR%%/Generic/LoadFromMemory.cpp
+%%EXAMPLESDIR%%/Generic/ShowMetadata.cpp
+%%EXAMPLESDIR%%/Linux/Makefile
+%%EXAMPLESDIR%%/Linux/linux-gtk.c
+%%EXAMPLESDIR%%/Linux/linux-svgalib.c
+%%EXAMPLESDIR%%/Plugin/PluginCradle.cpp
+%%EXAMPLESDIR%%/Plugin/PluginCradle.h
+lib/libfreeimage-3.9.3.so
lib/libfreeimage.a
lib/libfreeimage.so
lib/libfreeimage.so.3
+ at dirrmtry %%EXAMPLESDIR%%/Plugin
+ at dirrmtry %%EXAMPLESDIR%%/Linux
+ at dirrmtry %%EXAMPLESDIR%%/Generic
+ at dirrmtry %%EXAMPLESDIR%%
+ at dirrmtry %%DATADIR%%
--- freeimage-3.9.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list