From 311076bbe86e47e43c757780039dd743decbae9a Mon Sep 17 00:00:00 2001 From: giovanni Date: Tue, 2 Oct 2012 13:10:44 +0000 Subject: [PATCH] Update to 2.8.2 Update and sort WANTLIB (from Brad) ok ajacoutot@ --- graphics/gimp/stable/Makefile | 33 ++++++++----------- graphics/gimp/stable/distinfo | 4 +-- .../patches/patch-plug-ins_common_Makefile_in | 13 +++----- 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/graphics/gimp/stable/Makefile b/graphics/gimp/stable/Makefile index 536f6158939..0e67be27f4b 100644 --- a/graphics/gimp/stable/Makefile +++ b/graphics/gimp/stable/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.82 2012/09/27 00:17:51 brad Exp $ +# $OpenBSD: Makefile,v 1.83 2012/10/02 13:10:44 giovanni Exp $ COMMENT= GNU Image Manipulation Program SHARED_ONLY= Yes -DISTNAME= gimp-2.8.0 -REVISION= 2 +DISTNAME= gimp-2.8.2 SHARED_LIBS+= gimp-2.0 272.0 # 800.0 SHARED_LIBS+= gimpbase-2.0 272.0 # 800.0 @@ -53,22 +52,18 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE SM X11 Xext Xmu Xpm Xrender Xt atk-1.0 c \ - Xcomposite Xdamage pcre crypto idn ssl \ - fontconfig freetype glib-2.0 gmodule-2.0 \ - gobject-2.0 jpeg>=62 lcms lcms2 m pango-1.0 \ - pangocairo-1.0 pangoft2-1.0 pixman-1 png>=4 \ - pthread ncurses xml2 z cairo dbus-1 \ - Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr \ - expat Xcomposite Xdamage gthread-2.0 pcre \ - croco-0.6 gio-2.0 rsvg-2 babl-0.1 \ - pthread-stubs xcb execinfo xcb-render \ - gdk-x11-2.0 gdk_pixbuf-2.0 bz2 jasper \ - gtk-x11-2.0 tiff>=35 aa>=1.3 dbus-glib-1 \ - exif mng poppler>=3 wmf-0.2 wmflite-0.2 \ - poppler-glib>=3 gegl-0.2 openjpeg>=4 curl \ - GL Xxf86vm drm xcb-shm ffi stdc++ harfbuzz \ - icudata icule icuuc +WANTLIB= GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ + Xext Xfixes Xi Xinerama Xmu Xpm Xrandr Xrender Xt Xxf86vm \ + aa asn1 atk-1.0 babl-0.1 bz2 c cairo croco-0.6 crypto \ + cups cupsimage curl dbus-1 dbus-glib-1 drm execinfo \ + exif expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \ + gegl-0.2 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gs \ + gssapi gthread-2.0 gtk-x11-2.0 harfbuzz icudata icule \ + icuuc idn ijs jasper jbig2dec jpeg krb5 lcms lcms2 \ + m mng ncurses openjpeg pango-1.0 pangocairo-1.0 pangoft2-1.0 \ + pcre pixman-1 png poppler poppler-glib pthread pthread-stubs \ + rsvg-2 ssl stdc++ tiff wmf-0.2 wmflite-0.2 xcb xcb-render \ + xcb-shm xml2 z MODULES= devel/gettext \ textproc/intltool \ diff --git a/graphics/gimp/stable/distinfo b/graphics/gimp/stable/distinfo index db7fdf40b8d..9ba605d3e45 100644 --- a/graphics/gimp/stable/distinfo +++ b/graphics/gimp/stable/distinfo @@ -1,2 +1,2 @@ -SHA256 (gimp-2.8.0.tar.bz2) = 3WzuCA0Y+u+gELpII+YO58SaTRV0p4xt+1kFkqCfLcw= -SIZE (gimp-2.8.0.tar.bz2) = 20142440 +SHA256 (gimp-2.8.2.tar.bz2) = DNGn5n4TLq2BDhbjH/kpOUyD/PhB5KKVxF1vOClgGtk= +SIZE (gimp-2.8.2.tar.bz2) = 20161424 diff --git a/graphics/gimp/stable/patches/patch-plug-ins_common_Makefile_in b/graphics/gimp/stable/patches/patch-plug-ins_common_Makefile_in index ebbba89ad6a..86b0635a749 100644 --- a/graphics/gimp/stable/patches/patch-plug-ins_common_Makefile_in +++ b/graphics/gimp/stable/patches/patch-plug-ins_common_Makefile_in @@ -1,12 +1,7 @@ -$OpenBSD: patch-plug-ins_common_Makefile_in,v 1.1 2012/07/16 09:42:24 giovanni Exp $ ---- plug-ins/common/Makefile.in.orig Wed May 2 10:56:41 2012 -+++ plug-ins/common/Makefile.in Mon Jul 16 09:41:22 2012 -@@ -111,11 +111,11 @@ libexec_PROGRAMS = alien-map$(EXEEXT) align-layers$(EX - whirl-pinch$(EXEEXT) wind$(EXEEXT) - EXTRA_PROGRAMS = file-aa$(EXEEXT) file-jp2-load$(EXEEXT) \ - file-mng$(EXEEXT) file-pdf-load$(EXEEXT) \ -- file-pdf-save$(EXEEXT) file-png$(EXEEXT) file-ps$(EXEEXT) \ -+ file-pdf-save$(EXEEXT) file-png$(EXEEXT) \ +$OpenBSD: patch-plug-ins_common_Makefile_in,v 1.2 2012/10/02 13:10:44 giovanni Exp $ +--- plug-ins/common/Makefile.in.orig Wed May 2 04:56:41 2012 ++++ plug-ins/common/Makefile.in Wed Sep 26 20:42:58 2012 +@@ -115,7 +115,7 @@ EXTRA_PROGRAMS = file-aa$(EXEEXT) file-jp2-load$(EXEEX file-psp$(EXEEXT) file-svg$(EXEEXT) file-tiff-load$(EXEEXT) \ file-tiff-save$(EXEEXT) file-wmf$(EXEEXT) file-xmc$(EXEEXT) \ file-xpm$(EXEEXT) lcms$(EXEEXT) mail$(EXEEXT) \