Update to 2.6.9, I tried to switch to autoconf 2.65 as upstream has done
but our autoconf-2.65 writes a wrong config.h (unistd and finite not
defined). Any hints ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile 24 Apr 2010 13:08:37 -0000 1.57
+++ Makefile 29 Jun 2010 11:03:51 -0000
@@ -2,17 +2,16 @@
COMMENT= GNU Image Manipulation Program
-DISTNAME= gimp-2.6.8
-PKGNAME= ${DISTNAME}p0
-SHARED_LIBS= gimp-2.0 268.0 \
- gimpbase-2.0 268.0 \
- gimpcolor-2.0 268.0 \
- gimpconfig-2.0 268.0 \
- gimpmath-2.0 268.0 \
- gimpmodule-2.0 268.0 \
- gimpthumb-2.0 268.0 \
- gimpui-2.0 268.0 \
- gimpwidgets-2.0 268.0
+DISTNAME= gimp-2.6.9
+SHARED_LIBS= gimp-2.0 269.0 \
+ gimpbase-2.0 269.0 \
+ gimpcolor-2.0 269.0 \
+ gimpconfig-2.0 269.0 \
+ gimpmath-2.0 269.0 \
+ gimpmodule-2.0 269.0 \
+ gimpthumb-2.0 269.0 \
+ gimpui-2.0 269.0 \
+ gimpwidgets-2.0 269.0
CATEGORIES= graphics
MAINTAINER= Giovanni Bechis <giova...@openbsd.org>
@@ -37,6 +36,7 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,
wmf.>=6,wmflite.>=6::graphics/libwmf \
poppler.>=3,poppler-glib.>=3::print/poppler \
gegl-0.1::graphics/gegl \
+ openjpeg.>=4::graphics/openjpeg \
:py-gtk2-*:x11/py-gtk2 \
curl::net/curl
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo 30 Dec 2009 09:06:12 -0000 1.25
+++ distinfo 29 Jun 2010 11:03:51 -0000
@@ -1,5 +1,5 @@
-MD5 (gimp-2.6.8.tar.bz2) = pNlGLJQglUgkqAybGWP52Q==
-RMD160 (gimp-2.6.8.tar.bz2) = 2gL+3MAOuqwEv9IcFTpxMNP/Xgg=
-SHA1 (gimp-2.6.8.tar.bz2) = pVCUPwhqvJv2uW1XZ0Eze3GGpPQ=
-SHA256 (gimp-2.6.8.tar.bz2) = 1dQhi3QjkBV/yiOp0szkNpBFRqLqQZ/+tEpfQ8maMzI=
-SIZE (gimp-2.6.8.tar.bz2) = 16342377
+MD5 (gimp-2.6.9.tar.bz2) = 5dDMbzzhJ+Udfz0xJLFqmQ==
+RMD160 (gimp-2.6.9.tar.bz2) = bS+XXDyyKjcXRKvRR6qimW9j9Vg=
+SHA1 (gimp-2.6.9.tar.bz2) = 3yYwhrktCT8dtlcE9pRaLmmuTvM=
+SHA256 (gimp-2.6.9.tar.bz2) = O7Q9TQBg34I4NlibPlFJOfZryWtk0v6kGS1j1NC4+PA=
+SIZE (gimp-2.6.9.tar.bz2) = 16442347
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/patches/patch-configure_in,v
retrieving revision 1.8
diff -u -p -r1.8 patch-configure_in
--- patches/patch-configure_in 17 Aug 2009 12:10:26 -0000 1.8
+++ patches/patch-configure_in 29 Jun 2010 11:03:51 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.8 2009/08/17 12:10:26 giovanni Exp $
---- configure.in.orig Wed Mar 11 17:06:21 2009
-+++ configure.in Thu Mar 19 17:28:47 2009
-@@ -419,14 +419,7 @@ AM_GLIB_GNU_GETTEXT
+--- configure.in.orig Mon Jun 21 21:20:20 2010
++++ configure.in Fri Jun 25 18:47:26 2010
+@@ -421,14 +421,7 @@ AM_GLIB_GNU_GETTEXT
###########
AC_MSG_CHECKING([for iso-codes])
@@ -17,7 +17,17 @@ $OpenBSD: patch-configure_in,v 1.8 2009/
AC_MSG_RESULT($have_iso_codes)
AC_SUBST(ISO_CODES_LOCATION)
-@@ -1141,10 +1134,10 @@ if test "x$with_libmng" != xno && test -z "$MNG_LIBS"
+@@ -569,7 +562,8 @@ AC_TRY_RUN([#include <math.h>
+ AC_CHECK_FUNCS(finite, , [
+ AC_MSG_CHECKING(for finite in <math.h>)
+ AC_TRY_LINK([#include <math.h>], [double f = 0.0; finite (f)], [
+- AC_DEFINE(HAVE_FINITE, 1)
++ AC_DEFINE(HAVE_FINITE, 1,
++ [Define to 1 if you have the finite function.])
+ AC_MSG_RESULT(yes)], [
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING(for isfinite in <math.h>)
+@@ -1143,10 +1137,10 @@ if test "x$with_libmng" != xno && test -z "$MNG_LIBS"
test -n "$PNG_LIBS" && test -n "$JPEG_LIBS" && test -n "$Z_LIBS"; then
AC_CHECK_LIB(mng, mng_create,
[AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
@@ -30,7 +40,7 @@ $OpenBSD: patch-configure_in,v 1.8 2009/
else
have_libmng="no (MNG header file not found)"
fi
-@@ -1332,19 +1325,9 @@ if test "x$with_gnomevfs" != xno; then
+@@ -1325,19 +1319,9 @@ if test "x$with_gnomevfs" != xno; then
gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
Index: patches/patch-etc_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/patches/patch-etc_Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-etc_Makefile_in
--- patches/patch-etc_Makefile_in 16 Nov 2008 21:19:23 -0000 1.10
+++ patches/patch-etc_Makefile_in 29 Jun 2010 11:03:51 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-etc_Makefile_in,v 1.10 2008/11/16 21:19:23 kili Exp $
---- etc/Makefile.in.orig Thu Oct 30 11:33:59 2008
-+++ etc/Makefile.in Fri Oct 31 09:06:42 2008
-@@ -339,7 +339,7 @@ gimpdatadir = @gimpdatadir@
+--- etc/Makefile.in.orig Mon Jun 21 22:00:58 2010
++++ etc/Makefile.in Fri Jun 25 18:46:50 2010
+@@ -342,7 +342,7 @@ gimpdatadir = @gimpdatadir@
gimpdir = @gimpdir@
gimplocaledir = @gimplocaledir@
gimpplugindir = @gimpplugindir@
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- pkg/PLIST 22 Dec 2009 16:06:40 -0000 1.25
+++ pkg/PLIST 29 Jun 2010 11:03:54 -0000
@@ -1298,12 +1298,12 @@ share/gtk-doc/html/libgimpmath/right.png
share/gtk-doc/html/libgimpmath/style.css
share/gtk-doc/html/libgimpmath/up.png
share/gtk-doc/html/libgimpmodule/
-share/gtk-doc/html/libgimpmodule/GimpModule.html
-share/gtk-doc/html/libgimpmodule/GimpModuleDB.html
share/gtk-doc/html/libgimpmodule/home.png
share/gtk-doc/html/libgimpmodule/index.html
share/gtk-doc/html/libgimpmodule/index.sgml
share/gtk-doc/html/libgimpmodule/left.png
+share/gtk-doc/html/libgimpmodule/libgimpmodule-gimpmodule.html
+share/gtk-doc/html/libgimpmodule/libgimpmodule-gimpmoduledb.html
share/gtk-doc/html/libgimpmodule/libgimpmodule-index-deprecated.html
share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-2.html
share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-4.html
@@ -1765,6 +1765,10 @@ share/locale/ar/LC_MESSAGES/gimp20-scrip
share/locale/ar/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/ar/LC_MESSAGES/gimp20-tips.mo
share/locale/ar/LC_MESSAGES/gimp20.mo
+share/locale/ast/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ast/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ast/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ast/LC_MESSAGES/gimp20.mo
share/locale/az/LC_MESSAGES/gimp20-libgimp.mo
share/locale/az/LC_MESSAGES/gimp20-python.mo
share/locale/az/LC_MESSAGES/gimp20-script-fu.mo
@@ -1976,12 +1980,19 @@ share/locale/ms/LC_MESSAGES/gimp20-scrip
share/locale/ms/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/ms/LC_MESSAGES/gimp20-tips.mo
share/locale/ms/LC_MESSAGES/gimp20.mo
+share/locale/my/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/my/LC_MESSAGES/gimp20-python.mo
+share/locale/my/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/my/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/my/LC_MESSAGES/gimp20-tips.mo
+share/locale/my/LC_MESSAGES/gimp20.mo
share/locale/nb/LC_MESSAGES/gimp20-libgimp.mo
share/locale/nb/LC_MESSAGES/gimp20-python.mo
share/locale/nb/LC_MESSAGES/gimp20-script-fu.mo
share/locale/nb/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/nb/LC_MESSAGES/gimp20-tips.mo
share/locale/nb/LC_MESSAGES/gimp20.mo
+share/locale/nds/LC_MESSAGES/gimp20.mo
share/locale/ne/LC_MESSAGES/gimp20-libgimp.mo
share/locale/ne/LC_MESSAGES/gimp20-python.mo
share/locale/ne/LC_MESSAGES/gimp20-script-fu.mo
@@ -2116,6 +2127,9 @@ share/locale/zh_CN/LC_MESSAGES/gimp20-sc
share/locale/zh_CN/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/zh_CN/LC_MESSAGES/gimp20-tips.mo
share/locale/zh_CN/LC_MESSAGES/gimp20.mo
+share/locale/zh_HK/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/zh_HK/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/zh_HK/LC_MESSAGES/gimp20-tips.mo
share/locale/zh_HK/LC_MESSAGES/gimp20.mo
share/locale/zh_TW/LC_MESSAGES/gimp20-libgimp.mo
share/locale/zh_TW/LC_MESSAGES/gimp20-python.mo
