Update to 2.3.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4880 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 30 insertions, 35 deletions

diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 32777424f..22b633135 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-devel/Makefile,v 1.7 2005/07/04 00:11:29 marcus Exp $
+#   $MCom: ports/graphics/gimp-devel/Makefile,v 1.8 2005/08/17 15:46:10 kwm Exp $
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.3.3
+PORTVERSION=	2.3.4
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -32,7 +32,7 @@ LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf \
 
 CONFLICTS=	gimp-1.* gimp-2.2.*
 
-SHLIBVER?=	303
+SHLIBVER?=	0
 
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
@@ -40,9 +40,12 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2 \
+		ltverhack
 WANT_GNOME=	yes
+USE_GCC=	3.4+
 INSTALLS_SHLIB=	yes
+INSTALLS_ICONS=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl \
@@ -78,7 +81,7 @@ CONFIGURE_ARGS+=	--enable-debug
 .if defined(WITH_PYTHON)
 USE_PYTHON=		yes
 # we need to manually include this, because USE_PYTHON is defined
-# after including bsd.port.pre.mk
+# # after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 USE_GNOME+=		pygtk2
 CONFIGURE_ARGS+=	--enable-python
@@ -89,10 +92,12 @@ PLIST_SUB+=		PYTHON:="@comment "
 .endif
 
 .if defined(WITHOUT_PRINT)
-CONFIGURE_ARGS+=	--disable-print
+CONFIGURE_ARGS+=	--disable-print \
+			--without-gnomeprint
 PLIST_SUB+=		PRINT="@comment "
 .else
 LIB_DEPENDS+=		gimpprint.2:${PORTSDIR}/print/gimp-print
+USE_GNOME+=		libgnomeprintui
 PLIST_SUB+=		PRINT=""
 .endif
 
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 595a51811..417124850 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.3.3.tar.bz2) = 08b27555772a8bafeb428a6a34d4c685
-SIZE (gimp-2.3.3.tar.bz2) = 16858667
+MD5 (gimp-2.3.4.tar.bz2) = aed743d450b268dfadcd79c3487e46ea
+SIZE (gimp-2.3.4.tar.bz2) = 14758691
diff --git a/graphics/gimp-devel/files/patch-plug-ins_common_poppler.c b/graphics/gimp-devel/files/patch-plug-ins_common_poppler.c
deleted file mode 100644
index 9db2e2d60..000000000
--- a/graphics/gimp-devel/files/patch-plug-ins_common_poppler.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- plug-ins/common/poppler.c.orig	Wed Aug 17 08:05:13 2005
-+++ plug-ins/common/poppler.c	Wed Aug 17 08:11:52 2005
-@@ -487,8 +496,7 @@ load_image (PopplerDocument  *doc,
-       poppler_page_render_to_pixbuf (page, 0, 0,
-                                      width, height,
-                                      scale,
--                                     buf,
--                                     0, 0);
-+                                     buf);
- 
-       g_object_get (G_OBJECT (page), "label", &page_label, NULL);
- 
-@@ -539,8 +551,7 @@ get_thumbnail (PopplerDocument *doc,
-       poppler_page_render_to_pixbuf (page, 0, 0,
-                                      width, height,
-                                      scale,
--                                     pixbuf,
--                                     0, 0);
-+                                     pixbuf);
-     }
- 
-   g_object_unref (page);
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 0ed5d4f37..0c9de1810 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -99,6 +99,7 @@ include/gimp-2.0/libgimp/gimpuitypes.h
 include/gimp-2.0/libgimp/gimpundo_pdb.h
 include/gimp-2.0/libgimp/gimpunit_pdb.h
 include/gimp-2.0/libgimp/gimpvectors_pdb.h
+include/gimp-2.0/libgimp/gimpzoompreview.h
 include/gimp-2.0/libgimpbase/gimpbase.h
 include/gimp-2.0/libgimpbase/gimpbaseenums.h
 include/gimp-2.0/libgimpbase/gimpbasetypes.h
@@ -194,6 +195,7 @@ include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
 include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetsenums.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
+include/gimp-2.0/libgimpwidgets/gimpzoommodel.h
 libexec/gimp/2.2/environ/default.env
 %%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
 libexec/gimp/2.2/interpreters/default.interp
