This diff fixes Gimp help subsystem (the help menu), by removing a
dependency (x11/gnome/vfs2) and adding net/curl (works better to fetch
remote files).
A hidden dependency on devel/iso-codes is also removed.
Plist regenerated.
Ok ? Comments ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile 10 Aug 2009 06:31:44 -0000 1.49
+++ Makefile 11 Aug 2009 09:42:39 -0000
@@ -3,7 +3,7 @@
COMMENT= GNU Image Manipulation Program
DISTNAME= gimp-2.6.6
-PKGNAME= ${DISTNAME}p1
+PKGNAME= ${DISTNAME}p2
SHARED_LIBS= gimp-2.0 266.0 \
gimpbase-2.0 266.0 \
gimpcolor-2.0 266.0 \
@@ -38,7 +38,7 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,
poppler.>=3,poppler-glib.>=3::print/poppler \
gegl-0.0::graphics/gegl \
:py-gtk2-*:x11/py-gtk2 \
- gnomevfs-2.>=2000::x11/gnome/vfs2
+ curl::net/curl
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@@ -47,20 +47,19 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xmu Xpm Xrender Xt atk-1.0 c \
- Xcomposite Xdamage pcre \
- avahi-client avahi-common avahi-glib \
+ Xcomposite Xdamage pcre crypto idn ssl \
fontconfig freetype glib-2.0 gmodule-2.0 \
gobject-2.0 jpeg.>=62 lcms.>=1 m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pixman-1 png.>=4 \
pthread ncurses xml2 z cairo dbus-1 glitz \
Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr \
expat Xcomposite Xdamage gthread-2.0 pcre \
- ORBit-2 bz2 croco-0.6 crypto gconf-2 gio-2.0 \
- gsf-1 rsvg-2 ssl util babl-0.0 \
+ bz2 croco-0.6 gio-2.0 gsf-1 rsvg-2 babl-0.0 \
pthread-stubs xcb
MODULES= devel/gettext \
- textproc/intltool
+ textproc/intltool \
+ lang/python
USE_X11= Yes
USE_GMAKE= Yes
@@ -69,8 +68,8 @@ AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+=--without-gtkhtml2 --without-gvfs \
- --without-libcurl --without-webkit \
- --enable-gimp-remote
+ --without-gnomevfs --with-libcurl \
+ --without-webkit --enable-gimp-remote
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/patches/patch-configure_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure_in
--- patches/patch-configure_in 16 Nov 2008 21:19:23 -0000 1.7
+++ patches/patch-configure_in 11 Aug 2009 09:42:39 -0000
@@ -1,7 +1,23 @@
$OpenBSD: patch-configure_in,v 1.7 2008/11/16 21:19:23 kili Exp $
---- configure.in.orig Thu Oct 30 10:33:25 2008
-+++ configure.in Fri Nov 14 09:03:17 2008
-@@ -1141,10 +1141,10 @@ if test "x$with_libmng" != xno && test -z "$MNG_LIBS"
+--- 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
+ ###########
+
+ AC_MSG_CHECKING([for iso-codes])
+-PKG_CHECK_EXISTS(iso-codes,
+- have_iso_codes="yes"
+- AC_DEFINE(HAVE_ISO_CODES, 1,
+- [Define to 1 if the iso-codes package is available])
+- ISO_CODES_PREFIX=`$PKG_CONFIG --variable=prefix iso-codes`
+- ISO_CODES_LOCATION="$ISO_CODES_PREFIX/share/xml/iso-codes"
+- ISO_CODES_LOCALEDIR="$ISO_CODES_PREFIX/$DATADIRNAME/locale",
+- have_iso_codes="no (iso-codes package not found)")
++ have_iso_codes="no (iso-codes package not found)"
+ 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"
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)],
@@ -14,7 +30,7 @@ $OpenBSD: patch-configure_in,v 1.7 2008/
else
have_libmng="no (MNG header file not found)"
fi
-@@ -1332,19 +1332,9 @@ if test "x$with_gnomevfs" != xno; then
+@@ -1332,19 +1325,9 @@ if test "x$with_gnomevfs" != xno; then
gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gimp/stable/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -r1.21 PLIST
--- pkg/PLIST 2 Feb 2009 18:32:20 -0000 1.21
+++ pkg/PLIST 11 Aug 2009 09:42:41 -0000
@@ -478,7 +478,6 @@ lib/libgimpui-2.0.a
lib/libgimpui-2.0.la
lib/libgimpwidgets-2.0.a
lib/libgimpwidgets-2.0.la
-lib/pkgconfig/
lib/pkgconfig/gimp-2.0.pc
lib/pkgconfig/gimpthumb-2.0.pc
lib/pkgconfig/gimpui-2.0.pc
@@ -1104,8 +1103,6 @@ share/gimp/2.0/themes/Small/
share/gimp/2.0/themes/Small/gtkrc
share/gimp/2.0/tips/
share/gimp/2.0/tips/gimp-tips.xml
-share/gtk-doc/
-share/gtk-doc/html/
share/gtk-doc/html/libgimp/
share/gtk-doc/html/libgimp/GimpAspectPreview.html
share/gtk-doc/html/libgimp/GimpBrushSelectButton.html
@@ -1754,42 +1751,20 @@ share/gtk-doc/html/libgimpwidgets/stock-
share/gtk-doc/html/libgimpwidgets/stock-zoom-follow-window-12.png
share/gtk-doc/html/libgimpwidgets/style.css
share/gtk-doc/html/libgimpwidgets/up.png
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/gimp.png
-share/icons/hicolor/22x22/
-share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/gimp.png
-share/icons/hicolor/24x24/
-share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/gimp.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/gimp.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/gimp.png
-share/icons/hicolor/64x64/
-share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/gimp.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/gimp.svg
-share/locale/am/
-share/locale/am/LC_MESSAGES/
share/locale/am/LC_MESSAGES/gimp20.mo
-share/locale/ar/
-share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/gimp20-libgimp.mo
share/locale/ar/LC_MESSAGES/gimp20-python.mo
share/locale/ar/LC_MESSAGES/gimp20-script-fu.mo
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/az/
-share/locale/az/LC_MESSAGES/
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
@@ -1812,8 +1787,6 @@ share/locale/ca/LC_MESSAGES/gimp20-scrip
share/locale/ca/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/ca/LC_MESSAGES/gimp20-tips.mo
share/locale/ca/LC_MESSAGES/gimp20.mo
-share/locale/c...@valencia/
-share/locale/c...@valencia/LC_MESSAGES/
share/locale/c...@valencia/LC_MESSAGES/gimp20-libgimp.mo
share/locale/c...@valencia/LC_MESSAGES/gimp20-python.mo
share/locale/c...@valencia/LC_MESSAGES/gimp20-script-fu.mo
@@ -1838,8 +1811,6 @@ share/locale/de/LC_MESSAGES/gimp20-scrip
share/locale/de/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/de/LC_MESSAGES/gimp20-tips.mo
share/locale/de/LC_MESSAGES/gimp20.mo
-share/locale/dz/
-share/locale/dz/LC_MESSAGES/
share/locale/dz/LC_MESSAGES/gimp20-libgimp.mo
share/locale/dz/LC_MESSAGES/gimp20-python.mo
share/locale/dz/LC_MESSAGES/gimp20-script-fu.mo
@@ -1851,16 +1822,12 @@ share/locale/el/LC_MESSAGES/gimp20-pytho
share/locale/el/LC_MESSAGES/gimp20-script-fu.mo
share/locale/el/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/el/LC_MESSAGES/gimp20.mo
-share/locale/en_CA/
-share/locale/en_CA/LC_MESSAGES/
share/locale/en_CA/LC_MESSAGES/gimp20-libgimp.mo
share/locale/en_CA/LC_MESSAGES/gimp20-python.mo
share/locale/en_CA/LC_MESSAGES/gimp20-script-fu.mo
share/locale/en_CA/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/en_CA/LC_MESSAGES/gimp20-tips.mo
share/locale/en_CA/LC_MESSAGES/gimp20.mo
-share/locale/en_GB/
-share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/gimp20-libgimp.mo
share/locale/en_GB/LC_MESSAGES/gimp20-python.mo
share/locale/en_GB/LC_MESSAGES/gimp20-script-fu.mo
@@ -1890,8 +1857,6 @@ share/locale/eu/LC_MESSAGES/gimp20-scrip
share/locale/eu/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/eu/LC_MESSAGES/gimp20-tips.mo
share/locale/eu/LC_MESSAGES/gimp20.mo
-share/locale/fa/
-share/locale/fa/LC_MESSAGES/
share/locale/fa/LC_MESSAGES/gimp20-libgimp.mo
share/locale/fa/LC_MESSAGES/gimp20-python.mo
share/locale/fa/LC_MESSAGES/gimp20-script-fu.mo
@@ -1921,8 +1886,6 @@ share/locale/gl/LC_MESSAGES/gimp20-scrip
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/
-share/locale/gu/LC_MESSAGES/
share/locale/gu/LC_MESSAGES/gimp20-libgimp.mo
share/locale/gu/LC_MESSAGES/gimp20-python.mo
share/locale/gu/LC_MESSAGES/gimp20-script-fu.mo
@@ -1934,8 +1897,6 @@ share/locale/he/LC_MESSAGES/gimp20-scrip
share/locale/he/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/he/LC_MESSAGES/gimp20-tips.mo
share/locale/he/LC_MESSAGES/gimp20.mo
-share/locale/hi/
-share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/gimp20.mo
share/locale/hr/LC_MESSAGES/gimp20-libgimp.mo
share/locale/hr/LC_MESSAGES/gimp20-python.mo
@@ -1953,8 +1914,6 @@ share/locale/id/LC_MESSAGES/gimp20-libgi
share/locale/id/LC_MESSAGES/gimp20-script-fu.mo
share/locale/id/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/id/LC_MESSAGES/gimp20.mo
-share/locale/is/
-share/locale/is/LC_MESSAGES/
share/locale/is/LC_MESSAGES/gimp20-libgimp.mo
share/locale/is/LC_MESSAGES/gimp20-python.mo
share/locale/is/LC_MESSAGES/gimp20-script-fu.mo
@@ -1973,8 +1932,6 @@ share/locale/ja/LC_MESSAGES/gimp20-scrip
share/locale/ja/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/ja/LC_MESSAGES/gimp20-tips.mo
share/locale/ja/LC_MESSAGES/gimp20.mo
-share/locale/ka/
-share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/gimp20.mo
share/locale/km/
share/locale/km/LC_MESSAGES/
@@ -1990,8 +1947,6 @@ share/locale/ko/LC_MESSAGES/gimp20-scrip
share/locale/ko/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/ko/LC_MESSAGES/gimp20-tips.mo
share/locale/ko/LC_MESSAGES/gimp20.mo
-share/locale/lt/
-share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/gimp20-libgimp.mo
share/locale/lt/LC_MESSAGES/gimp20-python.mo
share/locale/lt/LC_MESSAGES/gimp20-script-fu.mo
@@ -2000,19 +1955,13 @@ share/locale/lt/LC_MESSAGES/gimp20-tips.
share/locale/lt/LC_MESSAGES/gimp20.mo
share/locale/lv/LC_MESSAGES/gimp20-libgimp.mo
share/locale/lv/LC_MESSAGES/gimp20.mo
-share/locale/mk/
-share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/gimp20-libgimp.mo
share/locale/mk/LC_MESSAGES/gimp20-python.mo
share/locale/mk/LC_MESSAGES/gimp20-script-fu.mo
share/locale/mk/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/mk/LC_MESSAGES/gimp20-tips.mo
share/locale/mk/LC_MESSAGES/gimp20.mo
-share/locale/ml/
-share/locale/ml/LC_MESSAGES/
share/locale/ml/LC_MESSAGES/gimp20.mo
-share/locale/ms/
-share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/gimp20-libgimp.mo
share/locale/ms/LC_MESSAGES/gimp20-python.mo
share/locale/ms/LC_MESSAGES/gimp20-script-fu.mo
@@ -2025,8 +1974,6 @@ share/locale/nb/LC_MESSAGES/gimp20-scrip
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/ne/
-share/locale/ne/LC_MESSAGES/
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
@@ -2045,15 +1992,11 @@ share/locale/nn/LC_MESSAGES/gimp20-scrip
share/locale/nn/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/nn/LC_MESSAGES/gimp20-tips.mo
share/locale/nn/LC_MESSAGES/gimp20.mo
-share/locale/oc/
-share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/gimp20-libgimp.mo
share/locale/oc/LC_MESSAGES/gimp20-python.mo
share/locale/oc/LC_MESSAGES/gimp20-script-fu.mo
share/locale/oc/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/oc/LC_MESSAGES/gimp20.mo
-share/locale/pa/
-share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
share/locale/pa/LC_MESSAGES/gimp20-python.mo
share/locale/pa/LC_MESSAGES/gimp20-script-fu.mo
@@ -2090,8 +2033,6 @@ share/locale/ru/LC_MESSAGES/gimp20-scrip
share/locale/ru/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/ru/LC_MESSAGES/gimp20-tips.mo
share/locale/ru/LC_MESSAGES/gimp20.mo
-share/locale/rw/
-share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/gimp20-libgimp.mo
share/locale/rw/LC_MESSAGES/gimp20-python.mo
share/locale/rw/LC_MESSAGES/gimp20-script-fu.mo
@@ -2116,8 +2057,6 @@ share/locale/sr/LC_MESSAGES/gimp20-scrip
share/locale/sr/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/sr/LC_MESSAGES/gimp20-tips.mo
share/locale/sr/LC_MESSAGES/gimp20.mo
-share/locale/s...@latin/
-share/locale/s...@latin/LC_MESSAGES/
share/locale/s...@latin/LC_MESSAGES/gimp20-libgimp.mo
share/locale/s...@latin/LC_MESSAGES/gimp20-python.mo
share/locale/s...@latin/LC_MESSAGES/gimp20-script-fu.mo
@@ -2130,19 +2069,13 @@ share/locale/sv/LC_MESSAGES/gimp20-scrip
share/locale/sv/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/sv/LC_MESSAGES/gimp20-tips.mo
share/locale/sv/LC_MESSAGES/gimp20.mo
-share/locale/ta/
-share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/gimp20.mo
-share/locale/th/
-share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/gimp20.mo
share/locale/tr/LC_MESSAGES/gimp20-libgimp.mo
share/locale/tr/LC_MESSAGES/gimp20-python.mo
share/locale/tr/LC_MESSAGES/gimp20-script-fu.mo
share/locale/tr/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/tr/LC_MESSAGES/gimp20.mo
-share/locale/tt/
-share/locale/tt/LC_MESSAGES/
share/locale/tt/LC_MESSAGES/gimp20.mo
share/locale/uk/LC_MESSAGES/gimp20-libgimp.mo
share/locale/uk/LC_MESSAGES/gimp20-python.mo
@@ -2156,15 +2089,11 @@ share/locale/vi/LC_MESSAGES/gimp20-scrip
share/locale/vi/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/vi/LC_MESSAGES/gimp20-tips.mo
share/locale/vi/LC_MESSAGES/gimp20.mo
-share/locale/xh/
-share/locale/xh/LC_MESSAGES/
share/locale/xh/LC_MESSAGES/gimp20-libgimp.mo
share/locale/xh/LC_MESSAGES/gimp20-python.mo
share/locale/xh/LC_MESSAGES/gimp20-script-fu.mo
share/locale/xh/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/xh/LC_MESSAGES/gimp20.mo
-share/locale/yi/
-share/locale/yi/LC_MESSAGES/
share/locale/yi/LC_MESSAGES/gimp20-libgimp.mo
share/locale/yi/LC_MESSAGES/gimp20-script-fu.mo
share/locale/yi/LC_MESSAGES/gimp20-std-plug-ins.mo
