- Sync with maintree: update to 2.2.13

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

9 files changed, 36 insertions, 24 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 12a11840a..4d2cf97ec 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,10 +3,10 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/graphics/gimp/Makefile,v 1.1 2006/07/18 13:01:27 ahze Exp $
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.11
+PORTVERSION=	2.2.13
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
@@ -41,12 +41,13 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${DOCSDIR} \
 		--disable-gtk-doc \
-		--enable-static
+		--enable-static \
+		--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index e2a783c32..b3e8ef4f1 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.2.11.tar.bz2) = 0403e9b4e0415c99cd27b137b9839212
-SHA256 (gimp-2.2.11.tar.bz2) = 169441ac8dd59d0dda52e4a93622e9824e74bf79b56aab6908c74ffd0418a2d4
-SIZE (gimp-2.2.11.tar.bz2) = 12854751
+MD5 (gimp-2.2.13.tar.bz2) = d84a4a476a0c4fae24602db67f6fe49a
+SHA256 (gimp-2.2.13.tar.bz2) = d0273a3133461f5531bfa17ee24419abfe1f21121b03ef99195a2371a79b2ed7
+SIZE (gimp-2.2.13.tar.bz2) = 12930670
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 0b7059051..6998b0799 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -490,6 +490,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/libgimp-image.html
 %%DOCSDIR%%/libgimp/libgimp-selectors.html
 %%DOCSDIR%%/libgimp/libgimp.devhelp
+%%DOCSDIR%%/libgimp/libgimp.devhelp2
 %%DOCSDIR%%/libgimp/libgimp.html
 %%DOCSDIR%%/libgimp/libgimpui-hierarchy.html
 %%DOCSDIR%%/libgimp/libgimpui.html
@@ -516,6 +517,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpversion.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpwire.html
 %%DOCSDIR%%/libgimpbase/libgimpbase.devhelp
+%%DOCSDIR%%/libgimpbase/libgimpbase.devhelp2
 %%DOCSDIR%%/libgimpbase/libgimpbase.html
 %%DOCSDIR%%/libgimpbase/right.png
 %%DOCSDIR%%/libgimpbase/style.css
@@ -568,6 +570,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-error.html
 %%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-utils.html
 %%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp2
 %%DOCSDIR%%/libgimpthumb/libgimpthumb.html
 %%DOCSDIR%%/libgimpthumb/right.png
 %%DOCSDIR%%/libgimpthumb/style.css
@@ -610,7 +613,6 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpScrolledPreview.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpStock.html
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpStock.html~
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpWidgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-cell-renderers.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-colordisplay.html
@@ -622,6 +624,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-utils.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-widgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets.devhelp
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets.devhelp2
 %%DOCSDIR%%/libgimpwidgets/right.png
 %%DOCSDIR%%/libgimpwidgets/stock-anchor-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 12a11840a..4d2cf97ec 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,10 +3,10 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/graphics/gimp/Makefile,v 1.1 2006/07/18 13:01:27 ahze Exp $
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.11
+PORTVERSION=	2.2.13
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
@@ -41,12 +41,13 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${DOCSDIR} \
 		--disable-gtk-doc \
-		--enable-static
+		--enable-static \
+		--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index e2a783c32..b3e8ef4f1 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.2.11.tar.bz2) = 0403e9b4e0415c99cd27b137b9839212
-SHA256 (gimp-2.2.11.tar.bz2) = 169441ac8dd59d0dda52e4a93622e9824e74bf79b56aab6908c74ffd0418a2d4
-SIZE (gimp-2.2.11.tar.bz2) = 12854751
+MD5 (gimp-2.2.13.tar.bz2) = d84a4a476a0c4fae24602db67f6fe49a
+SHA256 (gimp-2.2.13.tar.bz2) = d0273a3133461f5531bfa17ee24419abfe1f21121b03ef99195a2371a79b2ed7
+SIZE (gimp-2.2.13.tar.bz2) = 12930670
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 0b7059051..6998b0799 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -490,6 +490,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/libgimp-image.html
 %%DOCSDIR%%/libgimp/libgimp-selectors.html
 %%DOCSDIR%%/libgimp/libgimp.devhelp