@@ -221,6 +223,7 @@ libexec/gimp/2.2/plug-ins/animoptimize
 libexec/gimp/2.2/plug-ins/apply_lens
 libexec/gimp/2.2/plug-ins/autocrop
 libexec/gimp/2.2/plug-ins/autostretch_hsv
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/benchmark-foreground-extract.py
 libexec/gimp/2.2/plug-ins/blinds
 libexec/gimp/2.2/plug-ins/blur
 libexec/gimp/2.2/plug-ins/bmp
@@ -277,6 +280,7 @@ libexec/gimp/2.2/plug-ins/gih
 libexec/gimp/2.2/plug-ins/gimpressionist
 libexec/gimp/2.2/plug-ins/glasstile
 libexec/gimp/2.2/plug-ins/glob
+%%PRINT%%libexec/gimp/2.2/plug-ins/gnomeprint
 libexec/gimp/2.2/plug-ins/gqbist
 libexec/gimp/2.2/plug-ins/gradmap
 libexec/gimp/2.2/plug-ins/grid
@@ -864,9 +868,9 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-portrait-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-print-resolution-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-print-resolution-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-qmask-off-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-qmask-on-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-question-64.png
+%%DOCSDIR%%/libgimpwidgets/stock-quick-mask-off-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-quick-mask-on-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-reset-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-reshow-filter-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-resize-16.png
@@ -1300,7 +1304,7 @@ share/aclocal/gimp-2.0.m4
 %%DATADIR%%/menus/palette-editor-menu.xml
 %%DATADIR%%/menus/palettes-menu.xml
 %%DATADIR%%/menus/patterns-menu.xml
-%%DATADIR%%/menus/qmask-menu.xml
+%%DATADIR%%/menus/quick-mask-menu.xml
 %%DATADIR%%/menus/sample-point-editor-menu.xml
 %%DATADIR%%/menus/selection-editor-menu.xml
 %%DATADIR%%/menus/templates-menu.xml
@@ -1308,6 +1312,7 @@ share/aclocal/gimp-2.0.m4
 %%DATADIR%%/menus/tool-options-menu.xml
 %%DATADIR%%/menus/toolbox-menu.xml
 %%DATADIR%%/menus/tools-menu.xml
+%%DATADIR%%/menus/undo-editor-menu.xml
 %%DATADIR%%/menus/vectors-menu.xml
 share/%%GTK%%application-registry/gimp.applications
 share/%%GTK%%applications/gimp.desktop
@@ -1480,6 +1485,8 @@ share/%%GTK%%mime-info/gimp.keys
 %%DATADIR%%/scripts/neon-logo.scm
 %%DATADIR%%/scripts/news-text.scm
 %%DATADIR%%/scripts/old-photo.scm
+%%DATADIR%%/scripts/paste-as-brush.scm
+%%DATADIR%%/scripts/paste-as-pattern.scm
 %%DATADIR%%/scripts/perspective-shadow.scm
 %%DATADIR%%/scripts/predator.scm
 %%DATADIR%%/scripts/pupi-button.scm
@@ -1689,9 +1696,9 @@ share/%%GTK%%mime-info/gimp.keys
 %%DATADIR%%/themes/Default/images/stock-portrait-16.png
 %%DATADIR%%/themes/Default/images/stock-print-resolution-16.png
 %%DATADIR%%/themes/Default/images/stock-print-resolution-24.png
-%%DATADIR%%/themes/Default/images/stock-qmask-off-16.png
-%%DATADIR%%/themes/Default/images/stock-qmask-on-16.png
 %%DATADIR%%/themes/Default/images/stock-question-64.png
+%%DATADIR%%/themes/Default/images/stock-quick-mask-off-16.png
+%%DATADIR%%/themes/Default/images/stock-quick-mask-on-16.png
 %%DATADIR%%/themes/Default/images/stock-reset-16.png
 %%DATADIR%%/themes/Default/images/stock-reshow-filter-16.png
 %%DATADIR%%/themes/Default/images/stock-resize-16.png
@@ -1904,6 +1911,11 @@ share/locale/gl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/gl/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/gl/LC_MESSAGES/gimp20-tips.mo
 share/locale/gl/LC_MESSAGES/gimp20.mo
+share/locale/gu/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/gu/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/gu/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/gu/LC_MESSAGES/gimp20-tips.mo
+share/locale/gu/LC_MESSAGES/gimp20.mo
 share/locale/he/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/he/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/he/LC_MESSAGES/gimp20-std-plug-ins.mo