summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/eog2/Makefile13
-rw-r--r--graphics/eog2/distinfo4
-rw-r--r--graphics/eog2/pkg-descr8
-rw-r--r--graphics/eog2/pkg-plist11
-rw-r--r--graphics/gpdf/Makefile6
-rw-r--r--graphics/gpdf/distinfo4
-rw-r--r--graphics/gpdf/files/patch-configure10
-rw-r--r--graphics/gpdf/files/patch-xpdf_gpdf-thumbnails-view.cc10
-rw-r--r--graphics/gpdf/pkg-descr6
-rw-r--r--graphics/gpdf/pkg-plist64
-rw-r--r--graphics/libgnomecanvas/Makefile8
-rw-r--r--graphics/libgnomecanvas/distinfo4
-rw-r--r--graphics/libgnomecanvas/files/patch-configure13
-rw-r--r--graphics/libgnomecanvas/pkg-descr8
-rw-r--r--graphics/libgnomecanvas/pkg-plist37
-rw-r--r--graphics/librsvg2/Makefile17
-rw-r--r--graphics/librsvg2/distinfo4
-rw-r--r--graphics/librsvg2/files/patch-configure13
-rw-r--r--graphics/librsvg2/files/patch-gimp-plugin_Makefile.in11
-rw-r--r--graphics/librsvg2/files/patch-rsvg-paint-server.c22
-rw-r--r--graphics/librsvg2/files/patch-rsvg-styles.c21
-rw-r--r--graphics/librsvg2/pkg-descr6
-rw-r--r--graphics/librsvg2/pkg-plist16
23 files changed, 173 insertions, 143 deletions
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index a1e05f9db003..3de65c4f619b 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= eog2
-PORTVERSION= 2.4.1
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6
DISTNAME= eog-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,11 +18,13 @@ COMMENT= The Eye Of Gnome image viewer
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier eel2 libgnomeprintui librsvg2
+USE_REINPLACE= yes
+USE_GNOME= gnomeprefix gnomehack gnomehier intlhack eel2 libgnomeprintui \
+ librsvg2
USE_X_PREFIX= yes
USE_LIBTOOL_VER=13
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
.include <bsd.port.pre.mk>
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index 1f3b73663e4e..73bb603c4a08 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/eog-2.4.1.tar.bz2) = a7098a85d0f36591521660cc778ed819
-SIZE (gnome2/eog-2.4.1.tar.bz2) = 696930
+MD5 (gnome2/eog-2.6.0.tar.bz2) = 7570aa11e8bfbf707b3cc6c3774e11af
+SIZE (gnome2/eog-2.6.0.tar.bz2) = 809205
diff --git a/graphics/eog2/pkg-descr b/graphics/eog2/pkg-descr
index 958b6353bdb1..fa7565d4c743 100644
--- a/graphics/eog2/pkg-descr
+++ b/graphics/eog2/pkg-descr
@@ -1,7 +1,5 @@
-This is the Eye of Gnome, an image viewer program. It is meant to be
-a fast and functional image viewer as well as an image cataloging
-program.
-
-This package requires the GNOME 2.0 development API.
+This is the Eye of Gnome, a GNOME 2 image viewer and cataloging
+application. It provides inline image viewing support for
+nautilus.
WWW: http://www.gnome.org/
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index d1f786ac6ba2..f64463611c9a 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -1,8 +1,12 @@
bin/eog
etc/gconf/gconf.xml.defaults/apps/eog/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/eog/full_screen/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/eog/ui/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/eog/view/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/eog/window/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/eog/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/eog/ui/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/eog/view/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/eog/window/%gconf.xml
etc/gconf/schemas/eog.schemas
@@ -69,6 +73,7 @@ share/gnome/omf/eog/eog-zh_CN.omf
share/gnome/omf/eog/eog-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/eog/down-right.png
+share/gnome/pixmaps/eog/loading.png
share/gnome/pixmaps/eog/orient-horizontal.png
share/gnome/pixmaps/eog/orient-vertical.png
share/gnome/pixmaps/eog/right-down.png
@@ -88,6 +93,8 @@ share/locale/cy/LC_MESSAGES/eog.mo
share/locale/da/LC_MESSAGES/eog.mo
share/locale/de/LC_MESSAGES/eog.mo
share/locale/el/LC_MESSAGES/eog.mo
+share/locale/en_CA/LC_MESSAGES/eog.mo
+share/locale/en_GB/LC_MESSAGES/eog.mo
share/locale/es/LC_MESSAGES/eog.mo
share/locale/et/LC_MESSAGES/eog.mo
share/locale/fa/LC_MESSAGES/eog.mo
@@ -97,6 +104,7 @@ share/locale/ga/LC_MESSAGES/eog.mo
share/locale/gl/LC_MESSAGES/eog.mo
share/locale/he/LC_MESSAGES/eog.mo
share/locale/hi/LC_MESSAGES/eog.mo
+share/locale/hr/LC_MESSAGES/eog.mo
share/locale/hu/LC_MESSAGES/eog.mo
share/locale/id/LC_MESSAGES/eog.mo
share/locale/is/LC_MESSAGES/eog.mo
@@ -113,6 +121,7 @@ share/locale/ms/LC_MESSAGES/eog.mo
share/locale/nl/LC_MESSAGES/eog.mo
share/locale/nn/LC_MESSAGES/eog.mo
share/locale/no/LC_MESSAGES/eog.mo
+share/locale/pa/LC_MESSAGES/eog.mo
share/locale/pl/LC_MESSAGES/eog.mo
share/locale/pt/LC_MESSAGES/eog.mo
share/locale/pt_BR/LC_MESSAGES/eog.mo
@@ -154,6 +163,8 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo
@dirrm share/gnome/help/eog/C/figures
@dirrm share/gnome/eog/glade
@dirrm share/gnome/eog
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/ui
+@dirrm etc/gconf/gconf.xml.defaults/apps/eog/ui
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-es.omf 2>/dev/null || /usr/bin/true
diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index 42bcf7c518cf..39c60932a447 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gpdf
-PORTVERSION= 0.112.1
+PORTVERSION= 0.131
CATEGORIES= graphics print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.112
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -17,7 +17,7 @@ COMMENT= GNOME version of xpdf
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libgnomeprintui
+USE_GNOME= gnomeprefix gnomehack intlhack lthack libgnomeui libgnomeprintui
USE_X_PREFIX= yes
USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gpdf/distinfo b/graphics/gpdf/distinfo
index 72d883063770..d29f76dc6d0f 100644
--- a/graphics/gpdf/distinfo
+++ b/graphics/gpdf/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gpdf-0.112.1.tar.bz2) = 67cad1ac559b4403cbc0c5a3fb1b327f
-SIZE (gnome2/gpdf-0.112.1.tar.bz2) = 839517
+MD5 (gnome2/gpdf-0.131.tar.bz2) = 95eeb0a33d37fbb5c56cf9260656d86d
+SIZE (gnome2/gpdf-0.131.tar.bz2) = 1101285
diff --git a/graphics/gpdf/files/patch-configure b/graphics/gpdf/files/patch-configure
deleted file mode 100644
index f195f07b43c6..000000000000
--- a/graphics/gpdf/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Wed Dec 11 18:31:51 2002
-+++ configure Thu Dec 12 12:07:17 2002
-@@ -7414,6 +7414,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/gpdf/files/patch-xpdf_gpdf-thumbnails-view.cc b/graphics/gpdf/files/patch-xpdf_gpdf-thumbnails-view.cc
new file mode 100644
index 000000000000..78e0b8155d02
--- /dev/null
+++ b/graphics/gpdf/files/patch-xpdf_gpdf-thumbnails-view.cc
@@ -0,0 +1,10 @@
+--- xpdf/gpdf-thumbnails-view.cc.orig Wed Jan 14 00:09:05 2004
++++ xpdf/gpdf-thumbnails-view.cc Wed Jan 14 00:09:34 2004
+@@ -21,6 +21,7 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++#include <sys/types.h>
+ #include <gpdf-g-switch.h>
+ # include <glib.h>
+ # include <glib/ghash.h>
diff --git a/graphics/gpdf/pkg-descr b/graphics/gpdf/pkg-descr
index 4d967a66f364..d1735f2c2c76 100644
--- a/graphics/gpdf/pkg-descr
+++ b/graphics/gpdf/pkg-descr
@@ -1,6 +1,6 @@
The GNOME PDF Viewer is an open source viewer for Portable Document
-Format (PDF) files. (These are also sometimes called "Acrobat" files,
-from the name of Adobe's PDF software.) The GNOME PDF viewer is based
-upon xpdf (ports/graphics/xpdf).
+Format (PDF) files, often called "Acrobat" files, from the name of
+Adobe's PDF software. The GNOME PDF viewer is based upon xpdf, and
+integrates directly into the GNOME 2 desktop.
WWW: http://www.gnome.org
diff --git a/graphics/gpdf/pkg-plist b/graphics/gpdf/pkg-plist
index 94812e1b38e7..77cdfd5d65a3 100644
--- a/graphics/gpdf/pkg-plist
+++ b/graphics/gpdf/pkg-plist
@@ -1,16 +1,45 @@
bin/gpdf
+etc/gconf/gconf.xml.defaults/apps/gpdf/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gpdf/UI/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gpdf/UI/Windows/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/Windows/%gconf.xml
+etc/gconf/schemas/gpdf.schemas
libdata/bonobo/servers/GNOME_PDF.server
libexec/gnome-pdf-viewer
-share/gnome/gpdf/glade/gpdf-print-progress-dialog.glade
-share/gnome/gpdf/glade/gpdf-properties-dialog.glade
-share/gnome/pixmaps/gpdf/fitwidth.png
-share/gnome/pixmaps/gnome-pdf.png
+share/gnome/application-registry/gpdf.applications
+share/gnome/applications/gpdf.desktop
share/gnome/gnome-2.0/ui/gpdf-control-ui.xml
share/gnome/gnome-2.0/ui/gpdf-window-ui.xml
-share/gnome/applications/gpdf.desktop
+share/gnome/gpdf/glade/gpdf-print-progress-dialog.glade
+share/gnome/gpdf/glade/gpdf-properties-dialog.glade
+share/gnome/help/gpdf/C/figures/gpdf_start_window.png
+share/gnome/help/gpdf/C/figures/gpdf_window.png
+share/gnome/help/gpdf/C/gpdf.xml
+share/gnome/help/gpdf/C/legal.xml
+share/gnome/help/gpdf/de/figures/gpdf_window.png
+share/gnome/help/gpdf/de/gpdf.xml
+share/gnome/help/gpdf/de/legal.xml
+share/gnome/help/gpdf/es/figures/gpdf_start_window.png
+share/gnome/help/gpdf/es/gpdf.xml
+share/gnome/help/gpdf/es/legal.xml
share/gnome/mime-info/gpdf.keys
-share/gnome/application-registry/gpdf.applications
+share/gnome/omf/gpdf/gpdf-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gpdf/gpdf-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gpdf/gpdf-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gpdf/gpdf-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/pixmaps/gnome-pdf.png
+share/gnome/pixmaps/gpdf/fitwidth.png
+share/gnome/pixmaps/gpdf/stock_book-closed-mark.png
+share/gnome/pixmaps/gpdf/stock_book-closed.png
+share/gnome/pixmaps/gpdf/stock_book-opened-mark.png
+share/gnome/pixmaps/gpdf/stock_book-opened.png
+share/gnome/pixmaps/gpdf/stock_bookmarks.png
share/locale/am/LC_MESSAGES/gpdf.mo
+share/locale/ar/LC_MESSAGES/gpdf.mo
share/locale/az/LC_MESSAGES/gpdf.mo
share/locale/be/LC_MESSAGES/gpdf.mo
share/locale/bn/LC_MESSAGES/gpdf.mo
@@ -20,15 +49,19 @@ share/locale/cy/LC_MESSAGES/gpdf.mo
share/locale/da/LC_MESSAGES/gpdf.mo
share/locale/de/LC_MESSAGES/gpdf.mo
share/locale/el/LC_MESSAGES/gpdf.mo
+share/locale/en_CA/LC_MESSAGES/gpdf.mo
+share/locale/en_GB/LC_MESSAGES/gpdf.mo
share/locale/eo/LC_MESSAGES/gpdf.mo
share/locale/es/LC_MESSAGES/gpdf.mo
share/locale/eu/LC_MESSAGES/gpdf.mo
+share/locale/fa/LC_MESSAGES/gpdf.mo
share/locale/fi/LC_MESSAGES/gpdf.mo
share/locale/fr/LC_MESSAGES/gpdf.mo
share/locale/ga/LC_MESSAGES/gpdf.mo
share/locale/gl/LC_MESSAGES/gpdf.mo
share/locale/he/LC_MESSAGES/gpdf.mo
share/locale/hi/LC_MESSAGES/gpdf.mo
+share/locale/hr/LC_MESSAGES/gpdf.mo
share/locale/hu/LC_MESSAGES/gpdf.mo
share/locale/id/LC_MESSAGES/gpdf.mo
share/locale/is/LC_MESSAGES/gpdf.mo
@@ -45,12 +78,14 @@ share/locale/ms/LC_MESSAGES/gpdf.mo
share/locale/nl/LC_MESSAGES/gpdf.mo
share/locale/nn/LC_MESSAGES/gpdf.mo
share/locale/no/LC_MESSAGES/gpdf.mo
+share/locale/pa/LC_MESSAGES/gpdf.mo
share/locale/pl/LC_MESSAGES/gpdf.mo
share/locale/pt/LC_MESSAGES/gpdf.mo
share/locale/pt_BR/LC_MESSAGES/gpdf.mo
share/locale/ro/LC_MESSAGES/gpdf.mo
share/locale/ru/LC_MESSAGES/gpdf.mo
share/locale/sk/LC_MESSAGES/gpdf.mo
+share/locale/sl/LC_MESSAGES/gpdf.mo
share/locale/sq/LC_MESSAGES/gpdf.mo
share/locale/sr/LC_MESSAGES/gpdf.mo
share/locale/sr@Latn/LC_MESSAGES/gpdf.mo
@@ -64,5 +99,22 @@ share/locale/wa/LC_MESSAGES/gpdf.mo
share/locale/zh_CN/LC_MESSAGES/gpdf.mo
share/locale/zh_TW/LC_MESSAGES/gpdf.mo
@dirrm share/gnome/pixmaps/gpdf
+@dirrm share/gnome/omf/gpdf
+@dirrm share/gnome/help/gpdf/es/figures
+@dirrm share/gnome/help/gpdf/es
+@dirrm share/gnome/help/gpdf/de/figures
+@dirrm share/gnome/help/gpdf/de
+@dirrm share/gnome/help/gpdf/C/figures
+@dirrm share/gnome/help/gpdf/C
+@dirrm share/gnome/help/gpdf
@dirrm share/gnome/gpdf/glade
@dirrm share/gnome/gpdf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI/Windows
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf/UI
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gpdf
+@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf/UI/Windows
+@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf/UI
+@dirrm etc/gconf/gconf.xml.defaults/apps/gpdf
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gpdf/gpdf-es.omf 2>/dev/null || /usr/bin/true
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 0b251b03ac0d..a62fd2a08e7f 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libgnomecanvas
-PORTVERSION= 2.4.0
-PORTREVISION= 1
+PORTVERSION= 2.6.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -21,8 +20,7 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER=13
-USE_GNOMENG= yes
-USE_GNOME= gnomehack libglade2 libartlgpl2
+USE_GNOME= gnomehack lthack libglade2 libartlgpl2
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index fb320bbdc46a..ba48aa4d6e38 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomecanvas-2.4.0.tar.bz2) = c212a7cac06b7f9e68ed2de38df6e54d
-SIZE (gnome2/libgnomecanvas-2.4.0.tar.bz2) = 535399
+MD5 (gnome2/libgnomecanvas-2.6.0.tar.bz2) = a670348ceecaa85b35940dcbd9f8c20e
+SIZE (gnome2/libgnomecanvas-2.6.0.tar.bz2) = 512743
diff --git a/graphics/libgnomecanvas/files/patch-configure b/graphics/libgnomecanvas/files/patch-configure
deleted file mode 100644
index a00b21e828d1..000000000000
--- a/graphics/libgnomecanvas/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure 2002/04/26 10:26:12 1.1
-+++ configure 2002/04/26 10:26:32
-@@ -7092,6 +7092,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/libgnomecanvas/pkg-descr b/graphics/libgnomecanvas/pkg-descr
index 8900db783bf3..a3d2ae327b86 100644
--- a/graphics/libgnomecanvas/pkg-descr
+++ b/graphics/libgnomecanvas/pkg-descr
@@ -1,6 +1,2 @@
-The GNOMECanvas library provides a number of features:
-
- - Image loading facilities.
- - Rendering of a GdkPixBuf into various formats:
- drawables (windows, pixmaps), GdkRGB buffers.
- - A cache interface
+The GNOMECanvas library allows images to be used directly within
+GUIs.
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index a20514a4aaa6..303dcc19ef74 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -15,33 +15,8 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h
lib/libglade/2.0/libcanvas.so
lib/libgnomecanvas-2.a
lib/libgnomecanvas-2.so
-lib/libgnomecanvas-2.so.400
+lib/libgnomecanvas-2.so.600
libdata/pkgconfig/libgnomecanvas-2.0.pc
-share/doc/libgnomecanvas/c35.html
-share/doc/libgnomecanvas/c4.html
-share/doc/libgnomecanvas/index.html
-share/doc/libgnomecanvas/index.sgml
-share/doc/libgnomecanvas/gnomecanvas.html
-share/doc/libgnomecanvas/gnomecanvasbpath.html
-share/doc/libgnomecanvas/gnomecanvasclipgroup.html
-share/doc/libgnomecanvas/gnomecanvasellipse.html
-share/doc/libgnomecanvas/gnomecanvasgroup.html
-share/doc/libgnomecanvas/gnomecanvasitem.html
-share/doc/libgnomecanvas/gnomecanvasline.html
-share/doc/libgnomecanvas/gnomecanvaspixbuf.html
-share/doc/libgnomecanvas/gnomecanvaspolygon.html
-share/doc/libgnomecanvas/gnomecanvasre.html
-share/doc/libgnomecanvas/gnomecanvasrect.html
-share/doc/libgnomecanvas/gnomecanvasrichtext.html
-share/doc/libgnomecanvas/gnomecanvasshape.html
-share/doc/libgnomecanvas/gnomecanvastext.html
-share/doc/libgnomecanvas/gnomecanvaswidget.html
-share/doc/libgnomecanvas/home.png
-share/doc/libgnomecanvas/left.png
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
-share/doc/libgnomecanvas/right.png
-share/doc/libgnomecanvas/up.png
share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -54,8 +29,10 @@ share/locale/cy/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/el/LC_MESSAGES/libgnomecanvas-2.0.mo
-share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/en_CA/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/en_GB/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/eo/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/et/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/fa/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -63,14 +40,16 @@ share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ga/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/hr/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/hu/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/id/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/is/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
-share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/li/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/lt/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ml/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -80,6 +59,7 @@ share/locale/ne/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/pa/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/pl/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/pt_BR/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -89,6 +69,7 @@ share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sq/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sr/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sr@Latn/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 0310715b0204..a0fe5f7fe535 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= librsvg2
-PORTVERSION= 2.4.0
-PORTREVISION= 2
+PORTVERSION= 2.6.4
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6
DISTNAME= librsvg-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -20,21 +19,23 @@ COMMENT= Library for parsing and rendering SVG vector-graphic files
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
popt.0:${PORTSDIR}/devel/popt \
- gsf-1.9:${PORTSDIR}/devel/libgsf
-RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2
+ gsf-1.9:${PORTSDIR}/devel/libgsf \
+ croco.2:${PORTSDIR}/textproc/libcroco
+RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER=13
-USE_GNOME= gnomehack gtk20 libartlgpl2 libxml2
+USE_GNOME= gnomehack lthack gtk20 libartlgpl2 libxml2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-svgz \
--disable-gtk-doc \
- --without-gimp
-PLIST_SUB= GTK_VERSION="2.2.0"
+ --without-gimp \
+ --with-croco
+PLIST_SUB= GTK_VERSION="2.4.0"
MAN1= rsvg.1
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index d4484f25efab..342d69174741 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/librsvg-2.4.0.tar.bz2) = 1a073864e5f6e9793cf23e38dc723803
-SIZE (gnome2/librsvg-2.4.0.tar.bz2) = 233627
+MD5 (gnome2/librsvg-2.6.4.tar.bz2) = 976b1e2d21ef094698f6eebb7ef9fe94
+SIZE (gnome2/librsvg-2.6.4.tar.bz2) = 221910
diff --git a/graphics/librsvg2/files/patch-configure b/graphics/librsvg2/files/patch-configure
deleted file mode 100644
index 444b8335e4d7..000000000000
--- a/graphics/librsvg2/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure 2002/04/25 19:16:30 1.1
-+++ configure 2002/04/25 19:16:42
-@@ -5397,6 +5397,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/librsvg2/files/patch-gimp-plugin_Makefile.in b/graphics/librsvg2/files/patch-gimp-plugin_Makefile.in
deleted file mode 100644
index b8d240267194..000000000000
--- a/graphics/librsvg2/files/patch-gimp-plugin_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gimp-plugin/Makefile.in.orig Sun Mar 23 19:17:25 2003
-+++ gimp-plugin/Makefile.in Sun Mar 23 19:17:41 2003
-@@ -103,7 +103,7 @@
- VERSION = @VERSION@
- VERSION_INFO = @VERSION_INFO@
-
--gimpdir = $(libdir)/gimp/1.3/plug-ins
-+gimpdir = $(libexecdir)/gimp/1.3/plug-ins
-
- INCLUDES = \
- $(LIBRSVG_CFLAGS) \
diff --git a/graphics/librsvg2/files/patch-rsvg-paint-server.c b/graphics/librsvg2/files/patch-rsvg-paint-server.c
new file mode 100644
index 000000000000..72f7b8d1fa0b
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-paint-server.c
@@ -0,0 +1,22 @@
+--- rsvg-paint-server.c.orig Tue Mar 30 13:48:53 2004
++++ rsvg-paint-server.c Tue Mar 30 13:49:10 2004
+@@ -150,6 +150,9 @@
+ double dx, dy, scale;
+ double affine[6];
+ int i;
++ float xchange, ychange, pointlen,unitlen;
++ float nx2, ny2;
++ float x0, y0;
+
+ agl = z->agl;
+ if (agl == NULL)
+@@ -180,9 +183,6 @@
+
+ art_affine_multiply(affine, rlg->affine, affine);
+
+- float xchange, ychange, pointlen,unitlen;
+- float nx2, ny2;
+- float x0, y0;
+
+ xchange = rlg->x2 - rlg->x1;
+ ychange = rlg->y2 - rlg->y1;
diff --git a/graphics/librsvg2/files/patch-rsvg-styles.c b/graphics/librsvg2/files/patch-rsvg-styles.c
new file mode 100644
index 000000000000..6e7eee133489
--- /dev/null
+++ b/graphics/librsvg2/files/patch-rsvg-styles.c
@@ -0,0 +1,21 @@
+--- rsvg-styles.c.orig Tue Mar 23 23:04:27 2004
++++ rsvg-styles.c Tue Mar 23 23:04:36 2004
+@@ -553,16 +553,16 @@
+ if (status != CR_OK)
+ {
+ g_warning ("Error setting CSS SAC handler\n");
+- cr_parser_destroy (parser);
+ cr_doc_handler_destroy (css_handler);
++ cr_parser_destroy (parser);
+ return;
+ }
+
+ status = cr_parser_set_use_core_grammar (parser, FALSE);
+ status = cr_parser_parse (parser);
+
+- cr_parser_destroy (parser);
+ cr_doc_handler_destroy (css_handler);
++ cr_parser_destroy (parser);
+ }
+
+ #else /* !HAVE_LIBCROCO */
diff --git a/graphics/librsvg2/pkg-descr b/graphics/librsvg2/pkg-descr
index b3f050b65a28..3f521eda245a 100644
--- a/graphics/librsvg2/pkg-descr
+++ b/graphics/librsvg2/pkg-descr
@@ -1,7 +1,7 @@
The librsvg library is a lightweight library for parsing and rendering
-vector-graphic files in SVG format (like the ones made by sodipodi). It also
+vector-graphic files in SVG format (like the ones made by sodipodi). It also
includes functions that render anti-aliased fonts using freetype, including
-caching of glyphs. It's used by Nautilus for drawing vector icons and
-anti-aliased type.
+caching of glyphs. It is used by Nautilus for drawing vector icons and
+anti-aliased text.
WWW: http://www.gnome.org/
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 094cff6f4b45..906759e2e185 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -6,22 +6,8 @@ lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so
lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so
lib/librsvg-2.a
lib/librsvg-2.so
-lib/librsvg-2.so.6
+lib/librsvg-2.so.8
libdata/pkgconfig/librsvg-2.0.pc
-share/doc/librsvg/html/home.png
-share/doc/librsvg/html/i1013.html
-share/doc/librsvg/html/index.html
-share/doc/librsvg/html/index.sgml
-share/doc/librsvg/html/left.png
-share/doc/librsvg/html/r22.html
-share/doc/librsvg/html/r376.html
-share/doc/librsvg/html/r413.html
-share/doc/librsvg/html/right.png
-share/doc/librsvg/html/rsvg-convenience-functions.html
-share/doc/librsvg/html/rsvg-core-api.html
-share/doc/librsvg/html/rsvg-creating-a-svgz-reader.html
-share/doc/librsvg/html/rsvg.html
-share/doc/librsvg/html/up.png
@dirrm share/doc/librsvg/html
@dirrm share/doc/librsvg
@dirrm include/librsvg-2/librsvg