+%%DOCSDIR%%/libgimp/libgimp.devhelp2
 %%DOCSDIR%%/libgimp/libgimp.html
 %%DOCSDIR%%/libgimp/libgimpui-hierarchy.html
 %%DOCSDIR%%/libgimp/libgimpui.html
@@ -516,6 +517,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpversion.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpwire.html
 %%DOCSDIR%%/libgimpbase/libgimpbase.devhelp
+%%DOCSDIR%%/libgimpbase/libgimpbase.devhelp2
 %%DOCSDIR%%/libgimpbase/libgimpbase.html
 %%DOCSDIR%%/libgimpbase/right.png
 %%DOCSDIR%%/libgimpbase/style.css
@@ -568,6 +570,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-error.html
 %%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-utils.html
 %%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp2
 %%DOCSDIR%%/libgimpthumb/libgimpthumb.html
 %%DOCSDIR%%/libgimpthumb/right.png
 %%DOCSDIR%%/libgimpthumb/style.css
@@ -610,7 +613,6 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpScrolledPreview.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpStock.html
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpStock.html~
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpWidgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-cell-renderers.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-colordisplay.html
@@ -622,6 +624,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-utils.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-widgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets.devhelp
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets.devhelp2
 %%DOCSDIR%%/libgimpwidgets/right.png
 %%DOCSDIR%%/libgimpwidgets/stock-anchor-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 12a11840a..4d2cf97ec 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,10 +3,10 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/graphics/gimp/Makefile,v 1.1 2006/07/18 13:01:27 ahze Exp $
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.11
+PORTVERSION=	2.2.13
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
@@ -41,12 +41,13 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${DOCSDIR} \
 		--disable-gtk-doc \
-		--enable-static
+		--enable-static \
+		--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index e2a783c32..b3e8ef4f1 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.2.11.tar.bz2) = 0403e9b4e0415c99cd27b137b9839212
-SHA256 (gimp-2.2.11.tar.bz2) = 169441ac8dd59d0dda52e4a93622e9824e74bf79b56aab6908c74ffd0418a2d4
-SIZE (gimp-2.2.11.tar.bz2) = 12854751
+MD5 (gimp-2.2.13.tar.bz2) = d84a4a476a0c4fae24602db67f6fe49a
+SHA256 (gimp-2.2.13.tar.bz2) = d0273a3133461f5531bfa17ee24419abfe1f21121b03ef99195a2371a79b2ed7
+SIZE (gimp-2.2.13.tar.bz2) = 12930670
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 0b7059051..6998b0799 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -490,6 +490,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/libgimp-image.html
 %%DOCSDIR%%/libgimp/libgimp-selectors.html
 %%DOCSDIR%%/libgimp/libgimp.devhelp
+%%DOCSDIR%%/libgimp/libgimp.devhelp2
 %%DOCSDIR%%/libgimp/libgimp.html
 %%DOCSDIR%%/libgimp/libgimpui-hierarchy.html
 %%DOCSDIR%%/libgimp/libgimpui.html
@@ -516,6 +517,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpversion.html
 %%DOCSDIR%%/libgimpbase/libgimpbase-gimpwire.html
 %%DOCSDIR%%/libgimpbase/libgimpbase.devhelp
+%%DOCSDIR%%/libgimpbase/libgimpbase.devhelp2
 %%DOCSDIR%%/libgimpbase/libgimpbase.html
 %%DOCSDIR%%/libgimpbase/right.png
 %%DOCSDIR%%/libgimpbase/style.css
@@ -568,6 +570,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-error.html
 %%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-utils.html
 %%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp2
 %%DOCSDIR%%/libgimpthumb/libgimpthumb.html
 %%DOCSDIR%%/libgimpthumb/right.png
 %%DOCSDIR%%/libgimpthumb/style.css
@@ -610,7 +613,6 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpScrolledPreview.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpStock.html
-%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpStock.html~
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-GimpWidgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-cell-renderers.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-colordisplay.html
@@ -622,6 +624,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-utils.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-widgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets.devhelp
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets.devhelp2
 %%DOCSDIR%%/libgimpwidgets/right.png
 %%DOCSDIR%%/libgimpwidgets/stock-anchor-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png