aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2009-11-28 20:06:37 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2009-11-28 20:06:37 +0000
commitf76d32b8e89fed7c0e459c1a7fe7a4b57661b01c (patch)
treead29e6808ff698f84e08dab8e047f0ae72838df9 /graphics
parent873cae3ab41a109b6f9cf9f4149f101d6d996235 (diff)
downloadports-f76d32b8e89fed7c0e459c1a7fe7a4b57661b01c.tar.gz
ports-f76d32b8e89fed7c0e459c1a7fe7a4b57661b01c.zip
Notes
Diffstat (limited to 'graphics')
-rw-r--r--graphics/Makefile7
-rw-r--r--graphics/clutter-box2d/Makefile8
-rw-r--r--graphics/clutter-box2d/distinfo6
-rw-r--r--graphics/clutter-box2d/files/patch-clutter-box2d_Makefile.in11
-rw-r--r--graphics/clutter-box2d/pkg-plist26
-rw-r--r--graphics/clutter-cairo/Makefile30
-rw-r--r--graphics/clutter-cairo/distinfo3
-rw-r--r--graphics/clutter-cairo/pkg-descr6
-rw-r--r--graphics/clutter-cairo/pkg-plist8
-rw-r--r--graphics/clutter-gtk/Makefile15
-rw-r--r--graphics/clutter-gtk/distinfo6
-rw-r--r--graphics/clutter-gtk/pkg-plist36
-rw-r--r--graphics/clutter-qt/Makefile34
-rw-r--r--graphics/clutter-qt/distinfo3
-rw-r--r--graphics/clutter-qt/pkg-descr3
-rw-r--r--graphics/clutter-qt/pkg-plist7
-rw-r--r--graphics/clutter/Makefile12
-rw-r--r--graphics/clutter/distinfo6
-rw-r--r--graphics/clutter/pkg-plist216
-rw-r--r--graphics/eog-plugins/Makefile57
-rw-r--r--graphics/eog-plugins/distinfo3
-rw-r--r--graphics/eog-plugins/pkg-descr2
-rw-r--r--graphics/eog-plugins/pkg-plist75
-rw-r--r--graphics/eog/Makefile28
-rw-r--r--graphics/eog/distinfo6
-rw-r--r--graphics/eog/pkg-plist19
-rw-r--r--graphics/evince/Makefile11
-rw-r--r--graphics/evince/distinfo6
-rw-r--r--graphics/evince/pkg-plist50
-rw-r--r--graphics/gambas2-gb-pdf/Makefile1
-rw-r--r--graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp19
-rw-r--r--graphics/gimp-app/Makefile6
-rw-r--r--graphics/gimp-app/distinfo6
-rw-r--r--graphics/gimp-app/pkg-plist16
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/gir-repository-goocanvas/Makefile15
-rw-r--r--graphics/gir-repository-poppler/Makefile15
-rw-r--r--graphics/inkscape/Makefile6
-rw-r--r--graphics/inkscape/distinfo6
-rw-r--r--graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp247
-rw-r--r--graphics/inkscape/pkg-plist291
-rw-r--r--graphics/libchamplain/Makefile56
-rw-r--r--graphics/libchamplain/distinfo3
-rw-r--r--graphics/libchamplain/pkg-descr10
-rw-r--r--graphics/libchamplain/pkg-plist93
-rw-r--r--graphics/librsvg2/Makefile8
-rw-r--r--graphics/nip2/Makefile4
-rw-r--r--graphics/p5-clutter/Makefile68
-rw-r--r--graphics/p5-clutter/distinfo6
-rw-r--r--graphics/p5-clutter/pkg-plist46
-rw-r--r--graphics/poppler-data/Makefile2
-rw-r--r--graphics/poppler-data/distinfo6
-rw-r--r--graphics/poppler-data/pkg-plist65
-rw-r--r--graphics/poppler-gtk/Makefile4
-rw-r--r--graphics/poppler-gtk/pkg-plist5
-rw-r--r--graphics/poppler-qt4/Makefile4
-rw-r--r--graphics/poppler-utils/Makefile4
-rw-r--r--graphics/poppler/Makefile21
-rw-r--r--graphics/poppler/distinfo6
-rw-r--r--graphics/poppler/files/patch-utils_Makefile.in21
-rw-r--r--graphics/poppler/pkg-plist12
-rw-r--r--graphics/py-clutter-gtk/Makefile37
-rw-r--r--graphics/py-clutter-gtk/distinfo3
-rw-r--r--graphics/py-clutter-gtk/pkg-descr3
-rw-r--r--graphics/py-clutter-gtk/pkg-plist10
-rw-r--r--graphics/py-clutter/Makefile22
-rw-r--r--graphics/py-clutter/distinfo6
-rw-r--r--graphics/py-clutter/pkg-plist26
-rw-r--r--graphics/py-gimp/Makefile4
69 files changed, 1277 insertions, 610 deletions
diff --git a/graphics/Makefile b/graphics/Makefile
index 5849d7ff304a..8e9af790ba8e 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -71,8 +71,8 @@
SUBDIR += claraocr
SUBDIR += clutter
SUBDIR += clutter-box2d
- SUBDIR += clutter-cairo
SUBDIR += clutter-gtk
+ SUBDIR += clutter-qt
SUBDIR += comical
SUBDIR += comix
SUBDIR += compupic
@@ -124,6 +124,7 @@
SUBDIR += enblend
SUBDIR += enfle
SUBDIR += eog
+ SUBDIR += eog-plugins
SUBDIR += epdfview
SUBDIR += epeg
SUBDIR += epix
@@ -243,6 +244,8 @@
SUBDIR += gimp-manual-pdf
SUBDIR += gimpfx-foundry
SUBDIR += gimpshop
+ SUBDIR += gir-repository-goocanvas
+ SUBDIR += gir-repository-poppler
SUBDIR += giram
SUBDIR += gkrellkam
SUBDIR += gkrellkam2
@@ -409,6 +412,7 @@
SUBDIR += libaux
SUBDIR += libboard
SUBDIR += libcaca
+ SUBDIR += libchamplain
SUBDIR += libdrm
SUBDIR += libdmtx
SUBDIR += libemf
@@ -729,6 +733,7 @@
SUBDIR += py-cgkit
SUBDIR += py-chart
SUBDIR += py-clutter
+ SUBDIR += py-clutter-gtk
SUBDIR += py-editobj
SUBDIR += py-exif
SUBDIR += py-exiv2
diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile
index 62e6422bb1d5..179361268e25 100644
--- a/graphics/clutter-box2d/Makefile
+++ b/graphics/clutter-box2d/Makefile
@@ -6,21 +6,21 @@
#
PORTNAME= clutter-box2d
-PORTVERSION= 0.8.2
-PORTREVISION= 1
+PORTVERSION= 0.10.0
CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/
+MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.10/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Clutter Box2D integration library
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack ltverhack gnomeprefix
USE_XORG= xp x11
USE_LDCONFIG= yes
+CONFIGURE_ARGS= --enable-introspection=no
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/graphics/clutter-box2d/distinfo b/graphics/clutter-box2d/distinfo
index 14b196a3f1f8..63f714655812 100644
--- a/graphics/clutter-box2d/distinfo
+++ b/graphics/clutter-box2d/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-box2d-0.8.2.tar.gz) = 393a42b95f2ede8e17361acdbddde1f6
-SHA256 (clutter-box2d-0.8.2.tar.gz) = 676baaae6c4de7f79e51a2167ef5571136c709fe4ff52bd919c13e2b93e80a91
-SIZE (clutter-box2d-0.8.2.tar.gz) = 491985
+MD5 (clutter-box2d-0.10.0.tar.gz) = 293912473cc5fcb9f0ad8b2da1be1b79
+SHA256 (clutter-box2d-0.10.0.tar.gz) = 21d3a9b74f9fc4417914b5a4d61f503f77cc732f1ef565586b358dd275e3cc5b
+SIZE (clutter-box2d-0.10.0.tar.gz) = 491980
diff --git a/graphics/clutter-box2d/files/patch-clutter-box2d_Makefile.in b/graphics/clutter-box2d/files/patch-clutter-box2d_Makefile.in
new file mode 100644
index 000000000000..f74166a09a26
--- /dev/null
+++ b/graphics/clutter-box2d/files/patch-clutter-box2d_Makefile.in
@@ -0,0 +1,11 @@
+--- clutter-box2d/Makefile.in.orig 2009-08-07 16:28:57.000000000 +0200
++++ clutter-box2d/Makefile.in 2009-08-07 16:29:26.000000000 +0200
+@@ -269,7 +269,7 @@
+ EXTRA_DIST = \
+ clutter-box2d-marshal.list
+
+-BUILT_GIRSOURCES = ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir
++BUILT_GIRSOURCES = # ClutterBox2D-@CLUTTER_BOX2D_API_VERSION@.gir
+
+ # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
+ # install anything - we need to install inside our prefix.
diff --git a/graphics/clutter-box2d/pkg-plist b/graphics/clutter-box2d/pkg-plist
index f4bc604a466b..0caba7fba29a 100644
--- a/graphics/clutter-box2d/pkg-plist
+++ b/graphics/clutter-box2d/pkg-plist
@@ -1,14 +1,14 @@
-include/clutter-0.8/clutter-box2d/clutter-box2d-collision.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-contact.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-joint.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-marshal.h
-include/clutter-0.8/clutter-box2d/clutter-box2d-util.h
-include/clutter-0.8/clutter-box2d/clutter-box2d.h
-lib/libclutter-box2d-0.8.a
-lib/libclutter-box2d-0.8.la
-lib/libclutter-box2d-0.8.so
-lib/libclutter-box2d-0.8.so.0
-libdata/pkgconfig/clutter-box2d-0.8.pc
+include/clutter-1.0/clutter-box2d/clutter-box2d-collision.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-contact.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-joint.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-marshal.h
+include/clutter-1.0/clutter-box2d/clutter-box2d-util.h
+include/clutter-1.0/clutter-box2d/clutter-box2d.h
+lib/libclutter-box2d-0.10.a
+lib/libclutter-box2d-0.10.la
+lib/libclutter-box2d-0.10.so
+lib/libclutter-box2d-0.10.so.0
+libdata/pkgconfig/clutter-box2d-0.10.pc
%%DOCSDIR%%/ClutterBox2D.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
@@ -25,5 +25,5 @@ libdata/pkgconfig/clutter-box2d-0.8.pc
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
@dirrmtry %%DOCSDIR%%
-@dirrm include/clutter-0.8/clutter-box2d
-@dirrmtry include/clutter-0.8
+@dirrm include/clutter-1.0/clutter-box2d
+@dirrmtry include/clutter-1.0
diff --git a/graphics/clutter-cairo/Makefile b/graphics/clutter-cairo/Makefile
deleted file mode 100644
index 4cf5a64233d9..000000000000
--- a/graphics/clutter-cairo/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for: clutter-cairo
-# Date created: 2008-12-25
-# Whom: Martin Wilke <miwi@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= clutter-cairo
-PORTVERSION= 0.8.2
-PORTREVISION= 1
-CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Clutter Cairo integrarion library
-
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter \
- cairo.2:${PORTSDIR}/graphics/cairo
-
-USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
-USE_GNOME= gnomehack ltverhack
-USE_XORG= xp x11
-USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
-CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
-.include <bsd.port.mk>
diff --git a/graphics/clutter-cairo/distinfo b/graphics/clutter-cairo/distinfo
deleted file mode 100644
index 48533613d055..000000000000
--- a/graphics/clutter-cairo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (clutter-cairo-0.8.2.tar.gz) = c3bfae082d007be37d9725e5e7b4a30b
-SHA256 (clutter-cairo-0.8.2.tar.gz) = 8d036be4a5834185b2c1bca6fc8db790f240daf70c71c3536439dbb422ee8aea
-SIZE (clutter-cairo-0.8.2.tar.gz) = 341500
diff --git a/graphics/clutter-cairo/pkg-descr b/graphics/clutter-cairo/pkg-descr
deleted file mode 100644
index 935ad2670494..000000000000
--- a/graphics/clutter-cairo/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-An experimental clutter cairo 'drawable' actor. Sucks a bit as renders
-cairo via an image surface and thus no real cairo rendering
-acceleration. Experiments with glitz and sharing GL contexts for such
-acceleration proved problematic. Needs more investigation.
-
-WWW: http://clutter-project.org/
diff --git a/graphics/clutter-cairo/pkg-plist b/graphics/clutter-cairo/pkg-plist
deleted file mode 100644
index 7bdd83b11fe4..000000000000
--- a/graphics/clutter-cairo/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-include/clutter-0.8/clutter-cairo/clutter-cairo.h
-lib/libclutter-cairo-0.8.a
-lib/libclutter-cairo-0.8.la
-lib/libclutter-cairo-0.8.so
-lib/libclutter-cairo-0.8.so.0
-libdata/pkgconfig/clutter-cairo-0.8.pc
-@dirrm include/clutter-0.8/clutter-cairo
-@dirrmtry include/clutter-0.8
diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile
index b0e1642410dd..7fa00ebd27b6 100644
--- a/graphics/clutter-gtk/Makefile
+++ b/graphics/clutter-gtk/Makefile
@@ -6,16 +6,19 @@
#
PORTNAME= clutter-gtk
-PORTVERSION= 0.8.3
-PORTREVISION= 1
+PORTVERSION= 0.10.2
+PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/
+MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= GTK+ Integration library for Clutter
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+USE_BZIP2= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack gtk20 ltverhack gnomeprefix
@@ -26,4 +29,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+post-patch:
+ @${REINPLACE_CMD} -e 's|clutter-x11-0.9|clutter-x11-1.0|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/graphics/clutter-gtk/distinfo b/graphics/clutter-gtk/distinfo
index 9ca4bfdf73dc..1fe426c8bab6 100644
--- a/graphics/clutter-gtk/distinfo
+++ b/graphics/clutter-gtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-gtk-0.8.3.tar.gz) = 3f080e19660aec48e4e1e3e3ec2f032a
-SHA256 (clutter-gtk-0.8.3.tar.gz) = 87222d784c97848a605d5edce9eb9162ea2dcbeb7700d53896aae8ecb8f41602
-SIZE (clutter-gtk-0.8.3.tar.gz) = 390360
+MD5 (clutter-gtk-0.10.2.tar.bz2) = bb275b07f722631ff1764dd212843d11
+SHA256 (clutter-gtk-0.10.2.tar.bz2) = de2af20d44d2237811f27ee081b9df999a0af30ee0d410cd7c2872622386b0c9
+SIZE (clutter-gtk-0.10.2.tar.bz2) = 314372
diff --git a/graphics/clutter-gtk/pkg-plist b/graphics/clutter-gtk/pkg-plist
index b0c75a844c22..4652f55cd4b3 100644
--- a/graphics/clutter-gtk/pkg-plist
+++ b/graphics/clutter-gtk/pkg-plist
@@ -1,25 +1,41 @@
-include/clutter-0.8/clutter-gtk/gtk-clutter-embed.h
-include/clutter-0.8/clutter-gtk/gtk-clutter-util.h
-lib/libclutter-gtk-0.8.a
-lib/libclutter-gtk-0.8.la
-lib/libclutter-gtk-0.8.so
-lib/libclutter-gtk-0.8.so.0
-libdata/pkgconfig/clutter-gtk-0.8.pc
+include/clutter-1.0/clutter-gtk/clutter-gtk.h
+include/clutter-1.0/clutter-gtk/gtk-clutter-embed.h
+include/clutter-1.0/clutter-gtk/gtk-clutter-scrollable.h
+include/clutter-1.0/clutter-gtk/gtk-clutter-util.h
+include/clutter-1.0/clutter-gtk/gtk-clutter-viewport.h
+include/clutter-1.0/clutter-gtk/gtk-clutter-zoomable.h
+lib/girepository-1.0/GtkClutter-0.10.typelib
+lib/libclutter-gtk-0.10.a
+lib/libclutter-gtk-0.10.la
+lib/libclutter-gtk-0.10.so
+lib/libclutter-gtk-0.10.so.0
+libdata/pkgconfig/clutter-gtk-0.10.pc
%%DOCSDIR%%/GtkClutterEmbed.html
+%%DOCSDIR%%/GtkClutterScrollable.html
+%%DOCSDIR%%/GtkClutterViewport.html
+%%DOCSDIR%%/GtkClutterZoomable.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
%%DOCSDIR%%/clutter-gtk-Utility-Functions.html
%%DOCSDIR%%/clutter-gtk.devhelp
%%DOCSDIR%%/clutter-gtk.devhelp2
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/ix01.html
+%%DOCSDIR%%/ix02.html
+%%DOCSDIR%%/ix03.html
+%%DOCSDIR%%/ix04.html
+%%DOCSDIR%%/ix05.html
+%%DOCSDIR%%/ix06.html
%%DOCSDIR%%/left.png
%%DOCSDIR%%/license.html
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
-@dirrmtry %%DOCSDIR%%
-@dirrm include/clutter-0.8/clutter-gtk
-@dirrmtry include/clutter-0.8
+share/gir-1.0/GtkClutter-0.10.gir
+@dirrm %%DOCSDIR%%
+@dirrm include/clutter-1.0/clutter-gtk
+@dirrm include/clutter-1.0
diff --git a/graphics/clutter-qt/Makefile b/graphics/clutter-qt/Makefile
new file mode 100644
index 000000000000..1fc197b881e4
--- /dev/null
+++ b/graphics/clutter-qt/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for: clutter-qt
+# Date created: 04 Aug 2009
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= clutter-qt
+PORTVERSION= 1.0.0
+CATEGORIES= graphics
+MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= QT+ Integration library for Clutter
+
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtool:22
+USE_QT_VER= 4
+QT_COMPONENTS= corelib gui moc_build
+USE_GNOME= gnomehack
+USE_LDCONFIG= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+post-patch:
+ @${RM} ${WRKSRC}/examples/moc_testqt.cc \
+ ${WRKSRC}/clutter-qt/moc_clutter-qt.cc
+
+.include <bsd.port.mk>
diff --git a/graphics/clutter-qt/distinfo b/graphics/clutter-qt/distinfo
new file mode 100644
index 000000000000..645f395e2620
--- /dev/null
+++ b/graphics/clutter-qt/distinfo
@@ -0,0 +1,3 @@
+MD5 (clutter-qt-1.0.0.tar.bz2) = 656e0eaa088547c01aa6e716f84e7340
+SHA256 (clutter-qt-1.0.0.tar.bz2) = b1599c270e98128e64bc0c0293e97af092f705c23896bcb20c5c1fd662c92155
+SIZE (clutter-qt-1.0.0.tar.bz2) = 270984
diff --git a/graphics/clutter-qt/pkg-descr b/graphics/clutter-qt/pkg-descr
new file mode 100644
index 000000000000..1dc727b9e847
--- /dev/null
+++ b/graphics/clutter-qt/pkg-descr
@@ -0,0 +1,3 @@
+QT+ Integration library for Clutter.
+
+WWW: http://clutter-project.org/
diff --git a/graphics/clutter-qt/pkg-plist b/graphics/clutter-qt/pkg-plist
new file mode 100644
index 000000000000..dd40b2c08a26
--- /dev/null
+++ b/graphics/clutter-qt/pkg-plist
@@ -0,0 +1,7 @@
+include/clutter-1.0/clutter-qt/clutter-qt.h
+lib/libclutter-qt-1.0.a
+lib/libclutter-qt-1.0.la
+lib/libclutter-qt-1.0.so
+lib/libclutter-qt-1.0.so.0
+libdata/pkgconfig/clutter-qt-1.0.pc
+@dirrm include/clutter-1.0/clutter-qt
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index deed407bf6ad..6f0bc5607c09 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -6,23 +6,25 @@
#
PORTNAME= clutter
-PORTVERSION= 0.8.8
-PORTREVISION= 1
+PORTVERSION= 1.0.8
CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/${PORTNAME}/0.8/
+MASTER_SITES= GNOME \
+ http://www.clutter-project.org/sources/${PORTNAME}/1.0/
MAINTAINER= gnome@FreeBSD.org
COMMENT= OpenGL based interactive canvas library
-LIB_DEPENDS= json-glib-1.0:${PORTSDIR}/devel/json-glib
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango
USE_GMAKE= yes
+USE_BZIP2= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= pkgconfig gtk20 gnomehack ltverhack gnomeprefix
USE_GL= gl
USE_XORG= glproto x11 xfixes xdamage xcomposite xi
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --with-x --with-json=check
+CONFIGURE_ARGS= --with-x --with-json=internal
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo
index 594a0ac3d3fc..c9568ee481c2 100644
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-0.8.8.tar.gz) = 4a77d29cc9584577c9c732f3b8c30543
-SHA256 (clutter-0.8.8.tar.gz) = f1a9cff7e0ddd60f8d53b89d0b44b90778335f69af53863907e3db2520fe5083
-SIZE (clutter-0.8.8.tar.gz) = 2153665
+MD5 (clutter-1.0.8.tar.bz2) = 687f9699ea5590091282034a936c6dc7
+SHA256 (clutter-1.0.8.tar.bz2) = 54fa3b64b7e0539d07a09eb751c5d945a4cedc8d2beb355a51ea7f04ae637501
+SIZE (clutter-1.0.8.tar.bz2) = 2017907
diff --git a/graphics/clutter/pkg-plist b/graphics/clutter/pkg-plist
index 618fe1d03391..5312850e8120 100644
--- a/graphics/clutter/pkg-plist
+++ b/graphics/clutter/pkg-plist
@@ -1,93 +1,124 @@
-include/clutter-0.8/clutter/clutter-actor.h
-include/clutter-0.8/clutter/clutter-alpha.h
-include/clutter-0.8/clutter/clutter-backend.h
-include/clutter-0.8/clutter/clutter-behaviour-bspline.h
-include/clutter-0.8/clutter/clutter-behaviour-depth.h
-include/clutter-0.8/clutter/clutter-behaviour-ellipse.h
-include/clutter-0.8/clutter/clutter-behaviour-opacity.h
-include/clutter-0.8/clutter/clutter-behaviour-path.h
-include/clutter-0.8/clutter/clutter-behaviour-rotate.h
-include/clutter-0.8/clutter/clutter-behaviour-scale.h
-include/clutter-0.8/clutter/clutter-behaviour.h
-include/clutter-0.8/clutter/clutter-child-meta.h
-include/clutter-0.8/clutter/clutter-clone-texture.h
-include/clutter-0.8/clutter/clutter-color.h
-include/clutter-0.8/clutter/clutter-container.h
-include/clutter-0.8/clutter/clutter-deprecated.h
-include/clutter-0.8/clutter/clutter-effect.h
-include/clutter-0.8/clutter/clutter-entry.h
-include/clutter-0.8/clutter/clutter-enum-types.h
-include/clutter-0.8/clutter/clutter-event.h
-include/clutter-0.8/clutter/clutter-feature.h
-include/clutter-0.8/clutter/clutter-fixed.h
-include/clutter-0.8/clutter/clutter-frame-source.h
-include/clutter-0.8/clutter/clutter-group.h
-include/clutter-0.8/clutter/clutter-json.h
-include/clutter-0.8/clutter/clutter-keysyms.h
-include/clutter-0.8/clutter/clutter-label.h
-include/clutter-0.8/clutter/clutter-list-model.h
-include/clutter-0.8/clutter/clutter-main.h
-include/clutter-0.8/clutter/clutter-media.h
-include/clutter-0.8/clutter/clutter-model.h
-include/clutter-0.8/clutter/clutter-rectangle.h
-include/clutter-0.8/clutter/clutter-score.h
-include/clutter-0.8/clutter/clutter-script.h
-include/clutter-0.8/clutter/clutter-scriptable.h
-include/clutter-0.8/clutter/clutter-shader.h
-include/clutter-0.8/clutter/clutter-stage-manager.h
-include/clutter-0.8/clutter/clutter-stage.h
-include/clutter-0.8/clutter/clutter-texture.h
-include/clutter-0.8/clutter/clutter-timeline.h
-include/clutter-0.8/clutter/clutter-timeout-pool.h
-include/clutter-0.8/clutter/clutter-types.h
-include/clutter-0.8/clutter/clutter-units.h
-include/clutter-0.8/clutter/clutter-util.h
-include/clutter-0.8/clutter/clutter-version.h
-include/clutter-0.8/clutter/clutter.h
-include/clutter-0.8/clutter/glx/clutter-glx-texture-pixmap.h
-include/clutter-0.8/clutter/glx/clutter-glx.h
-include/clutter-0.8/clutter/pangoclutter.h
-include/clutter-0.8/clutter/x11/clutter-x11-enum-types.h
-include/clutter-0.8/clutter/x11/clutter-x11-texture-pixmap.h
-include/clutter-0.8/clutter/x11/clutter-x11.h
-include/clutter-0.8/cogl/cogl-defines-gl.h
-include/clutter-0.8/cogl/cogl.h
-lib/libclutter-glx-0.8.a
-lib/libclutter-glx-0.8.la
-lib/libclutter-glx-0.8.so
-lib/libclutter-glx-0.8.so.0
-libdata/pkgconfig/clutter-0.8.pc
-libdata/pkgconfig/clutter-glx-0.8.pc
-libdata/pkgconfig/clutter-x11-0.8.pc
+include/clutter-1.0/clutter/clutter-actor.h
+include/clutter-1.0/clutter/clutter-alpha.h
+include/clutter-1.0/clutter/clutter-animatable.h
+include/clutter-1.0/clutter/clutter-animation.h
+include/clutter-1.0/clutter/clutter-backend.h
+include/clutter-1.0/clutter/clutter-behaviour-depth.h
+include/clutter-1.0/clutter/clutter-behaviour-ellipse.h
+include/clutter-1.0/clutter/clutter-behaviour-opacity.h
+include/clutter-1.0/clutter/clutter-behaviour-path.h
+include/clutter-1.0/clutter/clutter-behaviour-rotate.h
+include/clutter-1.0/clutter/clutter-behaviour-scale.h
+include/clutter-1.0/clutter/clutter-behaviour.h
+include/clutter-1.0/clutter/clutter-binding-pool.h
+include/clutter-1.0/clutter/clutter-cairo-texture.h
+include/clutter-1.0/clutter/clutter-child-meta.h
+include/clutter-1.0/clutter/clutter-clone.h
+include/clutter-1.0/clutter/clutter-color.h
+include/clutter-1.0/clutter/clutter-container.h
+include/clutter-1.0/clutter/clutter-deprecated.h
+include/clutter-1.0/clutter/clutter-enum-types.h
+include/clutter-1.0/clutter/clutter-event.h
+include/clutter-1.0/clutter/clutter-feature.h
+include/clutter-1.0/clutter/clutter-fixed.h
+include/clutter-1.0/clutter/clutter-frame-source.h
+include/clutter-1.0/clutter/clutter-group.h
+include/clutter-1.0/clutter/clutter-interval.h
+include/clutter-1.0/clutter/clutter-json.h
+include/clutter-1.0/clutter/clutter-keysyms.h
+include/clutter-1.0/clutter/clutter-list-model.h
+include/clutter-1.0/clutter/clutter-main.h
+include/clutter-1.0/clutter/clutter-media.h
+include/clutter-1.0/clutter/clutter-model.h
+include/clutter-1.0/clutter/clutter-path.h
+include/clutter-1.0/clutter/clutter-rectangle.h
+include/clutter-1.0/clutter/clutter-score.h
+include/clutter-1.0/clutter/clutter-script.h
+include/clutter-1.0/clutter/clutter-scriptable.h
+include/clutter-1.0/clutter/clutter-shader-types.h
+include/clutter-1.0/clutter/clutter-shader.h
+include/clutter-1.0/clutter/clutter-stage-manager.h
+include/clutter-1.0/clutter/clutter-stage.h
+include/clutter-1.0/clutter/clutter-text.h
+include/clutter-1.0/clutter/clutter-texture.h
+include/clutter-1.0/clutter/clutter-timeline.h
+include/clutter-1.0/clutter/clutter-timeout-pool.h
+include/clutter-1.0/clutter/clutter-types.h
+include/clutter-1.0/clutter/clutter-units.h
+include/clutter-1.0/clutter/clutter-util.h
+include/clutter-1.0/clutter/clutter-version.h
+include/clutter-1.0/clutter/clutter.h
+include/clutter-1.0/clutter/glx/clutter-glx-texture-pixmap.h
+include/clutter-1.0/clutter/glx/clutter-glx.h
+include/clutter-1.0/clutter/json/json-generator.h
+include/clutter-1.0/clutter/json/json-glib.h
+include/clutter-1.0/clutter/json/json-marshal.h
+include/clutter-1.0/clutter/json/json-parser.h
+include/clutter-1.0/clutter/json/json-types.h
+include/clutter-1.0/clutter/x11/clutter-x11-enum-types.h
+include/clutter-1.0/clutter/x11/clutter-x11-texture-pixmap.h
+include/clutter-1.0/clutter/x11/clutter-x11.h
+include/clutter-1.0/cogl/cogl-bitmap.h
+include/clutter-1.0/cogl/cogl-color.h
+include/clutter-1.0/cogl/cogl-debug.h
+include/clutter-1.0/cogl/cogl-defines-gl.h
+include/clutter-1.0/cogl/cogl-deprecated.h
+include/clutter-1.0/cogl/cogl-enum-types.h
+include/clutter-1.0/cogl/cogl-fixed.h
+include/clutter-1.0/cogl/cogl-material.h
+include/clutter-1.0/cogl/cogl-matrix.h
+include/clutter-1.0/cogl/cogl-offscreen.h
+include/clutter-1.0/cogl/cogl-pango.h
+include/clutter-1.0/cogl/cogl-path.h
+include/clutter-1.0/cogl/cogl-shader.h
+include/clutter-1.0/cogl/cogl-texture.h
+include/clutter-1.0/cogl/cogl-types.h
+include/clutter-1.0/cogl/cogl-vertex-buffer.h
+include/clutter-1.0/cogl/cogl.h
+lib/girepository-1.0/Clutter-1.0.typelib
+lib/girepository-1.0/Cogl-1.0.typelib
+lib/girepository-1.0/ClutterJson-1.0.typelib
+lib/libclutter-glx-1.0.a
+lib/libclutter-glx-1.0.la
+lib/libclutter-glx-1.0.so
+lib/libclutter-glx-1.0.so.0
+libdata/pkgconfig/clutter-1.0.pc
+libdata/pkgconfig/clutter-glx-1.0.pc
+libdata/pkgconfig/clutter-x11-1.0.pc
+libdata/pkgconfig/cogl-1.0.pc
+libdata/pkgconfig/cogl-gl-1.0.pc
%%DOCSDIR%%/ClutterActor.html
%%DOCSDIR%%/ClutterAlpha.html
+%%DOCSDIR%%/ClutterAnimatable.html
%%DOCSDIR%%/ClutterBehaviour.html
-%%DOCSDIR%%/ClutterBehaviourBspline.html
%%DOCSDIR%%/ClutterBehaviourDepth.html
%%DOCSDIR%%/ClutterBehaviourEllipse.html
%%DOCSDIR%%/ClutterBehaviourOpacity.html
%%DOCSDIR%%/ClutterBehaviourPath.html
%%DOCSDIR%%/ClutterBehaviourRotate.html
%%DOCSDIR%%/ClutterBehaviourScale.html
+%%DOCSDIR%%/ClutterCairoTexture.html
%%DOCSDIR%%/ClutterChildMeta.html
-%%DOCSDIR%%/ClutterCloneTexture.html
+%%DOCSDIR%%/ClutterClone.html
%%DOCSDIR%%/ClutterContainer.html
-%%DOCSDIR%%/ClutterEntry.html
%%DOCSDIR%%/ClutterGroup.html
-%%DOCSDIR%%/ClutterLabel.html
%%DOCSDIR%%/ClutterListModel.html
%%DOCSDIR%%/ClutterMedia.html
%%DOCSDIR%%/ClutterModel.html
%%DOCSDIR%%/ClutterModelIter.html
+%%DOCSDIR%%/ClutterPath.html
%%DOCSDIR%%/ClutterRectangle.html
%%DOCSDIR%%/ClutterScore.html
%%DOCSDIR%%/ClutterScript.html
+%%DOCSDIR%%/ClutterScriptable.html
%%DOCSDIR%%/ClutterShader.html
%%DOCSDIR%%/ClutterStage.html
+%%DOCSDIR%%/ClutterText.html
%%DOCSDIR%%/ClutterTexture.html
%%DOCSDIR%%/ClutterTimeline.html
%%DOCSDIR%%/actor-box.png
-%%DOCSDIR%%/alpha-func.png
+%%DOCSDIR%%/additionaldocs.html
+%%DOCSDIR%%/annotation-glossary.html
%%DOCSDIR%%/building-clutter.html
%%DOCSDIR%%/ch01.html
%%DOCSDIR%%/ch02.html
@@ -98,21 +129,24 @@ libdata/pkgconfig/clutter-x11-0.8.pc
%%DOCSDIR%%/ch07.html
%%DOCSDIR%%/ch08.html
%%DOCSDIR%%/ch09.html
-%%DOCSDIR%%/clutter-Clutter-Effects.html
%%DOCSDIR%%/clutter-ClutterBackend.html
-%%DOCSDIR%%/clutter-ClutterScriptable.html
%%DOCSDIR%%/clutter-Colors.html
+%%DOCSDIR%%/clutter-EGL-Specific-Support.html
+%%DOCSDIR%%/clutter-EGLX-Specific-Support.html
%%DOCSDIR%%/clutter-Events.html
-%%DOCSDIR%%/clutter-Fixed-Point-Support.html
+%%DOCSDIR%%/clutter-GLX-Specific-Support.html
%%DOCSDIR%%/clutter-General.html
+%%DOCSDIR%%/clutter-Implicit-Animations.html
+%%DOCSDIR%%/clutter-Key-Bindings.html
%%DOCSDIR%%/clutter-Unit-conversion.html
%%DOCSDIR%%/clutter-Utilities.html
+%%DOCSDIR%%/clutter-Value-intervals.html
%%DOCSDIR%%/clutter-Versioning-Macros.html
%%DOCSDIR%%/clutter-Win32-Specific-Support.html
%%DOCSDIR%%/clutter-X11-Specific-Support.html
%%DOCSDIR%%/clutter-animation-behaviours.html
%%DOCSDIR%%/clutter-animation-conclusion.html
-%%DOCSDIR%%/clutter-animation-effects.html
+%%DOCSDIR%%/clutter-animation-implicit.html
%%DOCSDIR%%/clutter-animation-timelines.html
%%DOCSDIR%%/clutter-animations.html
%%DOCSDIR%%/clutter-overview.html
@@ -120,34 +154,52 @@ libdata/pkgconfig/clutter-x11-0.8.pc
%%DOCSDIR%%/clutter.devhelp
%%DOCSDIR%%/clutter.devhelp2
%%DOCSDIR%%/clutteranimation.html
+%%DOCSDIR%%/clutterbackends.html
%%DOCSDIR%%/clutterbase.html
+%%DOCSDIR%%/clutterglossary.html
+%%DOCSDIR%%/clutterobjecthierarchy.html
+%%DOCSDIR%%/clutterobjectindex.html
+%%DOCSDIR%%/clutterobjects.html
+%%DOCSDIR%%/cluttertools.html
%%DOCSDIR%%/creating-your-own-behaviours.html
+%%DOCSDIR%%/easing-modes.png
%%DOCSDIR%%/event-flow.png
+%%DOCSDIR%%/go01.html
%%DOCSDIR%%/home.png
%%DOCSDIR%%/index.html
%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/iterating-paths.html
%%DOCSDIR%%/ix01.html
%%DOCSDIR%%/ix02.html
%%DOCSDIR%%/ix03.html
%%DOCSDIR%%/ix04.html
%%DOCSDIR%%/ix05.html
%%DOCSDIR%%/ix06.html
+%%DOCSDIR%%/ix07.html
%%DOCSDIR%%/left.png
%%DOCSDIR%%/license.html
+%%DOCSDIR%%/migrating-ClutterEffect.html
+%%DOCSDIR%%/migrating-ClutterPath.html
+%%DOCSDIR%%/migration.html
%%DOCSDIR%%/path-alpha-func.png
-%%DOCSDIR%%/pt05.html
-%%DOCSDIR%%/pt06.html
-%%DOCSDIR%%/pt07.html
+%%DOCSDIR%%/pt10.html
%%DOCSDIR%%/right.png
+%%DOCSDIR%%/running-clutter.html
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
+%%DOCSDIR%%/using-cairo.html
share/doc/cogl/ch01.html
+share/doc/cogl/cogl-Blend-Strings.html
+share/doc/cogl/cogl-Color-Type.html
+share/doc/cogl/cogl-Fixed-Point-API.html
share/doc/cogl/cogl-General-API.html
+share/doc/cogl/cogl-Materials.html
+share/doc/cogl/cogl-Matrices.html
share/doc/cogl/cogl-Offscreen-Buffers.html
share/doc/cogl/cogl-Primitives.html
share/doc/cogl/cogl-Shaders-and-Programmable-Pipeline.html
share/doc/cogl/cogl-Textures.html
-share/doc/cogl/cogl-Utility-API.html
+share/doc/cogl/cogl-Vertex-Buffers.html
share/doc/cogl/cogl.devhelp
share/doc/cogl/cogl.devhelp2
share/doc/cogl/home.png
@@ -159,10 +211,14 @@ share/doc/cogl/license.html
share/doc/cogl/right.png
share/doc/cogl/style.css
share/doc/cogl/up.png
+share/gir-1.0/Clutter-1.0.gir
+share/gir-1.0/ClutterJson-1.0.gir
+share/gir-1.0/Cogl-1.0.gir
@dirrm share/doc/cogl
-@dirrmtry %%DOCSDIR%%
-@dirrm include/clutter-0.8/cogl
-@dirrm include/clutter-0.8/clutter/x11
-@dirrm include/clutter-0.8/clutter/glx
-@dirrmtry include/clutter-0.8/clutter
-@dirrmtry include/clutter-0.8
+@dirrm %%DOCSDIR%%
+@dirrm include/clutter-1.0/clutter/x11
+@dirrm include/clutter-1.0/clutter/json
+@dirrm include/clutter-1.0/clutter/glx
+@dirrm include/clutter-1.0/clutter
+@dirrm include/clutter-1.0/cogl
+@dirrm include/clutter-1.0
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
new file mode 100644
index 000000000000..aec0aa46cdca
--- /dev/null
+++ b/graphics/eog-plugins/Makefile
@@ -0,0 +1,57 @@
+# New ports collection makefile for: eog-plugins
+# Date created: 28 August 2009
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/eog-plugins/Makefile,v 1.5 2009/10/20 12:03:34 avl Exp $
+#
+
+PORTNAME= eog-plugins
+PORTVERSION= 2.28.1
+CATEGORIES= graphics gnome
+MASTER_SITES= GNOME
+DIST_SUBDIR= gnome2
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Plug-ins for the Eye of GNOME image viewer application
+
+BUILD_DEPENDS= eog:${PORTSDIR}/graphics/eog
+RUN_DEPENDS= eog:${PORTSDIR}/graphics/eog
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= gnomeprefix gnomehack intlhack gtk20
+WANT_GNOME= yes
+USE_GETTEXT= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_CHAMPLAIN) || \
+ (exists(${LOCALBASE}/lib/libchamplain-0.4.so)) || defined(WITH_CHAMPLIAN)
+LIB_DEPENDS+= champlain-0.4.1:${PORTSDIR}/graphics/libchamplain
+PLIST_SUB+= CHAMPLAIN=""
+.else
+PLUST_SUB+= CHAMPLAIN="@comment "
+.endif
+
+.if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \
+ defined(WITH_EXIF))
+LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif
+PLIST_SUB+= EXIF=""
+.else
+PLIST_SUB+= EXIF="@comment "
+.endif
+
+.if ${HAVE_GNOME:Mpygnome2}!=""
+USE_GNOME+= pygnome2
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+= PYTHON=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/eog-plugins/distinfo b/graphics/eog-plugins/distinfo
new file mode 100644
index 000000000000..f93de94ff87c
--- /dev/null
+++ b/graphics/eog-plugins/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/eog-plugins-2.28.1.tar.bz2) = 570857f4f9a32df31c64e5410125f98c
+SHA256 (gnome2/eog-plugins-2.28.1.tar.bz2) = cc15a7da85ebbe77701484e038be620858f00ed8696f69c8824ea769e74b1bee
+SIZE (gnome2/eog-plugins-2.28.1.tar.bz2) = 307193
diff --git a/graphics/eog-plugins/pkg-descr b/graphics/eog-plugins/pkg-descr
new file mode 100644
index 000000000000..7eed446bbbff
--- /dev/null
+++ b/graphics/eog-plugins/pkg-descr
@@ -0,0 +1,2 @@
+EoG-plugins is a collection of plugins for use with the Eye of GNOME Image
+Viewer.
diff --git a/graphics/eog-plugins/pkg-plist b/graphics/eog-plugins/pkg-plist
new file mode 100644
index 000000000000..b91fe7e6ba82
--- /dev/null
+++ b/graphics/eog-plugins/pkg-plist
@@ -0,0 +1,75 @@
+%%CHAMPLAIN%%lib/eog/plugins/champlain.eog-plugin
+%%PYTHON%%lib/eog/plugins/console.py
+%%PYTHON%%lib/eog/plugins/console.pyc
+%%PYTHON%%lib/eog/plugins/console.pyo
+%%EXIF%%lib/eog/plugins/exif-display.eog-plugin
+%%EXIF%%lib/eog/plugins/exif-display/exif-display-config.ui
+%%EXIF%%lib/eog/plugins/exif-display/exif-display.ui
+lib/eog/plugins/fit-to-width.eog-plugin
+%%CHAMPLAIN%%lib/eog/plugins/libchamplain.la
+%%CHAMPLAIN%%lib/eog/plugins/libchamplain.so
+%%EXIF%%lib/eog/plugins/libexif-display.la
+%%EXIF%%lib/eog/plugins/libexif-display.so
+lib/eog/plugins/libfit-to-width.la
+lib/eog/plugins/libfit-to-width.so
+%%PYTHON%%lib/eog/plugins/pythonconsole.eog-plugin
+%%PYTHON%%lib/eog/plugins/pythonconsole.py
+%%PYTHON%%lib/eog/plugins/pythonconsole.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole.pyo
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.eog-plugin
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.py
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.pyc
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.pyo
+share/locale/ar/LC_MESSAGES/eog-plugins.mo
+share/locale/as/LC_MESSAGES/eog-plugins.mo
+share/locale/be@latin/LC_MESSAGES/eog-plugins.mo
+share/locale/bg/LC_MESSAGES/eog-plugins.mo
+share/locale/bn_IN/LC_MESSAGES/eog-plugins.mo
+share/locale/ca/LC_MESSAGES/eog-plugins.mo
+share/locale/cs/LC_MESSAGES/eog-plugins.mo
+share/locale/da/LC_MESSAGES/eog-plugins.mo
+share/locale/de/LC_MESSAGES/eog-plugins.mo
+share/locale/el/LC_MESSAGES/eog-plugins.mo
+share/locale/en_GB/LC_MESSAGES/eog-plugins.mo
+share/locale/es/LC_MESSAGES/eog-plugins.mo
+share/locale/eu/LC_MESSAGES/eog-plugins.mo
+share/locale/fi/LC_MESSAGES/eog-plugins.mo
+share/locale/fr/LC_MESSAGES/eog-plugins.mo
+share/locale/gl/LC_MESSAGES/eog-plugins.mo
+share/locale/gu/LC_MESSAGES/eog-plugins.mo
+share/locale/hu/LC_MESSAGES/eog-plugins.mo
+share/locale/it/LC_MESSAGES/eog-plugins.mo
+share/locale/ja/LC_MESSAGES/eog-plugins.mo
+share/locale/kn/LC_MESSAGES/eog-plugins.mo
+share/locale/lt/LC_MESSAGES/eog-plugins.mo
+share/locale/mk/LC_MESSAGES/eog-plugins.mo
+share/locale/ml/LC_MESSAGES/eog-plugins.mo
+share/locale/mr/LC_MESSAGES/eog-plugins.mo
+share/locale/nb/LC_MESSAGES/eog-plugins.mo
+share/locale/or/LC_MESSAGES/eog-plugins.mo
+share/locale/pa/LC_MESSAGES/eog-plugins.mo
+share/locale/pl/LC_MESSAGES/eog-plugins.mo
+share/locale/pt/LC_MESSAGES/eog-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/eog-plugins.mo
+share/locale/sl/LC_MESSAGES/eog-plugins.mo
+share/locale/sq/LC_MESSAGES/eog-plugins.mo
+share/locale/sv/LC_MESSAGES/eog-plugins.mo
+share/locale/ta/LC_MESSAGES/eog-plugins.mo
+share/locale/te/LC_MESSAGES/eog-plugins.mo
+share/locale/vi/LC_MESSAGES/eog-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/eog-plugins.mo
+share/locale/zh_HK/LC_MESSAGES/eog-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/eog-plugins.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+%%EXIF%%@dirrm lib/eog/plugins/exif-display
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 9983c551255c..2cf5c806b357 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,12 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/eog/Makefile,v 1.8 2009/04/15 12:29:15 kwm Exp $
+# $MCom: ports/graphics/eog/Makefile,v 1.105 2009/10/20 00:34:26 kwm Exp $
#
PORTNAME= eog
-PORTVERSION= 2.26.3
-PORTREVISION= 1
+PORTVERSION= 2.28.1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,12 +15,14 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= The Eye Of Gnome image viewer
-LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms
+BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack librsvg2 desktopfileutils \
gnomedesktop
+WANT_GNOME= yes
INSTALLS_ICONS= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
@@ -34,9 +35,28 @@ GCONF_SCHEMAS= eog.schemas
.include <bsd.port.pre.mk>
+_WITH_EXIF= no
+_WITH_EXEMPI= no
+
.if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \
defined(WITH_EXIF))
LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif
+PLIST_SUB+= EXIF=""
+_WITH_EXIF= yes
+.else
+PLIST_SUB+= EXIF="@comment "
+.endif
+
+.if !defined(WITHOUT_EXEMPI) || (exists(${LOCALBASE}/lib/libexempi.so)) || \
+ defined(WITH_EXEMPI)
+LIB_DEPENDS+= exempi.3:${PORTSDIR}/textproc/exempi
+_WITH_EXEMPI= yes
+.endif
+
+.if ${_WITH_EXIF}=="yes" || ${_WITH_EXEMPI}=="yes"
+PLIST_SUB+= EXIFEXEMPI=""
+.else
+PLIST_SUB+= EXIFEXEMPI="@comment "
.endif
.if ${HAVE_GNOME:Mpygnome2}!=""
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 7e6f06052cf6..16dd7f89426b 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-2.26.3.tar.bz2) = 0660a0ce0fa4a46656fad84d61895917
-SHA256 (gnome2/eog-2.26.3.tar.bz2) = 67889e7598263146d835bce277df0dd67b6c5a14ad963790ce09ced55897effe
-SIZE (gnome2/eog-2.26.3.tar.bz2) = 2446417
+MD5 (gnome2/eog-2.28.1.tar.bz2) = efb488a22cbb0ca70f4b6a0f2d8aa83e
+SHA256 (gnome2/eog-2.28.1.tar.bz2) = e30b2f8f05d74acd715f1a93467cc3200850033338ddad05b6b06db8386ad27e
+SIZE (gnome2/eog-2.28.1.tar.bz2) = 2677525
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 55d8c67c1c01..f7832164f571 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -4,8 +4,8 @@ include/eog-2.20/eog/eog-debug.h
include/eog-2.20/eog/eog-dialog.h
include/eog-2.20/eog/eog-enums.h
include/eog-2.20/eog/eog-error-message-area.h
-include/eog-2.20/eog/eog-exif-details.h
-include/eog-2.20/eog/eog-exif-util.h
+%%EXIFEXEMPI%%include/eog-2.20/eog/eog-exif-details.h
+%%EXIF%%include/eog-2.20/eog/eog-exif-util.h
include/eog-2.20/eog/eog-file-chooser.h
include/eog-2.20/eog/eog-image-save-info.h
include/eog-2.20/eog/eog-image.h
@@ -45,7 +45,6 @@ share/applications/eog.desktop
%%DOCSDIR%%/EogMessageArea.html
%%DOCSDIR%%/EogMetadataReaderJpg.html
%%DOCSDIR%%/EogMetadataReaderPng.html
-%%DOCSDIR%%/EogPixbufCellRenderer.html
%%DOCSDIR%%/EogPlugin.html
%%DOCSDIR%%/EogPluginManager.html
%%DOCSDIR%%/EogPreferencesDialog.html
@@ -126,6 +125,10 @@ share/gnome/help/eog/ca/eog.xml
share/gnome/help/eog/ca/figures/eog_save_as_window.png
share/gnome/help/eog/ca/figures/eog_start_window.png
share/gnome/help/eog/ca/figures/eog_toolbar_editor_window.png
+share/gnome/help/eog/cs/eog.xml
+share/gnome/help/eog/cs/figures/eog_save_as_window.png
+share/gnome/help/eog/cs/figures/eog_start_window.png
+share/gnome/help/eog/cs/figures/eog_toolbar_editor_window.png
share/gnome/help/eog/da/eog.xml
share/gnome/help/eog/da/figures/eog_save_as_window.png
share/gnome/help/eog/da/figures/eog_start_window.png
@@ -215,14 +218,17 @@ share/locale/af/LC_MESSAGES/eog.mo
share/locale/am/LC_MESSAGES/eog.mo
share/locale/ar/LC_MESSAGES/eog.mo
share/locale/as/LC_MESSAGES/eog.mo
+share/locale/ast/LC_MESSAGES/eog.mo
share/locale/az/LC_MESSAGES/eog.mo
share/locale/be/LC_MESSAGES/eog.mo
share/locale/be@latin/LC_MESSAGES/eog.mo
share/locale/bg/LC_MESSAGES/eog.mo
share/locale/bn/LC_MESSAGES/eog.mo
share/locale/bn_IN/LC_MESSAGES/eog.mo
+share/locale/br/LC_MESSAGES/eog.mo
share/locale/bs/LC_MESSAGES/eog.mo
share/locale/ca/LC_MESSAGES/eog.mo
+share/locale/ca@valencia/LC_MESSAGES/eog.mo
share/locale/cs/LC_MESSAGES/eog.mo
share/locale/cy/LC_MESSAGES/eog.mo
share/locale/da/LC_MESSAGES/eog.mo
@@ -304,6 +310,7 @@ share/locale/zu/LC_MESSAGES/eog.mo
share/omf/eog/eog-C.omf
share/omf/eog/eog-ar.omf
share/omf/eog/eog-ca.omf
+share/omf/eog/eog-cs.omf
share/omf/eog/eog-da.omf
share/omf/eog/eog-de.omf
share/omf/eog/eog-el.omf
@@ -365,6 +372,8 @@ share/omf/eog/eog-zh_TW.omf
@dirrm share/gnome/help/eog/de
@dirrm share/gnome/help/eog/da/figures
@dirrm share/gnome/help/eog/da
+@dirrm share/gnome/help/eog/cs/figures
+@dirrm share/gnome/help/eog/cs
@dirrm share/gnome/help/eog/ca/figures
@dirrm share/gnome/help/eog/ca
@dirrm share/gnome/help/eog/ar/figures
@@ -434,9 +443,13 @@ share/omf/eog/eog-zh_TW.omf
@dirrmtry share/locale/fur
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 889245f59e5d..0006adb23281 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,12 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/evince/Makefile,v 1.7 2009/04/16 08:20:58 kwm Exp $
+# $MCom: ports/graphics/evince/Makefile,v 1.130 2009/10/19 19:57:01 kwm Exp $
#
PORTNAME= evince
-PORTVERSION= 2.26.2
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,8 +15,10 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 2 multi-format document viewer
+BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
LIB_DEPENDS= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
spectre.1:${PORTSDIR}/print/libspectre
+RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
USE_LDCONFIG= yes
USE_BZIP2= yes
@@ -30,9 +31,9 @@ USE_GNOME= gnomehack intlhack gnomeprefix desktopfileutils \
gnomedocutils ltasneededhack
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-print=gtk
-GCONF_SCHEMAS= evince.schemas evince-thumbnailer.schemas \
+GCONF_SCHEMAS= evince.schemas \
+ evince-thumbnailer.schemas \
evince-thumbnailer-ps.schemas
MAN1= evince.1
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index a422f9c5c4ee..2c95413b7667 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evince-2.26.2.tar.bz2) = ed8b9fb5c5d6feafd19f0114b736c9ef
-SHA256 (gnome2/evince-2.26.2.tar.bz2) = 5165adb77af7dd355c600bc1fce4bcc7de2538ed02d0f87028660096a61af489
-SIZE (gnome2/evince-2.26.2.tar.bz2) = 2033141
+MD5 (gnome2/evince-2.28.1.tar.bz2) = 3f0bf750825f5455d307ec21a27d1f3e
+SHA256 (gnome2/evince-2.28.1.tar.bz2) = c64047d4dc8424b613274651a5ef6bc78d306fc71bef36a3e033c07ddc2487a6
+SIZE (gnome2/evince-2.28.1.tar.bz2) = 2033193
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 6cc5588fdd69..1d1a6d126ec9 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -1,10 +1,13 @@
bin/evince
+bin/evince-previewer
bin/evince-thumbnailer
include/evince/2.25/evince-document.h
include/evince/2.25/evince-view.h
+include/evince/2.25/libdocument/ev-annotation.h
include/evince/2.25/libdocument/ev-async-renderer.h
include/evince/2.25/libdocument/ev-attachment.h
include/evince/2.25/libdocument/ev-backends-manager.h
+include/evince/2.25/libdocument/ev-document-annotations.h
include/evince/2.25/libdocument/ev-document-factory.h
include/evince/2.25/libdocument/ev-document-find.h
include/evince/2.25/libdocument/ev-document-fonts.h
@@ -14,6 +17,7 @@ include/evince/2.25/libdocument/ev-document-info.h
include/evince/2.25/libdocument/ev-document-layers.h
include/evince/2.25/libdocument/ev-document-links.h
include/evince/2.25/libdocument/ev-document-misc.h
+include/evince/2.25/libdocument/ev-document-print.h
include/evince/2.25/libdocument/ev-document-security.h
include/evince/2.25/libdocument/ev-document-thumbnails.h
include/evince/2.25/libdocument/ev-document-transition.h
@@ -28,6 +32,7 @@ include/evince/2.25/libdocument/ev-layer.h
include/evince/2.25/libdocument/ev-link-action.h
include/evince/2.25/libdocument/ev-link-dest.h
include/evince/2.25/libdocument/ev-link.h
+include/evince/2.25/libdocument/ev-mapping.h
include/evince/2.25/libdocument/ev-page.h
include/evince/2.25/libdocument/ev-render-context.h
include/evince/2.25/libdocument/ev-selection.h
@@ -36,6 +41,7 @@ include/evince/2.25/libdocument/ev-version.h
include/evince/2.25/libview/ev-job-scheduler.h
include/evince/2.25/libview/ev-jobs.h
include/evince/2.25/libview/ev-page-cache.h
+include/evince/2.25/libview/ev-stock-icons.h
include/evince/2.25/libview/ev-view-type-builtins.h
include/evince/2.25/libview/ev-view.h
%%COMICS%%lib/evince/1/backends/comicsdocument.evince-backend
@@ -90,12 +96,11 @@ share/applications/evince.desktop
%%DOCSDIR%%/evince-EvSidebar.html
%%DOCSDIR%%/evince-EvSidebarAttachments.html
%%DOCSDIR%%/evince-EvSidebarLinks.html
+%%DOCSDIR%%/evince-EvSidebarPage.html
%%DOCSDIR%%/evince-EvSidebarThumbnails.html
%%DOCSDIR%%/evince-ev-metadata-manager.html
%%DOCSDIR%%/evince-ev-properties-dialog.html
%%DOCSDIR%%/evince-ev-properties-fonts.html
-%%DOCSDIR%%/evince-ev-sidebar-page.html
-%%DOCSDIR%%/evince-ev-stock-icons.html
%%DOCSDIR%%/evince-ev-utils.html
%%DOCSDIR%%/evince-ev-window-title.html
%%DOCSDIR%%/evince.devhelp
@@ -109,12 +114,25 @@ share/applications/evince.desktop
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
+share/doc/libevdocument/EvAsyncRenderer.html
share/doc/libevdocument/EvAttachment.html
+share/doc/libevdocument/EvDocument.html
+share/doc/libevdocument/EvDocumentFind.html
+share/doc/libevdocument/EvDocumentFonts.html
+share/doc/libevdocument/EvDocumentForms.html
+share/doc/libevdocument/EvDocumentImages.html
+share/doc/libevdocument/EvDocumentLayers.html
+share/doc/libevdocument/EvDocumentLinks.html
+share/doc/libevdocument/EvDocumentSecurity.html
+share/doc/libevdocument/EvDocumentThumbnails.html
+share/doc/libevdocument/EvDocumentTransition.html
+share/doc/libevdocument/EvFileExporter.html
share/doc/libevdocument/EvFormFieldSignature.html
share/doc/libevdocument/EvImage.html
share/doc/libevdocument/EvLayer.html
share/doc/libevdocument/EvPage.html
share/doc/libevdocument/EvRenderContext.html
+share/doc/libevdocument/EvSelection.html
share/doc/libevdocument/data.html
share/doc/libevdocument/helper.html
share/doc/libevdocument/home.png
@@ -122,48 +140,37 @@ share/doc/libevdocument/index.html
share/doc/libevdocument/index.sgml
share/doc/libevdocument/interfaces.html
share/doc/libevdocument/left.png
-share/doc/libevdocument/libevdocument-ev-async-renderer.html
share/doc/libevdocument/libevdocument-ev-backends-manager.html
share/doc/libevdocument/libevdocument-ev-document-factory.html
-share/doc/libevdocument/libevdocument-ev-document-find.html
-share/doc/libevdocument/libevdocument-ev-document-fonts.html
-share/doc/libevdocument/libevdocument-ev-document-forms.html
-share/doc/libevdocument/libevdocument-ev-document-images.html
share/doc/libevdocument/libevdocument-ev-document-info.html
-share/doc/libevdocument/libevdocument-ev-document-layers.html
-share/doc/libevdocument/libevdocument-ev-document-links.html
share/doc/libevdocument/libevdocument-ev-document-misc.html
-share/doc/libevdocument/libevdocument-ev-document-security.html
-share/doc/libevdocument/libevdocument-ev-document-thumbnails.html
-share/doc/libevdocument/libevdocument-ev-document-transition.html
-share/doc/libevdocument/libevdocument-ev-document.html
-share/doc/libevdocument/libevdocument-ev-file-exporter.html
share/doc/libevdocument/libevdocument-ev-file-helpers.html
share/doc/libevdocument/libevdocument-ev-init.html
share/doc/libevdocument/libevdocument-ev-link-action.html
share/doc/libevdocument/libevdocument-ev-link-dest.html
share/doc/libevdocument/libevdocument-ev-link.html
-share/doc/libevdocument/libevdocument-ev-selection.html
share/doc/libevdocument/libevdocument-ev-transition-effect.html
share/doc/libevdocument/libevdocument.devhelp
share/doc/libevdocument/libevdocument.devhelp2
share/doc/libevdocument/right.png
share/doc/libevdocument/style.css
share/doc/libevdocument/up.png
-share/doc/libevview/EvJobExport.html
share/doc/libevview/ch01.html
share/doc/libevview/home.png
share/doc/libevview/index.html
share/doc/libevview/index.sgml
share/doc/libevview/left.png
+share/doc/libevview/libevview-EvJobPrint.html
share/doc/libevview/libevview-ev-job-scheduler.html
share/doc/libevview/libevview-ev-page-cache.html
+share/doc/libevview/libevview-ev-stock-icons.html
share/doc/libevview/libevview-ev-view.html
share/doc/libevview/libevview.devhelp
share/doc/libevview/libevview.devhelp2
share/doc/libevview/right.png
share/doc/libevview/style.css
share/doc/libevview/up.png
+%%DATADIR%%/evince-previewer-ui.xml
%%DATADIR%%/evince-toolbar.xml
%%DATADIR%%/evince-ui.xml
%%DATADIR%%/hand-open.png
@@ -185,8 +192,11 @@ share/doc/libevview/up.png
%%DATADIR%%/icons/hicolor/24x24/actions/zoom.png
%%DATADIR%%/icons/hicolor/32x32/actions/view-page-continuous.png
%%DATADIR%%/icons/hicolor/32x32/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/48x48/actions/close.png
%%DATADIR%%/icons/hicolor/48x48/actions/view-page-continuous.png
%%DATADIR%%/icons/hicolor/48x48/actions/view-page-facing.png
+%%DATADIR%%/icons/hicolor/48x48/actions/resize-se.png
+%%DATADIR%%/icons/hicolor/48x48/actions/resize-sw.png
share/gnome/help/evince/C/evince.xml
share/gnome/help/evince/C/figures/evince_start_window.png
share/gnome/help/evince/C/legal.xml
@@ -228,6 +238,8 @@ share/gnome/help/evince/sv/evince.xml
share/gnome/help/evince/sv/figures/evince_start_window.png
share/gnome/help/evince/uk/evince.xml
share/gnome/help/evince/uk/figures/evince_start_window.png
+share/gnome/help/evince/vi/evince.xml
+share/gnome/help/evince/vi/figures/evince_start_window.png
share/gnome/help/evince/zh_CN/evince.xml
share/gnome/help/evince/zh_CN/figures/evince_start_window.png
share/icons/hicolor/16x16/apps/evince.png
@@ -245,6 +257,7 @@ share/locale/bn/LC_MESSAGES/evince.mo
share/locale/bn_IN/LC_MESSAGES/evince.mo
share/locale/br/LC_MESSAGES/evince.mo
share/locale/ca/LC_MESSAGES/evince.mo
+share/locale/ca@valencia/LC_MESSAGES/evince.mo
share/locale/cs/LC_MESSAGES/evince.mo
share/locale/cy/LC_MESSAGES/evince.mo
share/locale/da/LC_MESSAGES/evince.mo
@@ -330,6 +343,7 @@ share/omf/evince/evince-ru.omf
share/omf/evince/evince-sr.omf
share/omf/evince/evince-sv.omf
share/omf/evince/evince-uk.omf
+share/omf/evince/evince-vi.omf
share/omf/evince/evince-zh_CN.omf
share/locale/be@latin/LC_MESSAGES/evince.mo
share/locale/sr@latin/LC_MESSAGES/evince.mo
@@ -338,6 +352,8 @@ share/locale/sr@latin/LC_MESSAGES/evince.mo
@dirrm share/gnome/help/evince/zh_CN
@dirrm share/gnome/help/evince/uk/figures
@dirrm share/gnome/help/evince/uk
+@dirrm share/gnome/help/evince/vi/figures
+@dirrm share/gnome/help/evince/vi
@dirrm share/gnome/help/evince/sv/figures
@dirrm share/gnome/help/evince/sv
@dirrm share/gnome/help/evince/sr/figures
@@ -429,6 +445,8 @@ share/locale/sr@latin/LC_MESSAGES/evince.mo
@dirrmtry share/locale/ks
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/graphics/gambas2-gb-pdf/Makefile b/graphics/gambas2-gb-pdf/Makefile
index fbf3e104c220..1626b91aa770 100644
--- a/graphics/gambas2-gb-pdf/Makefile
+++ b/graphics/gambas2-gb-pdf/Makefile
@@ -5,6 +5,7 @@
# $FreeBSD$
#
+PORTREVISION= 1
CATEGORIES= graphics lang
PKGNAMESUFFIX= -gb-pdf
diff --git a/graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp b/graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp
new file mode 100644
index 000000000000..65d1f7c279fc
--- /dev/null
+++ b/graphics/gambas2-gb-pdf/files/patch-gb.pdf_src_CPdfDocument.cpp
@@ -0,0 +1,19 @@
+--- gb.pdf/src/CPdfDocument.cpp.orig 2009-09-27 18:30:35.000000000 +0200
++++ gb.pdf/src/CPdfDocument.cpp 2009-09-27 20:10:45.000000000 +0200
+@@ -510,9 +510,15 @@ END_PROPERTY
+ BEGIN_PROPERTY(PDFINFO_format)
+
+ char *ctx=NULL;
++ double version;
++ int major, minor;
++
++ major = THIS->doc->getPDFMajorVersion();
++ minor = THIS->doc->getPDFMinorVersion();
++ version = (double)(major + minor *0.1);
+
+ GB.Alloc(POINTER(&ctx),16*sizeof(char));
+- snprintf(ctx,16*sizeof(char),"%.2g",THIS->doc->getPDFVersion());
++ snprintf(ctx,16*sizeof(char),"%.2g", version);
+ GB.ReturnNewZeroString(ctx);
+ GB.Free(POINTER(&ctx));
+
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 4e2daa606904..c4649a361481 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,11 +3,11 @@
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/gimp-app/Makefile,v 1.35 2009/04/09 03:24:07 mezz Exp $
+# $MCom: ports/graphics/gimp-app/Makefile,v 1.48 2009/09/23 15:44:49 kwm Exp $
#
PORTNAME= gimp-app
-DISTVERSION= 2.6.6
+DISTVERSION= 2.6.7
PORTREVISION?= 3
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
@@ -132,7 +132,7 @@ USE_GNOME+= libgnomeui
.endif
.if defined(WITH_HELPBROWSER)
-LIB_DEPENDS+= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
CONFIGURE_ARGS+= --with-webkit
PLIST_SUB+= HELPBROWSER=""
.else
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index bc2404b24b45..d1bcbd18a7f7 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.6.6.tar.bz2) = 23d880dd09cd62c936ed04666a53f8e4
-SHA256 (gimp-2.6.6.tar.bz2) = 53c261fa5045f4ca4b5e887a1eb394d28ebb08d108f065ef55bde33c892f0751
-SIZE (gimp-2.6.6.tar.bz2) = 16075908
+MD5 (gimp-2.6.7.tar.bz2) = 77ed86a8de9b48587efb24f2b115ad38
+SHA256 (gimp-2.6.7.tar.bz2) = a401c5fbe59e812413cb4d0b37607680089bf254056d8b5853aa79e03a6fe115
+SIZE (gimp-2.6.7.tar.bz2) = 16341756
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 3b4a4ef60482..dfba40fd50ec 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1856,6 +1856,8 @@ share/locale/km/LC_MESSAGES/gimp20-script-fu.mo
share/locale/km/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/km/LC_MESSAGES/gimp20-tips.mo
share/locale/km/LC_MESSAGES/gimp20.mo
+share/locale/kn/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/kn/LC_MESSAGES/gimp20.mo
share/locale/ko/LC_MESSAGES/gimp20-libgimp.mo
share/locale/ko/LC_MESSAGES/gimp20-python.mo
share/locale/ko/LC_MESSAGES/gimp20-script-fu.mo
@@ -1877,6 +1879,12 @@ 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/LC_MESSAGES/gimp20.mo
+share/locale/mr/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/mr/LC_MESSAGES/gimp20-python.mo
+share/locale/mr/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/mr/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/mr/LC_MESSAGES/gimp20-tips.mo
+share/locale/mr/LC_MESSAGES/gimp20.mo
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
@@ -1912,6 +1920,9 @@ 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/or/LC_MESSAGES/gimp20-python.mo
+share/locale/or/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/or/LC_MESSAGES/gimp20.mo
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
@@ -1954,6 +1965,7 @@ share/locale/rw/LC_MESSAGES/gimp20-script-fu.mo
share/locale/rw/LC_MESSAGES/gimp20-std-plug-ins.mo
share/locale/rw/LC_MESSAGES/gimp20-tips.mo
share/locale/rw/LC_MESSAGES/gimp20.mo
+share/locale/si/LC_MESSAGES/gimp20.mo
share/locale/sk/LC_MESSAGES/gimp20-libgimp.mo
share/locale/sk/LC_MESSAGES/gimp20-python.mo
share/locale/sk/LC_MESSAGES/gimp20-script-fu.mo
@@ -2088,10 +2100,14 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
@dirrmtry share/locale/tt
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrmtry share/locale/km/LC_MESSAGES
@dirrmtry share/locale/km
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 219a73d5d2e2..2b4e67790b12 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,11 +3,11 @@
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/gimp/Makefile,v 1.3 2007/12/02 18:43:48 ahze Exp $
+# $MCom: ports/graphics/gimp/Makefile,v 1.16 2009/08/25 00:05:58 marcus Exp $
#
PORTNAME= gimp
-DISTVERSION?= 2.6.6
+DISTVERSION?= 2.6.7
PORTREVISION?= 0
PORTEPOCH?= 2
CATEGORIES= graphics gnome
diff --git a/graphics/gir-repository-goocanvas/Makefile b/graphics/gir-repository-goocanvas/Makefile
new file mode 100644
index 000000000000..27c8c023565d
--- /dev/null
+++ b/graphics/gir-repository-goocanvas/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-goocanvas
+# Date created: 12 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/gir-repository-goocanvas/Makefile,v 1.1 2009/09/16 02:05:11 avl Exp $
+#
+
+CATEGORIES= graphics
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -goocanvas
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/graphics/gir-repository-poppler/Makefile b/graphics/gir-repository-poppler/Makefile
new file mode 100644
index 000000000000..6e5ae914b846
--- /dev/null
+++ b/graphics/gir-repository-poppler/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for: gir-repository-poppler
+# Date created: 07 September 2009
+# Whom: Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/gir-repository-poppler/Makefile,v 1.1 2009/09/16 02:05:11 avl Exp $
+#
+
+CATEGORIES= graphics
+
+MASTERDIR= ${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX= -poppler
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index e1cc2c565461..829239635e16 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= inkscape
-PORTVERSION= 0.46
-PORTREVISION= 6
+PORTVERSION= 0.47
CATEGORIES= graphics gnome
MASTER_SITES= SF
@@ -20,6 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
gc.1:${PORTSDIR}/devel/boehm-gc \
gtkspell.0:${PORTSDIR}/textproc/gtkspell \
lcms.1:${PORTSDIR}/graphics/lcms \
+ wpg-0.1.1:${PORTSDIR}/graphics/libwpg \
Magick++.2:${PORTSDIR}/graphics/ImageMagick
RUN_DEPENDS= ${SITE_PERL}/XML/XQL.pm:${PORTSDIR}/textproc/p5-XML-XQL
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+= --without-gnome-vfs
LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
CONFIGURE_ARGS+= --enable-poppler-cairo
.else
-CONFIGURE_ARGS+= --disable-poppler-cairo
+CONFIGURE_ARGS+= --enable-poppler-cairo=no
.endif
post-patch:
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 8c4a0083cce5..1ac697e42100 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,3 +1,3 @@
-MD5 (inkscape-0.46.tar.bz2) = 59997096c3640b2601c2b4afba8a3d75
-SHA256 (inkscape-0.46.tar.bz2) = f2ea624b98544b9d780bae1b5f042eae97bbd2779c7779ba21390b7bf6a9ca8e
-SIZE (inkscape-0.46.tar.bz2) = 13368645
+MD5 (inkscape-0.47.tar.bz2) = 7b497c8f673e40b05295a29f6e2111f4
+SHA256 (inkscape-0.47.tar.bz2) = 4985bc5bf1938d818fee31c72151a2d889300c0be00fab5dc94ccd84df39ef3a
+SIZE (inkscape-0.47.tar.bz2) = 20742550
diff --git a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
index c23c83ed53eb..82eb4bc8f8c2 100644
--- a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
+++ b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp
@@ -1,164 +1,89 @@
---- src/extension/internal/pdfinput/pdf-parser.cpp 2008/03/29 09:49:50 18077
-+++ src/extension/internal/pdfinput/pdf-parser.cpp 2008/06/12 18:14:25 18894
-@@ -2191,6 +2191,151 @@
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2009-11-26 03:14:38.000000000 +0100
++++ src/extension/internal/pdfinput/pdf-parser.cpp 2009-11-26 03:14:47.000000000 +0100
+@@ -809,7 +809,7 @@ void PdfParser::opSetExtGState(Object ar
+ blendingColorSpace = NULL;
+ isolated = knockout = gFalse;
+ if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+- blendingColorSpace = GfxColorSpace::parse(&obj5);
++ blendingColorSpace = GfxColorSpace::parse(&obj5,(Gfx*)this);
+ }
+ obj5.free();
+ if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
+@@ -1009,9 +1009,9 @@ void PdfParser::opSetFillColorSpace(Obje
+ state->setFillPattern(NULL);
+ res->lookupColorSpace(args[0].getName(), &obj);
+ if (obj.isNull()) {
+- colorSpace = GfxColorSpace::parse(&args[0]);
++ colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this);
+ } else {
+- colorSpace = GfxColorSpace::parse(&obj);
++ colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this);
}
- }
+ obj.free();
+ if (colorSpace) {
+@@ -1032,9 +1032,9 @@ void PdfParser::opSetStrokeColorSpace(Ob
+ state->setStrokePattern(NULL);
+ res->lookupColorSpace(args[0].getName(), &obj);
+ if (obj.isNull()) {
+- colorSpace = GfxColorSpace::parse(&args[0]);
++ colorSpace = GfxColorSpace::parse(&args[0],(Gfx*)this);
+ } else {
+- colorSpace = GfxColorSpace::parse(&obj);
++ colorSpace = GfxColorSpace::parse(&obj,(Gfx*)this);
+ }
+ obj.free();
+ if (colorSpace) {
+@@ -1101,7 +1101,7 @@ void PdfParser::opSetFillColorN(Object a
+ builder->updateStyle(state);
+ }
+ if (args[numArgs-1].isName() &&
+- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++ (pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) {
+ state->setFillPattern(pattern);
+ builder->updateStyle(state);
+ }
+@@ -1145,7 +1145,7 @@ void PdfParser::opSetStrokeColorN(Object
+ builder->updateStyle(state);
+ }
+ if (args[numArgs-1].isName() &&
+- (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
++ (pattern = res->lookupPattern(args[numArgs-1].getName(),(Gfx*)this))) {
+ state->setStrokePattern(pattern);
+ builder->updateStyle(state);
+ }
+@@ -1543,7 +1543,7 @@ void PdfParser::opShFill(Object args[],
+ double *matrix = NULL;
+ GBool savedState = gFalse;
-+
-+#if 1
-+
-+/**
-+ * This is for the change to GfxFont's getNextChar() call.
-+ * Thanks to tsdgeos for the fix.
-+ * Miklos, does this look ok?
-+ */
-+
-+void PdfParser::doShowText(GooString *s) {
-+ GfxFont *font;
-+ int wMode;
-+ double riseX, riseY;
-+ CharCode code;
-+ Unicode *u = NULL;
-+ double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
-+ double originX, originY, tOriginX, tOriginY;
-+ double oldCTM[6], newCTM[6];
-+ double *mat;
-+ Object charProc;
-+ Dict *resDict;
-+ Parser *oldParser;
-+ char *p;
-+ int len, n, uLen, nChars, nSpaces, i;
-+
-+ font = state->getFont();
-+ wMode = font->getWMode();
-+
-+ builder->beginString(state, s);
-+
-+ // handle a Type 3 char
-+ if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
-+ mat = state->getCTM();
-+ for (i = 0; i < 6; ++i) {
-+ oldCTM[i] = mat[i];
-+ }
-+ mat = state->getTextMat();
-+ newCTM[0] = mat[0] * oldCTM[0] + mat[1] * oldCTM[2];
-+ newCTM[1] = mat[0] * oldCTM[1] + mat[1] * oldCTM[3];
-+ newCTM[2] = mat[2] * oldCTM[0] + mat[3] * oldCTM[2];
-+ newCTM[3] = mat[2] * oldCTM[1] + mat[3] * oldCTM[3];
-+ mat = font->getFontMatrix();
-+ newCTM[0] = mat[0] * newCTM[0] + mat[1] * newCTM[2];
-+ newCTM[1] = mat[0] * newCTM[1] + mat[1] * newCTM[3];
-+ newCTM[2] = mat[2] * newCTM[0] + mat[3] * newCTM[2];
-+ newCTM[3] = mat[2] * newCTM[1] + mat[3] * newCTM[3];
-+ newCTM[0] *= state->getFontSize();
-+ newCTM[1] *= state->getFontSize();
-+ newCTM[2] *= state->getFontSize();
-+ newCTM[3] *= state->getFontSize();
-+ newCTM[0] *= state->getHorizScaling();
-+ newCTM[2] *= state->getHorizScaling();
-+ state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
-+ curX = state->getCurX();
-+ curY = state->getCurY();
-+ lineX = state->getLineX();
-+ lineY = state->getLineY();
-+ oldParser = parser;
-+ p = s->getCString();
-+ len = s->getLength();
-+ while (len > 0) {
-+ n = font->getNextChar(p, len, &code,
-+ &u, &uLen,
-+ &dx, &dy, &originX, &originY);
-+ dx = dx * state->getFontSize() + state->getCharSpace();
-+ if (n == 1 && *p == ' ') {
-+ dx += state->getWordSpace();
-+ }
-+ dx *= state->getHorizScaling();
-+ dy *= state->getFontSize();
-+ state->textTransformDelta(dx, dy, &tdx, &tdy);
-+ state->transform(curX + riseX, curY + riseY, &x, &y);
-+ saveState();
-+ state->setCTM(newCTM[0], newCTM[1], newCTM[2], newCTM[3], x, y);
-+ //~ the CTM concat values here are wrong (but never used)
-+ //out->updateCTM(state, 1, 0, 0, 1, 0, 0);
-+ if (0){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
-+ code, u, uLen)) {*/
-+ ((Gfx8BitFont *)font)->getCharProc(code, &charProc);
-+ if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
-+ pushResources(resDict);
-+ }
-+ if (charProc.isStream()) {
-+ //parse(&charProc, gFalse); // TODO: parse into SVG font
-+ } else {
-+ error(getPos(), "Missing or bad Type3 CharProc entry");
-+ }
-+ //out->endType3Char(state);
-+ if (resDict) {
-+ popResources();
-+ }
-+ charProc.free();
-+ }
-+ restoreState();
-+ // GfxState::restore() does *not* restore the current position,
-+ // so we deal with it here using (curX, curY) and (lineX, lineY)
-+ curX += tdx;
-+ curY += tdy;
-+ state->moveTo(curX, curY);
-+ state->textSetPos(lineX, lineY);
-+ p += n;
-+ len -= n;
-+ }
-+ parser = oldParser;
-+
-+ } else {
-+ state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
-+ p = s->getCString();
-+ len = s->getLength();
-+ while (len > 0) {
-+ n = font->getNextChar(p, len, &code,
-+ &u, &uLen,
-+ &dx, &dy, &originX, &originY);
-+
-+ if (wMode) {
-+ dx *= state->getFontSize();
-+ dy = dy * state->getFontSize() + state->getCharSpace();
-+ if (n == 1 && *p == ' ') {
-+ dy += state->getWordSpace();
-+ }
-+ } else {
-+ dx = dx * state->getFontSize() + state->getCharSpace();
-+ if (n == 1 && *p == ' ') {
-+ dx += state->getWordSpace();
-+ }
-+ dx *= state->getHorizScaling();
-+ dy *= state->getFontSize();
-+ }
-+ state->textTransformDelta(dx, dy, &tdx, &tdy);
-+ originX *= state->getFontSize();
-+ originY *= state->getFontSize();
-+ state->textTransformDelta(originX, originY, &tOriginX, &tOriginY);
-+ builder->addChar(state, state->getCurX() + riseX, state->getCurY() + riseY,
-+ dx, dy, tOriginX, tOriginY, code, n, u, uLen);
-+ state->shift(tdx, tdy);
-+ p += n;
-+ len -= n;
-+ }
-+ }
-+
-+ builder->endString(state);
-+}
-+
-+#else /* !POPPLER_NEW_GFXFONT */
-+
- void PdfParser::doShowText(GooString *s) {
- GfxFont *font;
- int wMode;
-@@ -2325,6 +2470,9 @@
- builder->endString(state);
- }
+- if (!(shading = res->lookupShading(args[0].getName()))) {
++ if (!(shading = res->lookupShading(args[0].getName(),(Gfx*)this))) {
+ return;
+ }
-+#endif /* POPPLER_NEW_GFXFONT */
-+
-+
- //------------------------------------------------------------------------
- // XObject operators
- //------------------------------------------------------------------------
+@@ -2507,7 +2655,7 @@ void PdfParser::doImage(Object *ref, Str
+ }
+ }
+ if (!obj1.isNull()) {
+- colorSpace = GfxColorSpace::parse(&obj1);
++ colorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this);
+ } else if (csMode == streamCSDeviceGray) {
+ colorSpace = new GfxDeviceGrayColorSpace();
+ } else if (csMode == streamCSDeviceRGB) {
+@@ -2592,7 +2740,7 @@ void PdfParser::doImage(Object *ref, Str
+ obj2.free();
+ }
+ }
+- maskColorSpace = GfxColorSpace::parse(&obj1);
++ maskColorSpace = GfxColorSpace::parse(&obj1,(Gfx*)this);
+ obj1.free();
+ if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
+ goto err1;
+@@ -2767,7 +2915,7 @@ void PdfParser::doForm(Object *str) {
+ if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
+ transpGroup = gTrue;
+ if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+- blendingColorSpace = GfxColorSpace::parse(&obj3);
++ blendingColorSpace = GfxColorSpace::parse(&obj3,(Gfx*)this);
+ }
+ obj3.free();
+ if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index c5f974c76901..2f5925c0d7e5 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -14,6 +14,7 @@ share/applications/inkscape.desktop
%%DATADIR%%/examples/car.svgz
%%DATADIR%%/examples/data_uri.svg
%%DATADIR%%/examples/eastern-motive-P4G.svg
+%%DATADIR%%/examples/filters.svg
%%DATADIR%%/examples/flow-go.svg
%%DATADIR%%/examples/flowsample.svg
%%DATADIR%%/examples/gallardo.svgz
@@ -23,17 +24,20 @@ share/applications/inkscape.desktop
%%DATADIR%%/examples/i18n.svg
%%DATADIR%%/examples/istest.pov
%%DATADIR%%/examples/l-systems.svgz
-%%DATADIR%%/examples/lighting_effects.svg
+%%DATADIR%%/examples/lighting_filters.svg
%%DATADIR%%/examples/live-path-effects-curvestitch.svg
%%DATADIR%%/examples/live-path-effects-gears.svg
%%DATADIR%%/examples/live-path-effects-pathalongpath.svg
%%DATADIR%%/examples/markers.svg
+%%DATADIR%%/examples/replace-hue.svg
%%DATADIR%%/examples/rope-3D.svg
%%DATADIR%%/examples/stars.svgz
+%%DATADIR%%/examples/svgfont.svg
%%DATADIR%%/examples/tesselation-P3.svg
%%DATADIR%%/examples/text-on-path.svg
%%DATADIR%%/examples/tiger.svgz
-%%DATADIR%%/examples/turbulence_effects.svg
+%%DATADIR%%/examples/tref.svg
+%%DATADIR%%/examples/turbulence_filters.svg
%%DATADIR%%/extensions/Barcode/Base.py
%%DATADIR%%/extensions/Barcode/Code128.py
%%DATADIR%%/extensions/Barcode/Code39.py
@@ -45,17 +49,119 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/Barcode/UPCA.py
%%DATADIR%%/extensions/Barcode/UPCE.py
%%DATADIR%%/extensions/Barcode/__init__.py
+%%DATADIR%%/extensions/Inkscape.pm
+%%DATADIR%%/extensions/Poly3DObjects/cube.obj
+%%DATADIR%%/extensions/Poly3DObjects/cuboct.obj
+%%DATADIR%%/extensions/Poly3DObjects/dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/great_dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/great_rhombicosidodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/great_rhombicuboct.obj
+%%DATADIR%%/extensions/Poly3DObjects/great_stel_dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/icos.obj
+%%DATADIR%%/extensions/Poly3DObjects/icosidodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/jessens_orthog_icos.obj
+%%DATADIR%%/extensions/Poly3DObjects/methane.obj
+%%DATADIR%%/extensions/Poly3DObjects/oct.obj
+%%DATADIR%%/extensions/Poly3DObjects/rh_axes.obj
+%%DATADIR%%/extensions/Poly3DObjects/rhomb_dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/rhomb_triacont.obj
+%%DATADIR%%/extensions/Poly3DObjects/small_rhombicosidodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/small_rhombicuboct.obj
+%%DATADIR%%/extensions/Poly3DObjects/small_triam_icos.obj
+%%DATADIR%%/extensions/Poly3DObjects/snub_cube.obj
+%%DATADIR%%/extensions/Poly3DObjects/snub_dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/szilassi.obj
+%%DATADIR%%/extensions/Poly3DObjects/tet.obj
+%%DATADIR%%/extensions/Poly3DObjects/trunc_cube.obj
+%%DATADIR%%/extensions/Poly3DObjects/trunc_dodec.obj
+%%DATADIR%%/extensions/Poly3DObjects/trunc_icos.obj
+%%DATADIR%%/extensions/Poly3DObjects/trunc_oct.obj
+%%DATADIR%%/extensions/Poly3DObjects/trunc_tet.obj
%%DATADIR%%/extensions/SpSVG.pm
%%DATADIR%%/extensions/addnodes.inx
%%DATADIR%%/extensions/addnodes.py
%%DATADIR%%/extensions/ai_input.inx
-%%DATADIR%%/extensions/ai_output.inx
%%DATADIR%%/extensions/aisvg.inx
%%DATADIR%%/extensions/aisvg.xslt
+%%DATADIR%%/extensions/alphabet_soup/2.svg
+%%DATADIR%%/extensions/alphabet_soup/3.svg
+%%DATADIR%%/extensions/alphabet_soup/6.svg
+%%DATADIR%%/extensions/alphabet_soup/7.svg
+%%DATADIR%%/extensions/alphabet_soup/Cblob.svg
+%%DATADIR%%/extensions/alphabet_soup/Chook.svg
+%%DATADIR%%/extensions/alphabet_soup/Ctail.svg
+%%DATADIR%%/extensions/alphabet_soup/Delta.svg
+%%DATADIR%%/extensions/alphabet_soup/Eb.svg
+%%DATADIR%%/extensions/alphabet_soup/Eserif.svg
+%%DATADIR%%/extensions/alphabet_soup/Et.svg
+%%DATADIR%%/extensions/alphabet_soup/G.svg
+%%DATADIR%%/extensions/alphabet_soup/IBSerif.svg
+%%DATADIR%%/extensions/alphabet_soup/ITSerif.svg
+%%DATADIR%%/extensions/alphabet_soup/Lb.svg
+%%DATADIR%%/extensions/alphabet_soup/Lt.svg
+%%DATADIR%%/extensions/alphabet_soup/Ocross.svg
+%%DATADIR%%/extensions/alphabet_soup/Oterm.svg
+%%DATADIR%%/extensions/alphabet_soup/P.svg
+%%DATADIR%%/extensions/alphabet_soup/Q.svg
+%%DATADIR%%/extensions/alphabet_soup/Rblock.svg
+%%DATADIR%%/extensions/alphabet_soup/Tb.svg
+%%DATADIR%%/extensions/alphabet_soup/Tt.svg
+%%DATADIR%%/extensions/alphabet_soup/U.svg
+%%DATADIR%%/extensions/alphabet_soup/Vser.svg
+%%DATADIR%%/extensions/alphabet_soup/Xh.svg
+%%DATADIR%%/extensions/alphabet_soup/Xne.svg
+%%DATADIR%%/extensions/alphabet_soup/Xnw.svg
+%%DATADIR%%/extensions/alphabet_soup/Xvb.svg
+%%DATADIR%%/extensions/alphabet_soup/Xvt.svg
+%%DATADIR%%/extensions/alphabet_soup/a.svg
+%%DATADIR%%/extensions/alphabet_soup/abase.svg
+%%DATADIR%%/extensions/alphabet_soup/acap.svg
+%%DATADIR%%/extensions/alphabet_soup/b.svg
+%%DATADIR%%/extensions/alphabet_soup/bar.svg
+%%DATADIR%%/extensions/alphabet_soup/bar2.svg
+%%DATADIR%%/extensions/alphabet_soup/barcap.svg
+%%DATADIR%%/extensions/alphabet_soup/c.svg
+%%DATADIR%%/extensions/alphabet_soup/cross.svg
+%%DATADIR%%/extensions/alphabet_soup/cserif.svg
+%%DATADIR%%/extensions/alphabet_soup/e.svg
+%%DATADIR%%/extensions/alphabet_soup/epsilon.svg
+%%DATADIR%%/extensions/alphabet_soup/f.svg
+%%DATADIR%%/extensions/alphabet_soup/gamma.svg
+%%DATADIR%%/extensions/alphabet_soup/h.svg
+%%DATADIR%%/extensions/alphabet_soup/h2.svg
+%%DATADIR%%/extensions/alphabet_soup/hcap.svg
+%%DATADIR%%/extensions/alphabet_soup/idot.svg
+%%DATADIR%%/extensions/alphabet_soup/j.svg
+%%DATADIR%%/extensions/alphabet_soup/k.svg
+%%DATADIR%%/extensions/alphabet_soup/l.svg
+%%DATADIR%%/extensions/alphabet_soup/lserif.svg
+%%DATADIR%%/extensions/alphabet_soup/m.svg
+%%DATADIR%%/extensions/alphabet_soup/mcap.svg
+%%DATADIR%%/extensions/alphabet_soup/n.svg
+%%DATADIR%%/extensions/alphabet_soup/o.svg
+%%DATADIR%%/extensions/alphabet_soup/ocap.svg
+%%DATADIR%%/extensions/alphabet_soup/question.svg
+%%DATADIR%%/extensions/alphabet_soup/r.svg
+%%DATADIR%%/extensions/alphabet_soup/rcap.svg
+%%DATADIR%%/extensions/alphabet_soup/s.svg
+%%DATADIR%%/extensions/alphabet_soup/serif.svg
+%%DATADIR%%/extensions/alphabet_soup/t.svg
+%%DATADIR%%/extensions/alphabet_soup/tserif.svg
+%%DATADIR%%/extensions/alphabet_soup/v.svg
+%%DATADIR%%/extensions/alphabet_soup/vcap.svg
+%%DATADIR%%/extensions/alphabet_soup/vserl.svg
+%%DATADIR%%/extensions/alphabet_soup/vserr.svg
+%%DATADIR%%/extensions/alphabet_soup/x.svg
+%%DATADIR%%/extensions/alphabet_soup/y.svg
+%%DATADIR%%/extensions/alphabet_soup/yogh.svg
+%%DATADIR%%/extensions/alphabet_soup/z.svg
%%DATADIR%%/extensions/bezmisc.py
-%%DATADIR%%/extensions/cdr2svg.sh
+%%DATADIR%%/extensions/ccx_input.inx
%%DATADIR%%/extensions/cdr_input.inx
+%%DATADIR%%/extensions/cdt_input.inx
+%%DATADIR%%/extensions/cgm_input.inx
%%DATADIR%%/extensions/chardataeffect.py
+%%DATADIR%%/extensions/cmx_input.inx
%%DATADIR%%/extensions/color_brighter.inx
%%DATADIR%%/extensions/color_brighter.py
%%DATADIR%%/extensions/color_custom.inx
@@ -94,6 +200,8 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/color_rgbbarrel.py
%%DATADIR%%/extensions/coloreffect.py
%%DATADIR%%/extensions/colors.xml
+%%DATADIR%%/extensions/convert2dashes.inx
+%%DATADIR%%/extensions/convert2dashes.py
%%DATADIR%%/extensions/cspsubdiv.py
%%DATADIR%%/extensions/cubicsuperpath.py
%%DATADIR%%/extensions/dia.inx
@@ -102,28 +210,35 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/dimension.py
%%DATADIR%%/extensions/dots.inx
%%DATADIR%%/extensions/dots.py
+%%DATADIR%%/extensions/draw_from_triangle.inx
+%%DATADIR%%/extensions/draw_from_triangle.py
%%DATADIR%%/extensions/dxf_input.inx
+%%DATADIR%%/extensions/dxf_input.py
%%DATADIR%%/extensions/dxf_outlines.inx
%%DATADIR%%/extensions/dxf_outlines.py
%%DATADIR%%/extensions/dxf_output.inx
+%%DATADIR%%/extensions/dxf_templates.py
%%DATADIR%%/extensions/edge3d.inx
%%DATADIR%%/extensions/edge3d.py
%%DATADIR%%/extensions/embed_raster_in_svg.pl
%%DATADIR%%/extensions/embedimage.inx
%%DATADIR%%/extensions/embedimage.py
%%DATADIR%%/extensions/eps_input.inx
-%%DATADIR%%/extensions/epsi_output.inx
%%DATADIR%%/extensions/eqtexsvg.inx
%%DATADIR%%/extensions/eqtexsvg.py
%%DATADIR%%/extensions/export_gimp_palette.inx
%%DATADIR%%/extensions/export_gimp_palette.py
%%DATADIR%%/extensions/extractimage.inx
%%DATADIR%%/extensions/extractimage.py
+%%DATADIR%%/extensions/extrude.inx
+%%DATADIR%%/extensions/extrude.py
%%DATADIR%%/extensions/ffgeom.py
-%%DATADIR%%/extensions/fig2svg.sh
+%%DATADIR%%/extensions/fig2dev-ext.py
%%DATADIR%%/extensions/fig_input.inx
%%DATADIR%%/extensions/flatten.inx
%%DATADIR%%/extensions/flatten.py
+%%DATADIR%%/extensions/foldablebox.inx
+%%DATADIR%%/extensions/foldablebox.py
%%DATADIR%%/extensions/fractalize.inx
%%DATADIR%%/extensions/fractalize.py
%%DATADIR%%/extensions/funcplot.inx
@@ -132,12 +247,18 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/gears.py
%%DATADIR%%/extensions/gimp_xcf.inx
%%DATADIR%%/extensions/gimp_xcf.py
+%%DATADIR%%/extensions/grid_cartesian.inx
+%%DATADIR%%/extensions/grid_cartesian.py
+%%DATADIR%%/extensions/grid_polar.inx
+%%DATADIR%%/extensions/grid_polar.py
+%%DATADIR%%/extensions/guides_creator.inx
+%%DATADIR%%/extensions/guides_creator.py
%%DATADIR%%/extensions/handles.inx
%%DATADIR%%/extensions/handles.py
+%%DATADIR%%/extensions/hpgl_output.inx
+%%DATADIR%%/extensions/hpgl_output.py
%%DATADIR%%/extensions/ill2svg.pl
%%DATADIR%%/extensions/inkex.py
-%%DATADIR%%/extensions/inkscape-shadow-white.sh
-%%DATADIR%%/extensions/inkscape-shadow.sh
%%DATADIR%%/extensions/inkscape_help_askaquestion.inx
%%DATADIR%%/extensions/inkscape_help_commandline.inx
%%DATADIR%%/extensions/inkscape_help_faq.inx
@@ -146,8 +267,13 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/inkscape_help_relnotes.inx
%%DATADIR%%/extensions/inkscape_help_reportabug.inx
%%DATADIR%%/extensions/inkscape_help_svgspec.inx
+%%DATADIR%%/extensions/inkweb.js
+%%DATADIR%%/extensions/inkwebeffect.py
%%DATADIR%%/extensions/interp.inx
%%DATADIR%%/extensions/interp.py
+%%DATADIR%%/extensions/interp_att_g.inx
+%%DATADIR%%/extensions/interp_att_g.py
+%%DATADIR%%/extensions/launch_webbrowser.py
%%DATADIR%%/extensions/lindenmayer.inx
%%DATADIR%%/extensions/lindenmayer.py
%%DATADIR%%/extensions/lorem_ipsum.inx
@@ -160,35 +286,52 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/motion.py
%%DATADIR%%/extensions/outline2svg.inx
%%DATADIR%%/extensions/outline2svg.pl
+%%DATADIR%%/extensions/param_curves.inx
+%%DATADIR%%/extensions/param_curves.py
%%DATADIR%%/extensions/pathalongpath.inx
%%DATADIR%%/extensions/pathalongpath.py
%%DATADIR%%/extensions/pathmodifier.py
-%%DATADIR%%/extensions/pdf_output.inx.txt
-%%DATADIR%%/extensions/pdf_output_via_gs_on_win32.inx.txt
+%%DATADIR%%/extensions/pathscatter.inx
+%%DATADIR%%/extensions/pathscatter.py
%%DATADIR%%/extensions/perfectboundcover.inx
%%DATADIR%%/extensions/perfectboundcover.py
%%DATADIR%%/extensions/perspective.inx
%%DATADIR%%/extensions/perspective.py
+%%DATADIR%%/extensions/plt_input.inx
+%%DATADIR%%/extensions/plt_output.inx
+%%DATADIR%%/extensions/plt_output.py
+%%DATADIR%%/extensions/polyhedron_3d.inx
+%%DATADIR%%/extensions/polyhedron_3d.py
+%%DATADIR%%/extensions/printing-marks.inx
+%%DATADIR%%/extensions/printing-marks.py
%%DATADIR%%/extensions/ps2dxf.sh
-%%DATADIR%%/extensions/ps2epsi.sh
-%%DATADIR%%/extensions/ps2pdf.cmd
-%%DATADIR%%/extensions/ps2pdf.sh
+%%DATADIR%%/extensions/ps2pdf-ext.py
%%DATADIR%%/extensions/ps_input.inx
%%DATADIR%%/extensions/pturtle.py
%%DATADIR%%/extensions/radiusrand.inx
%%DATADIR%%/extensions/radiusrand.py
-%%DATADIR%%/extensions/randompnt.inx
-%%DATADIR%%/extensions/randompos.inx
+%%DATADIR%%/extensions/render_alphabetsoup.inx
+%%DATADIR%%/extensions/render_alphabetsoup.py
+%%DATADIR%%/extensions/render_alphabetsoup_config.py
%%DATADIR%%/extensions/render_barcode.inx
%%DATADIR%%/extensions/render_barcode.py
+%%DATADIR%%/extensions/restack.inx
+%%DATADIR%%/extensions/restack.py
%%DATADIR%%/extensions/rtree.inx
%%DATADIR%%/extensions/rtree.py
%%DATADIR%%/extensions/rubberstretch.inx
%%DATADIR%%/extensions/rubberstretch.py
+%%DATADIR%%/extensions/run_command.py
+%%DATADIR%%/extensions/scour.inkscape.py
+%%DATADIR%%/extensions/scour.inx
+%%DATADIR%%/extensions/scour.py
%%DATADIR%%/extensions/simplepath.py
%%DATADIR%%/extensions/simplepath.rb
%%DATADIR%%/extensions/simplestyle.py
%%DATADIR%%/extensions/simpletransform.py
+%%DATADIR%%/extensions/sk1_input.inx
+%%DATADIR%%/extensions/sk1_output.inx
+%%DATADIR%%/extensions/sk1_output.py
%%DATADIR%%/extensions/sk2svg.sh
%%DATADIR%%/extensions/sk_input.inx
%%DATADIR%%/extensions/spirograph.inx
@@ -201,8 +344,11 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/svg2xaml.xsl
%%DATADIR%%/extensions/svg_and_media_zip_output.inx
%%DATADIR%%/extensions/svg_and_media_zip_output.py
-%%DATADIR%%/extensions/svgz_input.inx
-%%DATADIR%%/extensions/svgz_output.inx
+%%DATADIR%%/extensions/svg_regex.py
+%%DATADIR%%/extensions/svgcalendar.inx
+%%DATADIR%%/extensions/svgcalendar.py
+%%DATADIR%%/extensions/text_braille.inx
+%%DATADIR%%/extensions/text_braille.py
%%DATADIR%%/extensions/text_flipcase.inx
%%DATADIR%%/extensions/text_flipcase.py
%%DATADIR%%/extensions/text_lowercase.inx
@@ -217,19 +363,21 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/text_titlecase.py
%%DATADIR%%/extensions/text_uppercase.inx
%%DATADIR%%/extensions/text_uppercase.py
+%%DATADIR%%/extensions/triangle.inx
+%%DATADIR%%/extensions/triangle.py
%%DATADIR%%/extensions/txt2svg.inx
%%DATADIR%%/extensions/txt2svg.pl
-%%DATADIR%%/extensions/webbrowser_askaquestion.py
-%%DATADIR%%/extensions/webbrowser_commandline.py
-%%DATADIR%%/extensions/webbrowser_faq.py
-%%DATADIR%%/extensions/webbrowser_keys.py
-%%DATADIR%%/extensions/webbrowser_manual.py
-%%DATADIR%%/extensions/webbrowser_relnotes.py
-%%DATADIR%%/extensions/webbrowser_reportabug.py
-%%DATADIR%%/extensions/webbrowser_svgspec.py
+%%DATADIR%%/extensions/uniconv-ext.py
+%%DATADIR%%/extensions/uniconv_output.py
+%%DATADIR%%/extensions/web-set-att.inx
+%%DATADIR%%/extensions/web-set-att.py
+%%DATADIR%%/extensions/web-transmit-att.inx
+%%DATADIR%%/extensions/web-transmit-att.py
%%DATADIR%%/extensions/whirl.inx
%%DATADIR%%/extensions/whirl.py
%%DATADIR%%/extensions/wmf_input.inx
+%%DATADIR%%/extensions/wmf_output.inx
+%%DATADIR%%/extensions/wmf_output.py
%%DATADIR%%/extensions/xaml2svg.inx
%%DATADIR%%/extensions/xaml2svg.xsl
%%DATADIR%%/extensions/xaml2svg/Makefile.am
@@ -240,10 +388,13 @@ share/applications/inkscape.desktop
%%DATADIR%%/extensions/xaml2svg/properties.xsl
%%DATADIR%%/extensions/xaml2svg/shapes.xsl
%%DATADIR%%/extensions/xaml2svg/transform.xsl
+%%DATADIR%%/extensions/yocto_css.py
+%%DATADIR%%/filters/README
+%%DATADIR%%/filters/filters.svg
+%%DATADIR%%/filters/filters.svg.h
%%DATADIR%%/fonts/README
%%DATADIR%%/gradients/README
-%%DATADIR%%/icons/README.icon_themes
-%%DATADIR%%/icons/README.legacy_icons
+%%DATADIR%%/icons/README
%%DATADIR%%/icons/feBlend-icon.png
%%DATADIR%%/icons/feBlend-icon.svg
%%DATADIR%%/icons/feColorMatrix-icon.png
@@ -276,7 +427,8 @@ share/applications/inkscape.desktop
%%DATADIR%%/icons/inkscape.file.png
%%DATADIR%%/icons/inkscape.file.svg
%%DATADIR%%/icons/inkscape.svg
-%%DATADIR%%/icons/legacy_icons.svg
+%%DATADIR%%/icons/remove-color.png
+%%DATADIR%%/icons/remove-color.svg
%%DATADIR%%/icons/tango_icons.svg
%%DATADIR%%/icons/ticotico.jpg
%%DATADIR%%/keys/acd-canvas.xml
@@ -296,12 +448,14 @@ share/applications/inkscape.desktop
%%DATADIR%%/palettes/Hilite.gpl
%%DATADIR%%/palettes/Khaki.gpl
%%DATADIR%%/palettes/LaTeX-Beamer.gpl
+%%DATADIR%%/palettes/MATLAB-Jet-72.gpl
%%DATADIR%%/palettes/README
%%DATADIR%%/palettes/Reds.gpl
%%DATADIR%%/palettes/Royal.gpl
%%DATADIR%%/palettes/Tango-Palette.gpl
%%DATADIR%%/palettes/Topographic.gpl
%%DATADIR%%/palettes/Ubuntu.gpl
+%%DATADIR%%/palettes/echo-palette.gpl
%%DATADIR%%/palettes/inkscape.gpl
%%DATADIR%%/palettes/svg.gpl
%%DATADIR%%/palettes/webhex.gpl
@@ -309,16 +463,29 @@ share/applications/inkscape.desktop
%%DATADIR%%/palettes/windowsXP.gpl
%%DATADIR%%/patterns/README
%%DATADIR%%/patterns/patterns.svg
+%%DATADIR%%/patterns/patterns.svg.h
+%%DATADIR%%/screens/about.be.svg
%%DATADIR%%/screens/about.bg.svg
%%DATADIR%%/screens/about.br.svg
+%%DATADIR%%/screens/about.ca.svg
+%%DATADIR%%/screens/about.cs.svg
+%%DATADIR%%/screens/about.de.svg
+%%DATADIR%%/screens/about.es.svg
+%%DATADIR%%/screens/about.eu.svg
+%%DATADIR%%/screens/about.fi.svg
+%%DATADIR%%/screens/about.fr.svg
%%DATADIR%%/screens/about.gl.svg
+%%DATADIR%%/screens/about.hu.svg
%%DATADIR%%/screens/about.it.svg
+%%DATADIR%%/screens/about.nl.svg
+%%DATADIR%%/screens/about.pl.svg
%%DATADIR%%/screens/about.pt_BR.svg
%%DATADIR%%/screens/about.ru.svg
%%DATADIR%%/screens/about.sk.svg
%%DATADIR%%/screens/about.sl.svg
%%DATADIR%%/screens/about.sr.svg
%%DATADIR%%/screens/about.sr@latin.svg
+%%DATADIR%%/screens/about.uk.svg
%%DATADIR%%/screens/about.svg
%%DATADIR%%/templates/A4.svg
%%DATADIR%%/templates/A4_landscape.svg
@@ -334,6 +501,7 @@ share/applications/inkscape.desktop
%%DATADIR%%/templates/black_opaque.svg
%%DATADIR%%/templates/business_card_85x54mm.svg
%%DATADIR%%/templates/business_card_90x50mm.svg
+%%DATADIR%%/templates/default.be.svg
%%DATADIR%%/templates/default.ca.svg
%%DATADIR%%/templates/default.cs.svg
%%DATADIR%%/templates/default.de.svg
@@ -344,7 +512,9 @@ share/applications/inkscape.desktop
%%DATADIR%%/templates/default.fr.svg
%%DATADIR%%/templates/default.hu.svg
%%DATADIR%%/templates/default.it.svg
+%%DATADIR%%/templates/default.ja.svg
%%DATADIR%%/templates/default.lt.svg
+%%DATADIR%%/templates/default.nl.svg
%%DATADIR%%/templates/default.pl.svg
%%DATADIR%%/templates/default.pt_BR.svg
%%DATADIR%%/templates/default.sk.svg
@@ -369,20 +539,37 @@ share/applications/inkscape.desktop
%%DATADIR%%/templates/web_banner_728x90.svg
%%DATADIR%%/templates/white_opaque.svg
%%DATADIR%%/tutorials/README
+%%DATADIR%%/tutorials/edge3d.svg
%%DATADIR%%/tutorials/gpl-2.svg
%%DATADIR%%/tutorials/making_markers.svg
%%DATADIR%%/tutorials/oldguitar.jpg
+%%DATADIR%%/tutorials/potrace-ca.png
%%DATADIR%%/tutorials/potrace-de.png
+%%DATADIR%%/tutorials/potrace-en.png
+%%DATADIR%%/tutorials/potrace-es.png
+%%DATADIR%%/tutorials/potrace-eu.png
%%DATADIR%%/tutorials/potrace-fr.png
+%%DATADIR%%/tutorials/potrace-hu.png
+%%DATADIR%%/tutorials/potrace-ja.png
+%%DATADIR%%/tutorials/potrace-pl.png
+%%DATADIR%%/tutorials/potrace-pt_BR.png
%%DATADIR%%/tutorials/potrace-ru.png
+%%DATADIR%%/tutorials/potrace-sk.png
+%%DATADIR%%/tutorials/potrace-sl.png
+%%DATADIR%%/tutorials/potrace-vi.png
+%%DATADIR%%/tutorials/potrace-zh_CN.png
+%%DATADIR%%/tutorials/potrace-zh_TW.png
%%DATADIR%%/tutorials/potrace.png
%%DATADIR%%/tutorials/tutorial-advanced.ca.svg
%%DATADIR%%/tutorials/tutorial-advanced.cs.svg
%%DATADIR%%/tutorials/tutorial-advanced.de.svg
%%DATADIR%%/tutorials/tutorial-advanced.es.svg
+%%DATADIR%%/tutorials/tutorial-advanced.eu.svg
%%DATADIR%%/tutorials/tutorial-advanced.fr.svg
+%%DATADIR%%/tutorials/tutorial-advanced.hu.svg
%%DATADIR%%/tutorials/tutorial-advanced.it.svg
%%DATADIR%%/tutorials/tutorial-advanced.ja.svg
+%%DATADIR%%/tutorials/tutorial-advanced.pl.svg
%%DATADIR%%/tutorials/tutorial-advanced.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-advanced.ru.svg
%%DATADIR%%/tutorials/tutorial-advanced.sk.svg
@@ -390,16 +577,22 @@ share/applications/inkscape.desktop
%%DATADIR%%/tutorials/tutorial-advanced.svg
%%DATADIR%%/tutorials/tutorial-advanced.vi.svg
%%DATADIR%%/tutorials/tutorial-advanced.zh_CN.svg
+%%DATADIR%%/tutorials/tutorial-advanced.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-basic.bg.svg
%%DATADIR%%/tutorials/tutorial-basic.ca.svg
%%DATADIR%%/tutorials/tutorial-basic.cs.svg
%%DATADIR%%/tutorials/tutorial-basic.da.svg
%%DATADIR%%/tutorials/tutorial-basic.de.svg
+%%DATADIR%%/tutorials/tutorial-basic.eo.svg
%%DATADIR%%/tutorials/tutorial-basic.es.svg
+%%DATADIR%%/tutorials/tutorial-basic.eu.svg
%%DATADIR%%/tutorials/tutorial-basic.fr.svg
+%%DATADIR%%/tutorials/tutorial-basic.hu.svg
%%DATADIR%%/tutorials/tutorial-basic.it.svg
%%DATADIR%%/tutorials/tutorial-basic.ja.svg
+%%DATADIR%%/tutorials/tutorial-basic.nl.svg
%%DATADIR%%/tutorials/tutorial-basic.nn.svg
+%%DATADIR%%/tutorials/tutorial-basic.pl.svg
%%DATADIR%%/tutorials/tutorial-basic.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-basic.ru.svg
%%DATADIR%%/tutorials/tutorial-basic.sk.svg
@@ -408,31 +601,54 @@ share/applications/inkscape.desktop
%%DATADIR%%/tutorials/tutorial-basic.tr.svg
%%DATADIR%%/tutorials/tutorial-basic.vi.svg
%%DATADIR%%/tutorials/tutorial-basic.zh_CN.svg
+%%DATADIR%%/tutorials/tutorial-basic.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.ca.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.cs.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.de.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.es.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.eu.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.fr.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.hu.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.ja.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.pl.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.ru.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.sk.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.sl.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.svg
%%DATADIR%%/tutorials/tutorial-calligraphy.vi.svg
+%%DATADIR%%/tutorials/tutorial-calligraphy.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-elements.ca.svg
%%DATADIR%%/tutorials/tutorial-elements.de.svg
%%DATADIR%%/tutorials/tutorial-elements.es.svg
+%%DATADIR%%/tutorials/tutorial-elements.eu.svg
%%DATADIR%%/tutorials/tutorial-elements.fr.svg
+%%DATADIR%%/tutorials/tutorial-elements.hu.svg
+%%DATADIR%%/tutorials/tutorial-elements.ja.svg
+%%DATADIR%%/tutorials/tutorial-elements.pl.svg
%%DATADIR%%/tutorials/tutorial-elements.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-elements.ru.svg
+%%DATADIR%%/tutorials/tutorial-elements.sk.svg
%%DATADIR%%/tutorials/tutorial-elements.sl.svg
%%DATADIR%%/tutorials/tutorial-elements.svg
+%%DATADIR%%/tutorials/tutorial-elements.zh_TW.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.de.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.fr.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.hu.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.pl.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.sl.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.svg
+%%DATADIR%%/tutorials/tutorial-interpolate.vi.svg
%%DATADIR%%/tutorials/tutorial-shapes.ca.svg
%%DATADIR%%/tutorials/tutorial-shapes.cs.svg
%%DATADIR%%/tutorials/tutorial-shapes.de.svg
%%DATADIR%%/tutorials/tutorial-shapes.es.svg
+%%DATADIR%%/tutorials/tutorial-shapes.eu.svg
%%DATADIR%%/tutorials/tutorial-shapes.fr.svg
+%%DATADIR%%/tutorials/tutorial-shapes.hu.svg
%%DATADIR%%/tutorials/tutorial-shapes.it.svg
%%DATADIR%%/tutorials/tutorial-shapes.ja.svg
+%%DATADIR%%/tutorials/tutorial-shapes.pl.svg
%%DATADIR%%/tutorials/tutorial-shapes.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-shapes.ru.svg
%%DATADIR%%/tutorials/tutorial-shapes.sk.svg
@@ -440,25 +656,38 @@ share/applications/inkscape.desktop
%%DATADIR%%/tutorials/tutorial-shapes.svg
%%DATADIR%%/tutorials/tutorial-shapes.vi.svg
%%DATADIR%%/tutorials/tutorial-shapes.zh_CN.svg
+%%DATADIR%%/tutorials/tutorial-shapes.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-tips.ca.svg
%%DATADIR%%/tutorials/tutorial-tips.de.svg
%%DATADIR%%/tutorials/tutorial-tips.es.svg
+%%DATADIR%%/tutorials/tutorial-tips.eu.svg
%%DATADIR%%/tutorials/tutorial-tips.fr.svg
+%%DATADIR%%/tutorials/tutorial-tips.hu.svg
%%DATADIR%%/tutorials/tutorial-tips.it.svg
+%%DATADIR%%/tutorials/tutorial-tips.ja.svg
+%%DATADIR%%/tutorials/tutorial-tips.pl.svg
%%DATADIR%%/tutorials/tutorial-tips.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-tips.ru.svg
%%DATADIR%%/tutorials/tutorial-tips.sk.svg
%%DATADIR%%/tutorials/tutorial-tips.sl.svg
%%DATADIR%%/tutorials/tutorial-tips.svg
+%%DATADIR%%/tutorials/tutorial-tips.vi.svg
+%%DATADIR%%/tutorials/tutorial-tips.zh_TW.svg
%%DATADIR%%/tutorials/tutorial-tracing.ca.svg
%%DATADIR%%/tutorials/tutorial-tracing.de.svg
%%DATADIR%%/tutorials/tutorial-tracing.es.svg
+%%DATADIR%%/tutorials/tutorial-tracing.eu.svg
%%DATADIR%%/tutorials/tutorial-tracing.fr.svg
+%%DATADIR%%/tutorials/tutorial-tracing.hu.svg
+%%DATADIR%%/tutorials/tutorial-tracing.ja.svg
+%%DATADIR%%/tutorials/tutorial-tracing.pl.svg
%%DATADIR%%/tutorials/tutorial-tracing.pt_BR.svg
%%DATADIR%%/tutorials/tutorial-tracing.ru.svg
+%%DATADIR%%/tutorials/tutorial-tracing.sk.svg
%%DATADIR%%/tutorials/tutorial-tracing.sl.svg
%%DATADIR%%/tutorials/tutorial-tracing.svg
%%DATADIR%%/tutorials/tutorial-tracing.vi.svg
+%%DATADIR%%/tutorials/tutorial-tracing.zh_TW.svg
%%DATADIR%%/tutorials/tux.png
%%DATADIR%%/ui/keybindings.rc
%%DATADIR%%/ui/menus-bars.xml
@@ -495,6 +724,7 @@ share/locale/gl/LC_MESSAGES/inkscape.mo
share/locale/he/LC_MESSAGES/inkscape.mo
share/locale/hr/LC_MESSAGES/inkscape.mo
share/locale/hu/LC_MESSAGES/inkscape.mo
+share/locale/hy/LC_MESSAGES/inkscape.mo
share/locale/id/LC_MESSAGES/inkscape.mo
share/locale/it/LC_MESSAGES/inkscape.mo
share/locale/ja/LC_MESSAGES/inkscape.mo
@@ -538,7 +768,10 @@ share/pixmaps/inkscape.png
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/gradients
@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/filters
@dirrm %%DATADIR%%/extensions/xaml2svg
+@dirrm %%DATADIR%%/extensions/alphabet_soup
+@dirrm %%DATADIR%%/extensions/Poly3DObjects
@dirrm %%DATADIR%%/extensions/Barcode
@dirrm %%DATADIR%%/extensions
@dirrm %%DATADIR%%/examples
@@ -555,6 +788,8 @@ share/pixmaps/inkscape.png
@dirrmtry share/locale/rw
@dirrmtry share/locale/km/LC_MESSAGES
@dirrmtry share/locale/km
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrmtry share/locale/en_US@piglatin/LC_MESSAGES
@dirrmtry share/locale/en_US@piglatin
@dirrmtry share/locale/dz/LC_MESSAGES
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
new file mode 100644
index 000000000000..a0b786e28fc4
--- /dev/null
+++ b/graphics/libchamplain/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for: libchamplain
+# Date Created: 04 Aug 2009
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/libchamplain/Makefile,v 1.11 2009/10/27 11:50:35 kwm Exp $
+#
+
+PORTNAME= libchamplain
+PORTVERSION= 0.4.2
+CATEGORIES= graphics
+MASTER_SITES= GNOME
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A C library aimed to provide a Gtk+ widget to display rasterized maps and markers
+
+BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
+ clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
+ soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup
+
+USE_BZIP2= yes
+USE_GNOME= pkgconfig gtk20 gnomehack ltverhack:1
+USE_AUTOTOOLS= libtool:22
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+# python bindings and mono need to be ported to clutter 1.0 first.
+# And clutter 1.0 versions of py-clutter and clutter-sharp need to
+# get released upstream too.
+CONFIGURE_ARGS+=--enable-managed=no
+
+PLIST_SUB= VERSION=${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
+.if !defined(WITHOUT_PYTHON)
+USE_PYTHON= yes
+PYCLUTTER_GTK= ${LOCALBASE}/libdata/pkgconfig/pyclutter-gtk-0.9.pc
+BUILD_DEPENDS+= ${PYCLUTTER_GTK}:${PORTSDIR}/graphics/py-clutter-gtk
+RUN_DEPENDS+= ${PYCLUTTER_GTK}:${PORTSDIR}/graphics/py-clutter-gtk
+CONFIGURE_ARGS+= --enable-python=yes
+PLIST_SUB+= PYTHON=""
+.else
+CONFIGURE_ARGS+= --enable-python=no
+PLIST_SUB+= PYTHON="@comment "
+.endif
+
+.pre-everything:
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "Specify WITHOUT_PYTHON=yes to disable python bindings"
+ @${ECHO_CMD} ""
+
+.include <bsd.port.mk>
diff --git a/graphics/libchamplain/distinfo b/graphics/libchamplain/distinfo
new file mode 100644
index 000000000000..0dc58e456827
--- /dev/null
+++ b/graphics/libchamplain/distinfo
@@ -0,0 +1,3 @@
+MD5 (libchamplain-0.4.2.tar.bz2) = 20bd6c479ba4ba17d413a689d82923d9
+SHA256 (libchamplain-0.4.2.tar.bz2) = 2b1f8fc49e306a3a6da3ef3fea8630c76cecdffbfa53c251e7e15af8f4b8d77f
+SIZE (libchamplain-0.4.2.tar.bz2) = 519743
diff --git a/graphics/libchamplain/pkg-descr b/graphics/libchamplain/pkg-descr
new file mode 100644
index 000000000000..c93152a7d963
--- /dev/null
+++ b/graphics/libchamplain/pkg-descr
@@ -0,0 +1,10 @@
+Libchamplain is a C library providing a ClutterActor to display maps. It also
+provides a Gtk+ widget to display maps in Gtk+ applications. Mono, Python and
+Perl bindings are available.
+
+It supports numerous free map sources such as OpenStreetMap [1],
+OpenAerialMap [2] and Maps for free [3].
+[1] http://www.openstreetmap.org/ [2] http://www.openaerialmap.org/
+[3] http://www.maps-for-free.com/
+
+WWW: http://projects.gnome.org/libchamplain/
diff --git a/graphics/libchamplain/pkg-plist b/graphics/libchamplain/pkg-plist
new file mode 100644
index 000000000000..1ecbf217c6b7
--- /dev/null
+++ b/graphics/libchamplain/pkg-plist
@@ -0,0 +1,93 @@
+include/libchamplain-%%VERSION%%/champlain/champlain-base-marker.h
+include/libchamplain-%%VERSION%%/champlain/champlain-cache.h
+include/libchamplain-%%VERSION%%/champlain/champlain-defines.h
+include/libchamplain-%%VERSION%%/champlain/champlain-enum-types.h
+include/libchamplain-%%VERSION%%/champlain/champlain-layer.h
+include/libchamplain-%%VERSION%%/champlain/champlain-map-source-desc.h
+include/libchamplain-%%VERSION%%/champlain/champlain-map-source-factory.h
+include/libchamplain-%%VERSION%%/champlain/champlain-map-source.h
+include/libchamplain-%%VERSION%%/champlain/champlain-marker.h
+include/libchamplain-%%VERSION%%/champlain/champlain-network-map-source.h
+include/libchamplain-%%VERSION%%/champlain/champlain-point.h
+include/libchamplain-%%VERSION%%/champlain/champlain-polygon.h
+include/libchamplain-%%VERSION%%/champlain/champlain-selection-layer.h
+include/libchamplain-%%VERSION%%/champlain/champlain-tile.h
+include/libchamplain-%%VERSION%%/champlain/champlain-version.h
+include/libchamplain-%%VERSION%%/champlain/champlain-view.h
+include/libchamplain-%%VERSION%%/champlain/champlain-zoom-level.h
+include/libchamplain-%%VERSION%%/champlain/champlain.h
+include/libchamplain-gtk-%%VERSION%%/champlain-gtk/champlain-gtk.h
+include/libchamplain-gtk-%%VERSION%%/champlain-gtk/gtk-champlain-embed.h
+lib/girepository-1.0/Champlain-%%VERSION%%.typelib
+lib/girepository-1.0/GtkChamplain-%%VERSION%%.typelib
+lib/libchamplain-%%VERSION%%.a
+lib/libchamplain-%%VERSION%%.la
+lib/libchamplain-%%VERSION%%.so
+lib/libchamplain-%%VERSION%%.so.1
+lib/libchamplain-gtk-%%VERSION%%.a
+lib/libchamplain-gtk-%%VERSION%%.la
+lib/libchamplain-gtk-%%VERSION%%.so
+lib/libchamplain-gtk-%%VERSION%%.so.1
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlain.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/champlaingtk.so
+libdata/pkgconfig/champlain-%%VERSION%%.pc
+libdata/pkgconfig/champlain-gtk-%%VERSION%%.pc
+share/gir-1.0/Champlain-%%VERSION%%.gir
+share/gir-1.0/GtkChamplain-%%VERSION%%.gir
+share/gtk-doc/html/libchamplain-gtk/GtkChamplainEmbed.html
+share/gtk-doc/html/libchamplain-gtk/ch01.html
+share/gtk-doc/html/libchamplain-gtk/home.png
+share/gtk-doc/html/libchamplain-gtk/index.html
+share/gtk-doc/html/libchamplain-gtk/index.sgml
+share/gtk-doc/html/libchamplain-gtk/left.png
+share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp
+share/gtk-doc/html/libchamplain-gtk/libchamplain-gtk.devhelp2
+share/gtk-doc/html/libchamplain-gtk/right.png
+share/gtk-doc/html/libchamplain-gtk/style.css
+share/gtk-doc/html/libchamplain-gtk/up.png
+share/gtk-doc/html/libchamplain/ChamplainBaseMarker.html
+share/gtk-doc/html/libchamplain/ChamplainCache.html
+share/gtk-doc/html/libchamplain/ChamplainLayer.html
+share/gtk-doc/html/libchamplain/ChamplainMapSource.html
+share/gtk-doc/html/libchamplain/ChamplainMapSourceFactory.html
+share/gtk-doc/html/libchamplain/ChamplainMarker.html
+share/gtk-doc/html/libchamplain/ChamplainNetworkMapSource.html
+share/gtk-doc/html/libchamplain/ChamplainPolygon.html
+share/gtk-doc/html/libchamplain/ChamplainSelectionLayer.html
+share/gtk-doc/html/libchamplain/ChamplainTile.html
+share/gtk-doc/html/libchamplain/ChamplainView.html
+share/gtk-doc/html/libchamplain/ch01.html
+share/gtk-doc/html/libchamplain/ch02.html
+share/gtk-doc/html/libchamplain/ch03.html
+share/gtk-doc/html/libchamplain/home.png
+share/gtk-doc/html/libchamplain/index.html
+share/gtk-doc/html/libchamplain/index.sgml
+share/gtk-doc/html/libchamplain/ix01.html
+share/gtk-doc/html/libchamplain/ix02.html
+share/gtk-doc/html/libchamplain/ix03.html
+share/gtk-doc/html/libchamplain/ix04.html
+share/gtk-doc/html/libchamplain/ix05.html
+share/gtk-doc/html/libchamplain/ix06.html
+share/gtk-doc/html/libchamplain/ix07.html
+share/gtk-doc/html/libchamplain/ix08.html
+share/gtk-doc/html/libchamplain/left.png
+share/gtk-doc/html/libchamplain/libchamplain-Champlain.html
+share/gtk-doc/html/libchamplain/libchamplain-ChamplainPoint.html
+share/gtk-doc/html/libchamplain/libchamplain-ChamplainVersion.html
+share/gtk-doc/html/libchamplain/libchamplain.devhelp
+share/gtk-doc/html/libchamplain/libchamplain.devhelp2
+share/gtk-doc/html/libchamplain/right.png
+share/gtk-doc/html/libchamplain/style.css
+share/gtk-doc/html/libchamplain/up.png
+@dirrm share/gtk-doc/html/libchamplain
+@dirrm share/gtk-doc/html/libchamplain-gtk
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrm include/libchamplain-gtk-%%VERSION%%/champlain-gtk
+@dirrm include/libchamplain-gtk-%%VERSION%%
+@dirrm include/libchamplain-%%VERSION%%/champlain
+@dirrm include/libchamplain-%%VERSION%%
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index e911912734ba..a5e5611a34f7 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,7 +3,7 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/graphics/librsvg2/Makefile,v 1.5 2009/04/20 05:55:53 marcus Exp $
+# $MCom: ports/graphics/librsvg2/Makefile,v 1.128 2009/11/28 05:59:01 mezz Exp $
#
PORTNAME= librsvg2
@@ -47,10 +47,8 @@ OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" on
.if defined(WITH_MOZILLA_PLUGIN)
USE_GECKO= libxul seamonkey
-USE_WEBPLUGINS= gecko*
+USE_WEBPLUGINS= gecko19
WEBPLUGINS_FILES=libmozsvgdec.so
-.include "${PORTSDIR}/Mk/bsd.gecko.mk"
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
CONFIGURE_ENV+= MOZILLA_CONFIG=no
CONFIGURE_ARGS+=--enable-mozilla-plugin=yes
@@ -63,7 +61,7 @@ PLIST_SUB+= PLUGIN="@comment "
post-patch:
.if defined(WITH_MOZILLA_PLUGIN)
-.if ${GECKO:Mlibxul}==""
+.if "${GECKO:Mlibxul}"
@${REINPLACE_CMD} -e 's|mozilla-plugin|${GECKO}-plugin|g' \
${WRKSRC}/configure
.endif
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index d9864d6a9457..1e0a5dcb4442 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nip2
PORTVERSION= 7.14.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
@@ -39,5 +39,7 @@ MAN1= nip2.1
post-patch:
${REINPLACE_CMD} -e 's, malkovich,,' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|n_bytes|x_n_bytes|g' -e 's|text_size|x_text_size|g' \
+ ${WRKSRC}/src/gtkitementry.c
.include <bsd.port.mk>
diff --git a/graphics/p5-clutter/Makefile b/graphics/p5-clutter/Makefile
index a5c106d1a573..9df24a3b405e 100644
--- a/graphics/p5-clutter/Makefile
+++ b/graphics/p5-clutter/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= clutter
-PORTVERSION= 0.8.2.0
-PORTREVISION= 1
+PORTVERSION= 1.0.1
CATEGORIES= graphics perl5
-MASTER_SITES= http://www.clutter-project.org/sources/clutter-perl/0.8/
+MASTER_SITES= http://www.clutter-project.org/sources/clutter-perl/${PORTVERSION:R}/
PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-perl-${PORTVERSION}
@@ -18,40 +17,45 @@ COMMENT= Perl bindings to the Clutter OpenGL canvas
BUILD_DEPENDS= ${SITE_PERL}/ExtUtils/Depends.pm:${PORTSDIR}/devel/p5-ExtUtils-Depends \
p5-ExtUtils-PkgConfig>=1.03:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
- p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
- ${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo \
- p5-GStreamer>=0.09:${PORTSDIR}/multimedia/p5-GStreamer
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter \
- clutter-gst-0.8:${PORTSDIR}/multimedia/clutter-gst \
- clutter-cairo-0.8:${PORTSDIR}/graphics/clutter-cairo \
- clutter-gtk-0.8:${PORTSDIR}/graphics/clutter-gtk
+ ${SITE_PERL}/${PERL_ARCH}/Pango.pm:${PORTSDIR}/x11-toolkits/p5-Pango \
+ ${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2 \
+ ${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+RUN_DEPENDS= ${SITE_PERL}/ExtUtils/Depends.pm:${PORTSDIR}/devel/p5-ExtUtils-Depends \
+ p5-ExtUtils-PkgConfig>=1.03:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
+ ${SITE_PERL}/${PERL_ARCH}/Pango.pm:${PORTSDIR}/x11-toolkits/p5-Pango \
+ ${SITE_PERL}/${PERL_ARCH}/Glib.pm:${PORTSDIR}/devel/p5-Glib2 \
+ ${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo
+USE_BZIP2= yes
PERL_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/Clutter-0.820
+WRKSRC= ${WRKDIR}/${PORTNAME}-perl-${PORTVERSION}
MAN3= Clutter.3 Clutter::Actor.3 Clutter::ActorBox.3 Clutter::Alpha.3 \
- Clutter::Angle.3 Clutter::Backend.3 Clutter::Behaviour.3 \
- Clutter::Behaviour::Bspline.3 Clutter::Behaviour::Depth.3 \
- Clutter::Behaviour::Ellipse.3 Clutter::Behaviour::Opacity.3 \
- Clutter::Behaviour::Path.3 Clutter::Behaviour::Rotate.3 \
- Clutter::Behaviour::Scale.3 Clutter::ChildMeta.3 \
- Clutter::Cogl.3 Clutter::Cogl::Handle.3 \
- Clutter::Cogl::Texture.3 Clutter::Color.3 \
- Clutter::Container.3 Clutter::Container::ForeachFunc.3 \
- Clutter::Cookbook.3 Clutter::Effect.3 Clutter::Entry.3 \
- Clutter::Event.3 Clutter::Event::Button.3 Clutter::Event::Crossing.3 \
- Clutter::Event::Key.3 Clutter::Event::Motion.3 Clutter::Event::Scroll.3 \
- Clutter::Event::StageState.3 Clutter::Fixed.3 Clutter::Geometry.3 \
- Clutter::Group.3 Clutter::Gst.3 Clutter::Gst::Audio.3 \
- Clutter::Gst::VideoSink.3 Clutter::Gst::VideoTexture.3 Clutter::Gtk.3 \
- Clutter::Keysyms.3 Clutter::Knot.3 Clutter::Label.3 Clutter::ListModel.3 \
+ Clutter::Animation.3 Clutter::Backend.3 Clutter::Behaviour.3 \
+ Clutter::Behaviour::Depth.3 Clutter::Behaviour::Ellipse.3 \
+ Clutter::Behaviour::Opacity.3 Clutter::Behaviour::Path.3 \
+ Clutter::Behaviour::Rotate.3 Clutter::Behaviour::Scale.3 \
+ Clutter::BindingPool.3 Clutter::Cairo.3 Clutter::CairoTexture.3 \
+ Clutter::ChildMeta.3 Clutter::Clone.3 Clutter::Cogl.3 \
+ Clutter::Cogl::Color.3 Clutter::Cogl::Handle.3 \
+ Clutter::Cogl::Material.3 Clutter::Cogl::MaterialLayer.3 \
+ Clutter::Cogl::Matrix.3 Clutter::Cogl::Pango.3 Clutter::Cogl::Path.3 \
+ Clutter::Cogl::Program.3 Clutter::Cogl::Shader.3 \
+ Clutter::Cogl::Texture.3 Clutter::Color.3 Clutter::Container.3 \
+ Clutter::Container::ForeachFunc.3 Clutter::Cookbook.3 Clutter::Event.3 \
+ Clutter::Event::Button.3 Clutter::Event::Crossing.3 \
+ Clutter::Event::Key.3 Clutter::Event::Motion.3 \
+ Clutter::Event::Scroll.3 Clutter::Event::StageState.3 \
+ Clutter::Geometry.3 Clutter::Group.3 Clutter::Interval.3 \
+ Clutter::Keysyms.3 Clutter::Knot.3 Clutter::ListModel.3 \
Clutter::Media.3 Clutter::Model.3 Clutter::Model::Iter.3 \
- Clutter::ParamSpec.3 Clutter::Rectangle.3 Clutter::Score.3 \
- Clutter::Script.3 Clutter::Shader.3 Clutter::Stage.3 Clutter::StageManager.3 \
- Clutter::Texture.3 Clutter::Texture::Cairo.3 Clutter::Texture::Clone.3 \
- Clutter::Threads.3 Clutter::Timeline.3 Clutter::Units.3 \
- Clutter::Vertex.3 Clutter::index.3 Clutter::main.3 Clutter::version.3 \
- Gtk2::ClutterEmbed.3 Gtk2::ClutterUtil.3 Gtk2::ClutterTexture.3
+ Clutter::ParamSpec.3 Clutter::Path.3 Clutter::Path::Node.3 \
+ Clutter::Rectangle.3 Clutter::Score.3 Clutter::Script.3 \
+ Clutter::Shader.3 Clutter::Stage.3 Clutter::StageManager.3 \
+ Clutter::Text.3 Clutter::Texture.3 Clutter::Threads.3 \
+ Clutter::Timeline.3 Clutter::Units.3 Clutter::Vertex.3 \
+ Clutter::index.3 Clutter::main.3 Clutter::version.3
.include <bsd.port.mk>
diff --git a/graphics/p5-clutter/distinfo b/graphics/p5-clutter/distinfo
index 7a3fa26b878a..1f956d0171a7 100644
--- a/graphics/p5-clutter/distinfo
+++ b/graphics/p5-clutter/distinfo
@@ -1,3 +1,3 @@
-MD5 (clutter-perl-0.8.2.0.tar.gz) = e424a19e000d42b886046bd889bd39f0
-SHA256 (clutter-perl-0.8.2.0.tar.gz) = 1eff9fb0c18441690ae83533bccc44f4fa5c24e01bb572fd996a9bf7ece29be4
-SIZE (clutter-perl-0.8.2.0.tar.gz) = 90861
+MD5 (clutter-perl-1.0.1.tar.bz2) = 0dbc0d830e1290deabe52c0133ad7059
+SHA256 (clutter-perl-1.0.1.tar.bz2) = 30f23665dde4e438bb98f2bf7fa3ff927f70471c3c34c801be911dcbd9ee9368
+SIZE (clutter-perl-1.0.1.tar.bz2) = 86160
diff --git a/graphics/p5-clutter/pkg-plist b/graphics/p5-clutter/pkg-plist
index e88b97a1908b..5e9cf51c9f17 100644
--- a/graphics/p5-clutter/pkg-plist
+++ b/graphics/p5-clutter/pkg-plist
@@ -2,26 +2,35 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Actor.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/ActorBox.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Alpha.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Angle.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Animation.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Backend.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Bspline.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Depth.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Ellipse.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Opacity.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Path.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Rotate.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Behaviour/Scale.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/BindingPool.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cairo.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/CairoTexture.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/ChildMeta.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Clone.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Color.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Handle.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Material.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/MaterialLayer.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Matrix.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Pango.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Path.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Program.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Shader.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl/Texture.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Color.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Container.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Container/ForeachFunc.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cookbook.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Effect.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Entry.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event/Button.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event/Crossing.pod
@@ -29,27 +38,24 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event/Motion.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event/Scroll.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event/StageState.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Fixed.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Geometry.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Group.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gst.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gst/Audio.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gst/VideoSink.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gst/VideoTexture.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gtk.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/Files.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutter-perl-autogen.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutter-perl.h
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutter-perl.typemap
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutter.typemap
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutterperl-autogen.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutterperl.h
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/clutterperl.typemap
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/doctypes
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Interval.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Keysyms.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Knot.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Label.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/ListModel.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Media.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Model.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Model/Iter.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/ParamSpec.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Path.pod
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Path/Node.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Rectangle.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Score.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Script.pod
@@ -57,9 +63,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Stage.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/StageManager.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/TestHelper.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Text.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Texture.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Texture/Cairo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Texture/Clone.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Threads.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Timeline.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Units.pod
@@ -67,18 +72,13 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/index.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/main.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Clutter/version.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ClutterEmbed.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ClutterTexture.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/ClutterUtil.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clutter/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clutter/Clutter.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clutter/Clutter.so
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Clutter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Texture
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Path/
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Model
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Gst
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Install/
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Event
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Container
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Clutter/Cogl
diff --git a/graphics/poppler-data/Makefile b/graphics/poppler-data/Makefile
index b7865a0c6ae0..ee3a3e940264 100644
--- a/graphics/poppler-data/Makefile
+++ b/graphics/poppler-data/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= poppler-data
-PORTVERSION= 0.2.1
+PORTVERSION= 0.3.1
CATEGORIES= graphics
MASTER_SITES= http://poppler.freedesktop.org/
diff --git a/graphics/poppler-data/distinfo b/graphics/poppler-data/distinfo
index af3209ad57a6..3a4f70deef05 100644
--- a/graphics/poppler-data/distinfo
+++ b/graphics/poppler-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-data-0.2.1.tar.gz) = bca78b8786746c7b48b324283992d658
-SHA256 (poppler-data-0.2.1.tar.gz) = 890dbadf44aee07999c050fcbe0c4ea8b32fba0e8b573c439dd7de8476a1a660
-SIZE (poppler-data-0.2.1.tar.gz) = 4067562
+MD5 (poppler-data-0.3.1.tar.gz) = 1222399ddebf74482e10be815c8df035
+SHA256 (poppler-data-0.3.1.tar.gz) = b5e4c0671156e540462d0095fd0ba8302602314120e153c0246080110d9f0ff3
+SIZE (poppler-data-0.3.1.tar.gz) = 2618617
diff --git a/graphics/poppler-data/pkg-plist b/graphics/poppler-data/pkg-plist
index 7b6cf2768797..9e874e1c8a90 100644
--- a/graphics/poppler-data/pkg-plist
+++ b/graphics/poppler-data/pkg-plist
@@ -4,36 +4,20 @@ share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-2
share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-3
share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-4
share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-5
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-B5pc
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-ETenms-B5
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-CID
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Host
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-H-Mac
-share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-UCS2
+share/poppler/cMap/Adobe-CNS1/Adobe-CNS1-6
share/poppler/cMap/Adobe-CNS1/B5-H
share/poppler/cMap/Adobe-CNS1/B5-V
share/poppler/cMap/Adobe-CNS1/B5pc-H
-share/poppler/cMap/Adobe-CNS1/B5pc-UCS2
-share/poppler/cMap/Adobe-CNS1/B5pc-UCS2C
share/poppler/cMap/Adobe-CNS1/B5pc-V
share/poppler/cMap/Adobe-CNS1/CNS-EUC-H
share/poppler/cMap/Adobe-CNS1/CNS-EUC-V
-share/poppler/cMap/Adobe-CNS1/CNS01-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS02-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS03-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS04-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS05-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS06-RKSJ-H
-share/poppler/cMap/Adobe-CNS1/CNS07-RKSJ-H
share/poppler/cMap/Adobe-CNS1/CNS1-H
share/poppler/cMap/Adobe-CNS1/CNS1-V
-share/poppler/cMap/Adobe-CNS1/CNS15-RKSJ-H
share/poppler/cMap/Adobe-CNS1/CNS2-H
share/poppler/cMap/Adobe-CNS1/CNS2-V
share/poppler/cMap/Adobe-CNS1/ETHK-B5-H
share/poppler/cMap/Adobe-CNS1/ETHK-B5-V
share/poppler/cMap/Adobe-CNS1/ETen-B5-H
-share/poppler/cMap/Adobe-CNS1/ETen-B5-UCS2
share/poppler/cMap/Adobe-CNS1/ETen-B5-V
share/poppler/cMap/Adobe-CNS1/ETenms-B5-H
share/poppler/cMap/Adobe-CNS1/ETenms-B5-V
@@ -49,8 +33,6 @@ share/poppler/cMap/Adobe-CNS1/HKm471-B5-H
share/poppler/cMap/Adobe-CNS1/HKm471-B5-V
share/poppler/cMap/Adobe-CNS1/HKscs-B5-H
share/poppler/cMap/Adobe-CNS1/HKscs-B5-V
-share/poppler/cMap/Adobe-CNS1/UCS2-B5pc
-share/poppler/cMap/Adobe-CNS1/UCS2-ETen-B5
share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-H
share/poppler/cMap/Adobe-CNS1/UniCNS-UCS2-V
share/poppler/cMap/Adobe-CNS1/UniCNS-UTF16-H
@@ -65,19 +47,11 @@ share/poppler/cMap/Adobe-GB1/Adobe-GB1-2
share/poppler/cMap/Adobe-GB1/Adobe-GB1-3
share/poppler/cMap/Adobe-GB1/Adobe-GB1-4
share/poppler/cMap/Adobe-GB1/Adobe-GB1-5
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBK-EUC
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-GBpc-EUC
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-CID
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Host
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-H-Mac
-share/poppler/cMap/Adobe-GB1/Adobe-GB1-UCS2
share/poppler/cMap/Adobe-GB1/GB-EUC-H
share/poppler/cMap/Adobe-GB1/GB-EUC-V
share/poppler/cMap/Adobe-GB1/GB-H
-share/poppler/cMap/Adobe-GB1/GB-RKSJ-H
share/poppler/cMap/Adobe-GB1/GB-V
share/poppler/cMap/Adobe-GB1/GBK-EUC-H
-share/poppler/cMap/Adobe-GB1/GBK-EUC-UCS2
share/poppler/cMap/Adobe-GB1/GBK-EUC-V
share/poppler/cMap/Adobe-GB1/GBK2K-H
share/poppler/cMap/Adobe-GB1/GBK2K-V
@@ -86,16 +60,11 @@ share/poppler/cMap/Adobe-GB1/GBKp-EUC-V
share/poppler/cMap/Adobe-GB1/GBT-EUC-H
share/poppler/cMap/Adobe-GB1/GBT-EUC-V
share/poppler/cMap/Adobe-GB1/GBT-H
-share/poppler/cMap/Adobe-GB1/GBT-RKSJ-H
share/poppler/cMap/Adobe-GB1/GBT-V
share/poppler/cMap/Adobe-GB1/GBTpc-EUC-H
share/poppler/cMap/Adobe-GB1/GBTpc-EUC-V
share/poppler/cMap/Adobe-GB1/GBpc-EUC-H
-share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2
-share/poppler/cMap/Adobe-GB1/GBpc-EUC-UCS2C
share/poppler/cMap/Adobe-GB1/GBpc-EUC-V
-share/poppler/cMap/Adobe-GB1/UCS2-GBK-EUC
-share/poppler/cMap/Adobe-GB1/UCS2-GBpc-EUC
share/poppler/cMap/Adobe-GB1/UniGB-UCS2-H
share/poppler/cMap/Adobe-GB1/UniGB-UCS2-V
share/poppler/cMap/Adobe-GB1/UniGB-UTF16-H
@@ -104,7 +73,6 @@ share/poppler/cMap/Adobe-GB1/UniGB-UTF32-H
share/poppler/cMap/Adobe-GB1/UniGB-UTF32-V
share/poppler/cMap/Adobe-GB1/UniGB-UTF8-H
share/poppler/cMap/Adobe-GB1/UniGB-UTF8-V
-share/poppler/cMap/Adobe-HongKong1/HK-RKSJ-H
share/poppler/cMap/Adobe-Japan1/78-EUC-H
share/poppler/cMap/Adobe-Japan1/78-EUC-V
share/poppler/cMap/Adobe-Japan1/78-H
@@ -115,13 +83,10 @@ share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-H
share/poppler/cMap/Adobe-Japan1/78ms-RKSJ-V
share/poppler/cMap/Adobe-Japan1/83pv-RKSJ-H
share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-H
-share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-UCS2
share/poppler/cMap/Adobe-Japan1/90ms-RKSJ-V
share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-H
share/poppler/cMap/Adobe-Japan1/90msp-RKSJ-V
share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-H
-share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2
-share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-UCS2C
share/poppler/cMap/Adobe-Japan1/90pv-RKSJ-V
share/poppler/cMap/Adobe-Japan1/Add-H
share/poppler/cMap/Adobe-Japan1/Add-RKSJ-H
@@ -134,14 +99,6 @@ share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-3
share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-4
share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-5
share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-6
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90ms-RKSJ
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-90pv-RKSJ
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-CID
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Host
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-H-Mac
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-H
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-PS-V
-share/poppler/cMap/Adobe-Japan1/Adobe-Japan1-UCS2
share/poppler/cMap/Adobe-Japan1/EUC-H
share/poppler/cMap/Adobe-Japan1/EUC-V
share/poppler/cMap/Adobe-Japan1/Ext-H
@@ -154,7 +111,6 @@ share/poppler/cMap/Adobe-Japan1/Hiragana
share/poppler/cMap/Adobe-Japan1/Hojo-EUC-H
share/poppler/cMap/Adobe-Japan1/Hojo-EUC-V
share/poppler/cMap/Adobe-Japan1/Hojo-H
-share/poppler/cMap/Adobe-Japan1/Hojo-RKSJ-H
share/poppler/cMap/Adobe-Japan1/Hojo-V
share/poppler/cMap/Adobe-Japan1/Katakana
share/poppler/cMap/Adobe-Japan1/NWP-H
@@ -162,8 +118,6 @@ share/poppler/cMap/Adobe-Japan1/NWP-V
share/poppler/cMap/Adobe-Japan1/RKSJ-H
share/poppler/cMap/Adobe-Japan1/RKSJ-V
share/poppler/cMap/Adobe-Japan1/Roman
-share/poppler/cMap/Adobe-Japan1/UCS2-90ms-RKSJ
-share/poppler/cMap/Adobe-Japan1/UCS2-90pv-RKSJ
share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-H
share/poppler/cMap/Adobe-Japan1/UniHojo-UCS2-V
share/poppler/cMap/Adobe-Japan1/UniHojo-UTF16-H
@@ -201,31 +155,18 @@ share/poppler/cMap/Adobe-Japan2/Adobe-Japan2-0
share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-0
share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-1
share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-2
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-CID
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Host
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-H-Mac
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCms-UHC
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-KSCpc-EUC
-share/poppler/cMap/Adobe-Korea1/Adobe-Korea1-UCS2
share/poppler/cMap/Adobe-Korea1/KSC-EUC-H
share/poppler/cMap/Adobe-Korea1/KSC-EUC-V
share/poppler/cMap/Adobe-Korea1/KSC-H
share/poppler/cMap/Adobe-Korea1/KSC-Johab-H
share/poppler/cMap/Adobe-Korea1/KSC-Johab-V
-share/poppler/cMap/Adobe-Korea1/KSC-RKSJ-H
share/poppler/cMap/Adobe-Korea1/KSC-V
-share/poppler/cMap/Adobe-Korea1/KSC2-RKSJ-H
share/poppler/cMap/Adobe-Korea1/KSCms-UHC-H
share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-H
share/poppler/cMap/Adobe-Korea1/KSCms-UHC-HW-V
-share/poppler/cMap/Adobe-Korea1/KSCms-UHC-UCS2
share/poppler/cMap/Adobe-Korea1/KSCms-UHC-V
share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-H
-share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2
-share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-UCS2C
share/poppler/cMap/Adobe-Korea1/KSCpc-EUC-V
-share/poppler/cMap/Adobe-Korea1/UCS2-KSCms-UHC
-share/poppler/cMap/Adobe-Korea1/UCS2-KSCpc-EUC
share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-H
share/poppler/cMap/Adobe-Korea1/UniKS-UCS2-V
share/poppler/cMap/Adobe-Korea1/UniKS-UTF16-H
@@ -234,11 +175,9 @@ share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-H
share/poppler/cMap/Adobe-Korea1/UniKS-UTF32-V
share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-H
share/poppler/cMap/Adobe-Korea1/UniKS-UTF8-V
-share/poppler/cMap/Adobe-Vietnam1/TCVN-RKSJ-H
share/poppler/cidToUnicode/Adobe-CNS1
share/poppler/cidToUnicode/Adobe-GB1
share/poppler/cidToUnicode/Adobe-Japan1
-share/poppler/cidToUnicode/Adobe-Japan2
share/poppler/cidToUnicode/Adobe-Korea1
share/poppler/nameToUnicode/Bulgarian
share/poppler/nameToUnicode/Greek
@@ -263,11 +202,9 @@ share/poppler/unicodeMap/Windows-1255
@dirrm share/poppler/unicodeMap
@dirrm share/poppler/nameToUnicode
@dirrm share/poppler/cidToUnicode
-@dirrm share/poppler/cMap/Adobe-Vietnam1
@dirrm share/poppler/cMap/Adobe-Korea1
@dirrm share/poppler/cMap/Adobe-Japan2
@dirrm share/poppler/cMap/Adobe-Japan1
-@dirrm share/poppler/cMap/Adobe-HongKong1
@dirrm share/poppler/cMap/Adobe-GB1
@dirrm share/poppler/cMap/Adobe-CNS1
@dirrm share/poppler/cMap
diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile
index 2f72a68775ea..59244c75a4ad 100644
--- a/graphics/poppler-gtk/Makefile
+++ b/graphics/poppler-gtk/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.9 2009/04/09 03:24:07 mezz Exp $
+# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.16 2009/08/02 17:54:08 marcus Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -gtk
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist
index 84f07119b04d..6bb080493e3d 100644
--- a/graphics/poppler-gtk/pkg-plist
+++ b/graphics/poppler-gtk/pkg-plist
@@ -1,10 +1,12 @@
include/poppler/glib/poppler-action.h
include/poppler/glib/poppler-annot.h
include/poppler/glib/poppler-attachment.h
+include/poppler/glib/poppler-date.h
include/poppler/glib/poppler-document.h
include/poppler/glib/poppler-enums.h
include/poppler/glib/poppler-features.h
include/poppler/glib/poppler-form-field.h
+include/poppler/glib/poppler-layer.h
include/poppler/glib/poppler-page.h
include/poppler/glib/poppler.h
lib/libpoppler-glib.a
@@ -18,10 +20,13 @@ libdata/pkgconfig/poppler-glib.pc
%%DOCSDIR%%/poppler/index.sgml
%%DOCSDIR%%/poppler/left.png
%%DOCSDIR%%/poppler/poppler-poppler-action.html
+%%DOCSDIR%%/poppler/poppler-poppler-annot.html
%%DOCSDIR%%/poppler/poppler-poppler-attachment.html
%%DOCSDIR%%/poppler/poppler-poppler-document.html
%%DOCSDIR%%/poppler/poppler-poppler-enums.html
+%%DOCSDIR%%/poppler/poppler-poppler-features.html
%%DOCSDIR%%/poppler/poppler-poppler-form-field.html
+%%DOCSDIR%%/poppler/poppler-poppler-layer.html
%%DOCSDIR%%/poppler/poppler-poppler-page.html
%%DOCSDIR%%/poppler/poppler-poppler.html
%%DOCSDIR%%/poppler/poppler.devhelp
diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile
index 6eb1d743ace9..c4234f6af7f0 100644
--- a/graphics/poppler-qt4/Makefile
+++ b/graphics/poppler-qt4/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.7 2009/04/07 03:27:48 marcus Exp $
+# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.11 2009/08/02 17:55:19 marcus Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -qt4
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile
index fc4b9f04774f..d054ca843a9e 100644
--- a/graphics/poppler-utils/Makefile
+++ b/graphics/poppler-utils/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Nottebrock <lofi@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler-utils/Makefile,v 1.1 2007/06/20 17:12:04 ahze Exp $
+# $MCom: ports/graphics/poppler-utils/Makefile,v 1.3 2009/08/27 14:48:12 kwm Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -utils
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 1655ecbd0e8a..d3758582c102 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,12 +3,12 @@
# Whom: marcus@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/poppler/Makefile,v 1.44 2009/03/14 05:12:31 marcus Exp $
+# $MCom: ports/graphics/poppler/Makefile,v 1.56 2009/11/22 04:24:49 marcus Exp $
#
PORTNAME= poppler
-PORTVERSION= 0.10.6
-PORTREVISION?= 1
+PORTVERSION= 0.12.2
+PORTREVISION?= 0
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -16,7 +16,8 @@ MAINTAINER?= gnome@FreeBSD.org
COMMENT?= A PDF rendering library
LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \
- fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+ lcms.1:${PORTSDIR}/graphics/lcms
RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data
USE_GMAKE= yes
@@ -30,13 +31,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
.if !defined(SLAVEPORT)
-OPTIONS= CAIRO "Enable cairo output backend" on
+OPTIONS= CAIRO "Enable cairo output backend" on \
+ OPENJPEG "Enable JPEG 2000 support" on
.endif
.include <bsd.port.pre.mk>
.if defined(SLAVEPORT)
-LIB_DEPENDS+= poppler.4:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+= poppler.5:${PORTSDIR}/graphics/poppler
.if ${SLAVEPORT}=="gtk"
CONFIGURE_ARGS+=--enable-poppler-glib
@@ -95,6 +97,13 @@ PLIST_SUB+= CAIRO="@comment "
LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo
PLIST_SUB+= CAIRO=""
.endif
+
+.if defined(WITHOUT_OPENJPEG)
+CONFIGURE_ARGS+=--disable-libopenjpeg
+.else
+CONFIGURE_ARGS+=--enable-libopenjpeg
+LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg
+.endif
.endif
post-patch:
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 6fb5fcf40115..bb6a38c85184 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.10.6.tar.gz) = e1a2d98ba5a4199f20d7637a7d79a829
-SHA256 (poppler-0.10.6.tar.gz) = bcd78d674c4166af069afdb27af810c012e13cfd2b7b21f9dce63dd3f62bded1
-SIZE (poppler-0.10.6.tar.gz) = 1527715
+MD5 (poppler-0.12.2.tar.gz) = 60c00b55acf7dd389bf256d178af70bf
+SHA256 (poppler-0.12.2.tar.gz) = bebfb8c0b091f44026a0c0d61790a0490b04b3c0132f82bd0b39e861bdaf2719
+SIZE (poppler-0.12.2.tar.gz) = 1614984
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index e0faea3d198e..4a621ba6eec3 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,13 +1,15 @@
---- utils/Makefile.in.orig 2009-02-26 18:44:48.000000000 -0500
-+++ utils/Makefile.in 2009-02-26 18:45:57.000000000 -0500
-@@ -61,50 +61,50 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+--- utils/Makefile.in.orig 2009-10-22 20:33:17.000000000 +0200
++++ utils/Makefile.in 2009-10-22 20:33:49.000000000 +0200
+@@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
pdffonts_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+pdffonts_DEPENDENCIES = \
$(am__DEPENDENCIES_1)
- am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+@@ -73,19 +73,19 @@ am_pdfimages_OBJECTS = pdfimages.$(OBJEX
$(am__objects_1)
pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
pdfimages_LDADD = $(LDADD)
@@ -25,11 +27,12 @@
@BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
@BUILD_ABIWORD_OUTPUT_TRUE@ $(am__objects_1)
pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
- pdftoabw_LDADD = $(LDADD)
--pdftoabw_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftoabw_DEPENDENCIES = \
+-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
++am__DEPENDENCIES_2 = \
$(am__DEPENDENCIES_1)
- am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
+ @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES = \
+ @BUILD_ABIWORD_OUTPUT_TRUE@ $(am__DEPENDENCIES_2) \
+@@ -94,25 +94,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
pdftohtml_LDADD = $(LDADD)
@@ -59,7 +62,7 @@
$(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -320,7 +320,7 @@ INCLUDES = \
+@@ -382,7 +382,7 @@ INCLUDES = \
$(ABIWORD_CFLAGS)
LDADD = \
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 1ea3318716f2..5ccd2f4ab8da 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -20,6 +20,7 @@ include/poppler/Function.h
include/poppler/Gfx.h
include/poppler/GfxFont.h
include/poppler/GfxState.h
+include/poppler/GfxState_helpers.h
include/poppler/GlobalParams.h
include/poppler/JArithmeticDecoder.h
include/poppler/JBIG2Stream.h
@@ -39,6 +40,7 @@ include/poppler/PSTokenizer.h
include/poppler/Page.h
include/poppler/PageTransition.h
include/poppler/Parser.h
+include/poppler/PopplerCache.h
include/poppler/PreScanOutputDev.h
include/poppler/ProfileData.h
include/poppler/SecurityHandler.h
@@ -56,6 +58,11 @@ include/poppler/UnicodeMapTables.h
include/poppler/UnicodeTypeTable.h
include/poppler/XRef.h
include/poppler/XpdfPluginAPI.h
+include/poppler/fofi/FoFiBase.h
+include/poppler/fofi/FoFiEncodings.h
+include/poppler/fofi/FoFiTrueType.h
+include/poppler/fofi/FoFiType1.h
+include/poppler/fofi/FoFiType1C.h
include/poppler/goo/FixedPoint.h
include/poppler/goo/GooHash.h
include/poppler/goo/GooList.h
@@ -63,8 +70,10 @@ include/poppler/goo/GooMutex.h
include/poppler/goo/GooString.h
include/poppler/goo/GooTimer.h
include/poppler/goo/GooVector.h
+include/poppler/goo/PNGWriter.h
include/poppler/goo/gfile.h
include/poppler/goo/gmem.h
+include/poppler/goo/gstrtod.h
include/poppler/goo/gtypes.h
include/poppler/poppler-config.h
include/poppler/splash/Splash.h
@@ -93,10 +102,11 @@ include/poppler/splash/SplashXPathScanner.h
lib/libpoppler.a
lib/libpoppler.la
lib/libpoppler.so
-lib/libpoppler.so.4
+lib/libpoppler.so.5
%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
libdata/pkgconfig/poppler-splash.pc
libdata/pkgconfig/poppler.pc
@dirrm include/poppler/splash
@dirrm include/poppler/goo
+@dirrm include/poppler/fofi
@dirrm include/poppler
diff --git a/graphics/py-clutter-gtk/Makefile b/graphics/py-clutter-gtk/Makefile
new file mode 100644
index 000000000000..f39b76c4b92f
--- /dev/null
+++ b/graphics/py-clutter-gtk/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: py-clutter-gtk
+# Date created: 04 Sep 2009
+# Whom: Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/graphics/py-clutter-gtk/Makefile,v 1.1 2009/09/06 11:27:11 kwm Exp $
+#
+
+PORTNAME= clutter
+PORTVERSION= 0.9.3
+CATEGORIES= graphics
+#MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/${PORTVERSION:R}/
+MASTER_SITES= LOCAL/kwm
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX= gtk
+DISTNAME= py${PORTNAME}-gtk-${PORTVERSION}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Python modules for Clutter-gtk toolkit
+
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
+ ${LOCALBASE}/libdata/pkgconfig/pyclutter-1.0.pc:${PORTSDIR}/graphics/py-clutter
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
+ ${LOCALBASE}/libdata/pkgconfig/pyclutter-1.0.pc:${PORTSDIR}/graphics/py-clutter
+LIB_DEPENDS= clutter-gtk-0.10:${PORTSDIR}/graphics/clutter-gtk
+
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtool:22
+USE_GNOME= gnomehack pygnome2 pygtk2
+USE_PYTHON= 2.5+
+CONFIGURE_ARGS= --disable-docs
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.include <bsd.port.mk>
diff --git a/graphics/py-clutter-gtk/distinfo b/graphics/py-clutter-gtk/distinfo
new file mode 100644
index 000000000000..847fdb293e35
--- /dev/null
+++ b/graphics/py-clutter-gtk/distinfo
@@ -0,0 +1,3 @@
+MD5 (pyclutter-gtk-0.9.3.tar.gz) = bd384f40119f7af5b3ec5eb28da14855
+SHA256 (pyclutter-gtk-0.9.3.tar.gz) = 8e05bc93254f3f5b0bcbaea73f58101a7b980b574018a97f9413f2af4eb9e443
+SIZE (pyclutter-gtk-0.9.3.tar.gz) = 312307
diff --git a/graphics/py-clutter-gtk/pkg-descr b/graphics/py-clutter-gtk/pkg-descr
new file mode 100644
index 000000000000..9fdb41a52785
--- /dev/null
+++ b/graphics/py-clutter-gtk/pkg-descr
@@ -0,0 +1,3 @@
+Python bindings for clutter-gtk
+
+WWW: http://www.clutter-project.org
diff --git a/graphics/py-clutter-gtk/pkg-plist b/graphics/py-clutter-gtk/pkg-plist
new file mode 100644
index 000000000000..2db5df914615
--- /dev/null
+++ b/graphics/py-clutter-gtk/pkg-plist
@@ -0,0 +1,10 @@
+%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.py
+%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.pyo
+%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.a
+%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.la
+%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.so
+libdata/pkgconfig/pyclutter-gtk-0.9.pc
+share/pyclutter/1.0/defs/cluttergtk.defs
+share/pyclutter/1.0/defs/cluttergtk-types.defs
+@dirrm %%PYTHON_SITELIBDIR%%/cluttergtk
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index cd825b085989..cb55e9cbf429 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -3,35 +3,31 @@
# Whom: Martin Wilke <miwi@FreeBSD.org>
#
# $FreeBSD$
+# $MCom: ports/graphics/py-clutter/Makefile,v 1.3 2009/09/26 13:41:59 marcus Exp $
#
PORTNAME= clutter
-PORTVERSION= 0.8.2
-PORTREVISION= 2
+PORTVERSION= 1.0.0
CATEGORIES= graphics
-MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/0.8/
+MASTER_SITES= http://www.clutter-project.org/sources/pyclutter/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Python modules for Clutter toolkit
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
- ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gst-0.10/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
- ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \
${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
-LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter \
- clutter-gst-0.8:${PORTSDIR}/multimedia/clutter-gst \
- clutter-cairo-0.8:${PORTSDIR}/graphics/clutter-cairo \
- clutter-gtk-0.8:${PORTSDIR}/graphics/clutter-gtk
+LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter
+USE_BZIP2= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
USE_GNOME= gnomehack pygnome2 pygtk2
-USE_GSTREAMER= yes
-USE_PYTHON= 2.4+
+USE_PYTHON= 2.5+
+CONFIGURE_ARGS= --disable-docs
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/graphics/py-clutter/distinfo b/graphics/py-clutter/distinfo
index 0d124af462dc..c501d34423ea 100644
--- a/graphics/py-clutter/distinfo
+++ b/graphics/py-clutter/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyclutter-0.8.2.tar.gz) = 6aebbda8e69ea547dda11819ca913f85
-SHA256 (pyclutter-0.8.2.tar.gz) = d3022ddf29a1c774ba40ae31bf73d05fbb783c52f54610c9be1be3a3f06abb7a
-SIZE (pyclutter-0.8.2.tar.gz) = 552778
+MD5 (pyclutter-1.0.0.tar.bz2) = 1cfbb64eceef6828e47e9a64689ffa41
+SHA256 (pyclutter-1.0.0.tar.bz2) = 1c916bc9ab1c98803fecc23ac0276cc02e95a047aa42f7defe05dca81912b537
+SIZE (pyclutter-1.0.0.tar.bz2) = 422185
diff --git a/graphics/py-clutter/pkg-plist b/graphics/py-clutter/pkg-plist
index 983f1758303d..954ad348d3e0 100644
--- a/graphics/py-clutter/pkg-plist
+++ b/graphics/py-clutter/pkg-plist
@@ -11,32 +11,11 @@ include/pyclutter-1.0/pyclutter/pyclutter.h
%%PYTHON_SITELIBDIR%%/clutter/keysyms.py
%%PYTHON_SITELIBDIR%%/clutter/keysyms.pyc
%%PYTHON_SITELIBDIR%%/clutter/keysyms.pyo
-%%PYTHON_SITELIBDIR%%/cluttercairo/__init__.py
-%%PYTHON_SITELIBDIR%%/cluttercairo/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cluttercairo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cluttercairo/_cluttercairo.a
-%%PYTHON_SITELIBDIR%%/cluttercairo/_cluttercairo.la
-%%PYTHON_SITELIBDIR%%/cluttercairo/_cluttercairo.so
-%%PYTHON_SITELIBDIR%%/cluttergst/__init__.py
-%%PYTHON_SITELIBDIR%%/cluttergst/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cluttergst/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cluttergst/_cluttergst.a
-%%PYTHON_SITELIBDIR%%/cluttergst/_cluttergst.la
-%%PYTHON_SITELIBDIR%%/cluttergst/_cluttergst.so
-%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.py
-%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cluttergtk/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.a
-%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.la
-%%PYTHON_SITELIBDIR%%/cluttergtk/_cluttergtk.so
-libdata/pkgconfig/pyclutter-0.8.pc
+libdata/pkgconfig/pyclutter-1.0.pc
share/pyclutter/1.0/defs/clutter-base-types.defs
share/pyclutter/1.0/defs/clutter-base.defs
share/pyclutter/1.0/defs/clutter-types.defs
share/pyclutter/1.0/defs/clutter.defs
-share/pyclutter/1.0/defs/cluttercairo.defs
-share/pyclutter/1.0/defs/cluttergst.defs
-share/pyclutter/1.0/defs/cluttergtk.defs
share/pyclutter/1.0/defs/cogl-base-types.defs
share/pyclutter/1.0/defs/cogl-base.defs
share/pyclutter/1.0/defs/cogl-types.defs
@@ -44,9 +23,6 @@ share/pyclutter/1.0/defs/cogl.defs
@dirrm share/pyclutter/1.0/defs
@dirrm share/pyclutter/1.0
@dirrm share/pyclutter
-@dirrm %%PYTHON_SITELIBDIR%%/cluttergst
-@dirrm %%PYTHON_SITELIBDIR%%/cluttergtk
-@dirrm %%PYTHON_SITELIBDIR%%/cluttercairo
@dirrm %%PYTHON_SITELIBDIR%%/clutter
@dirrmtry %%PYTHON_SITELIBDIR%%
@dirrm include/pyclutter-1.0/pyclutter
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index 434c157cd189..a1758fd1eef3 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -3,9 +3,9 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/py-gimp/Makefile,v 1.4 2007/10/24 21:22:00 ahze Exp $
+# $MCom: ports/graphics/py-gimp/Makefile,v 1.6 2009/08/25 00:06:39 marcus Exp $
-PORTREVISION= 1
+PORTREVISION= 0
PORTEPOCH= 0
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}