Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive

amount of work by the FreeBSD GNOME Team and our testers. On top of the usual GNOME update, we have taken this opportunity to move GNOME from X11BASE to LOCALBASE. This means roughly 600 ports NOT part of the GNOME Desktop also need to be changed. The bulk of the move was carried out by ahze, mezz, and pav, but it would not have been possible without cooperation from the FreeBSD KDE team who worked with us to make sure GNOME and KDE can still coexist happily. We would also like to send a shout out to kris and pointyhat for putting up with multiple test runs until we got something that was solid. Back to GNOME 2.16. This release brings a huge amount of new functionality to FreeBSD. The standard release notes can be read at http://www.gnome.org/start/2.16/ . But on top of what you will read there, jylefort and marcus have completed work on a port of HAL to FreeBSD. This will allow FreeBSD to take advantage of closer hardware interaction such as auto-mounting CD-ROMs, USB drives, and music players; auto-playing audio CDs; and managing laptop power consumption. But where would this all be without our loyal testers and contributors? Therefore, the FreeBSD GNOME team would like to thank the following users: Phillip Neumann <pneumann@gmail.com> tmclaugh mux Yuri Pankov <yuri.pankov@gmail.com> chinsan Thomas <freebsdlists@bsdunix.ch> Brian Gruber <knightbg@yahoo.com> Franz Klammer <klammer@webonaut.com> Dominique Goncalves <dominique.goncalves@gmail.com> Pascal Hofstee <caelian@gmail.com> Yasuda Keisuke <kysd@po.harenet.ne.jp> backyard <backyard1454-bsd@yahoo.com> Andris Raugulis <endrju@null.lv> <endrju@null.lv> Eric L. Chen <d9364104@mail.nchu.edu.tw> Pawel Worach <pawel.worach@gmail.com> QuiRK on #freebsd-gnome Shane Bell <decept0@gmail.com> luigi sajd on #freebsd-gnome sat Chris Coleman <chrisc@vmunix.com> kaeru on #freebsd-gnome crsd_ via irc.freenode.org/#FreeBSD-GNOME Joel Diaz <joeldiaz@mac.com> Enjoy! Approved by: portmgr (implicit, kris)
author: marcus <marcus@FreeBSD.org> 2006-10-14 16:35:50 +0800
committer: marcus <marcus@FreeBSD.org> 2006-10-14 16:35:50 +0800
commit: 9b9c902909a87b589432804ec4e8a7fa23943ff4 (patch)
tree: aa2e443568b953ce772558b2be74a8451e38ec3d /graphics
parent: f5a682ff4e0a5d73ce8bffeb88c799eb8ef0e816 (diff)
download: freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.tar.gz
freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.tar.zst
freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.zip
29 files changed, 445 insertions, 255 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 9dfd56f5cec5..6cad3727cfbd 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -3,16 +3,14 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/cairo/Makefile,v 1.30 2005/10/04 04:35:57 ahze Exp $
+#   $MCom: ports/graphics/cairo/Makefile,v 1.45 2006/08/19 16:29:11 marcus Exp $
 #
 
 PORTNAME=	cairo
-PORTVERSION=	1.0.4
-PORTREVISION?=	1
+PORTVERSION=	1.2.4
+PORTREVISION?=	0
 CATEGORIES=	graphics
-MASTER_SITES=	http://cairographics.org/releases/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ahze
+MASTER_SITES=	http://cairographics.org/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Vector graphics library with cross-device output support
@@ -28,7 +26,7 @@ CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--enable-ps
 USE_GNOME=	gnometarget gnomehack ltverhack referencehack
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS}"
@@ -62,6 +60,9 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/test/Makefile.in
+	@${REINPLACE_CMD} -e 's|src test doc|src doc|; \
+		s|@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = test||' \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.post.mk>
 
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 85ffa9552e91..166ee3f1f2a1 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairo-1.0.4.tar.gz) = 9002b0e69b3f94831a22d3f2a7735ce2
-SHA256 (cairo-1.0.4.tar.gz) = 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5
-SIZE (cairo-1.0.4.tar.gz) = 1475777
+MD5 (cairo-1.2.4.tar.gz) = 1222b2bfdf113e2c92f66b3389659f2d
+SHA256 (cairo-1.2.4.tar.gz) = c1580ca951b2f57c4f8b34549997854bc48dbaf036ca1ca6c017c03db3504ddb
+SIZE (cairo-1.2.4.tar.gz) = 2882781
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index e9445b2f0728..39be152857f9 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -3,6 +3,7 @@ include/cairo/cairo-ft.h
 %%GLITZ%%include/cairo/cairo-glitz.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
+include/cairo/cairo-svg.h
 %%X11%%include/cairo/cairo-xlib-xrender.h
 %%X11%%include/cairo/cairo-xlib.h
 include/cairo/cairo.h
@@ -11,4 +12,12 @@ lib/libcairo.la
 lib/libcairo.so
 lib/libcairo.so.2
 libdata/pkgconfig/cairo.pc
+libdata/pkgconfig/cairo-ft.pc
+%%GLITZ%%libdata/pkgconfig/cairo-glitz.pc
+libdata/pkgconfig/cairo-pdf.pc
+libdata/pkgconfig/cairo-png.pc
+libdata/pkgconfig/cairo-ps.pc
+libdata/pkgconfig/cairo-svg.pc
+%%X11%%libdata/pkgconfig/cairo-xlib.pc
+%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
 @dirrm include/cairo
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 93a97b9e7bdd..a0988e55c56f 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog/Makefile,v 1.29 2006/04/13 07:52:35 bland Exp $
+#   $MCom: ports/graphics/eog/Makefile,v 1.41 2006/09/29 21:36:38 ahze Exp $
 #
 
 PORTNAME=	eog
-PORTVERSION=	2.14.3
+PORTVERSION=	2.16.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,7 +21,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui \
 		librsvg2 desktopfileutils gnomedesktop
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 GNOME_DESKTOP_VERSION=2
@@ -32,11 +32,8 @@ GCONF_SCHEMAS=	eog.schemas
 
 .include <bsd.port.pre.mk>
 
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-WITH_EXIF=	yes
-.endif
-
-.if defined(WITH_EXIF) || exists(${LOCALBASE}/lib/libexif.so.12)
+.if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \
+	defined(WITH_EXIF))
 LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
 .endif
 
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 43c0c9ec36f4..e07024525da5 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eog-2.14.3.tar.bz2) = e90e4c1e314cfab04414464088098a16
-SHA256 (gnome2/eog-2.14.3.tar.bz2) = 81b35ca0948a43f6dc90bccf7b5d8498eca7a4bbe5be7f404e5bfe737265cd99
-SIZE (gnome2/eog-2.14.3.tar.bz2) = 824113
+MD5 (gnome2/eog-2.16.1.tar.bz2) = bba4f238aaac797b5a8e150aa55c7fb3
+SHA256 (gnome2/eog-2.16.1.tar.bz2) = 350e698c05f415e56a694954c5039534b980f2da865b9dd7ffeb594cb63e7fb7
+SIZE (gnome2/eog-2.16.1.tar.bz2) = 661380
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 972834443e53..44d54a22f815 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -6,52 +6,7 @@ share/gnome/help/eog/C/eog.xml
 share/gnome/help/eog/C/figures/eog_save_as_window.png
 share/gnome/help/eog/C/figures/eog_start_window.png
 share/gnome/help/eog/C/legal.xml
-share/gnome/help/eog/de/eog.xml
-share/gnome/help/eog/de/figures/eog_start_window.png
-share/gnome/help/eog/de/legal.xml
-share/gnome/help/eog/es/eog.xml
-share/gnome/help/eog/es/figures/eog_start_window.png
-share/gnome/help/eog/es/legal.xml
-share/gnome/help/eog/eu/eog.xml
-share/gnome/help/eog/eu/figures/eog_start_window.png
-share/gnome/help/eog/eu/legal.xml
-share/gnome/help/eog/fr/eog.xml
-share/gnome/help/eog/fr/figures/eog_start_window.png
-share/gnome/help/eog/fr/legal.xml
-share/gnome/help/eog/it/eog.xml
-share/gnome/help/eog/it/figures/eog_start_window.png
-share/gnome/help/eog/it/legal.xml
-share/gnome/help/eog/ja/eog.xml
-share/gnome/help/eog/ja/figures/eog_start_window.png
-share/gnome/help/eog/ja/legal.xml
-share/gnome/help/eog/ko/eog.xml
-share/gnome/help/eog/ko/figures/eog_start_window.png
-share/gnome/help/eog/ko/legal.xml
-share/gnome/help/eog/sv/eog.xml
-share/gnome/help/eog/sv/figures/eog_start_window.png
-share/gnome/help/eog/sv/legal.xml
-share/gnome/help/eog/uk/eog.xml
-share/gnome/help/eog/uk/figures/eog_save_as_window.png
-share/gnome/help/eog/uk/figures/eog_start_window.png
-share/gnome/help/eog/uk/legal.xml
-share/gnome/help/eog/zh_CN/eog.xml
-share/gnome/help/eog/zh_CN/figures/eog_start_window.png
-share/gnome/help/eog/zh_CN/legal.xml
-share/gnome/help/eog/zh_TW/eog.xml
-share/gnome/help/eog/zh_TW/figures/eog_start_window.png
-share/gnome/help/eog/zh_TW/legal.xml
 share/gnome/omf/eog/eog-C.omf
-share/gnome/omf/eog/eog-de.omf
-share/gnome/omf/eog/eog-es.omf
-share/gnome/omf/eog/eog-eu.omf
-share/gnome/omf/eog/eog-fr.omf
-share/gnome/omf/eog/eog-it.omf
-share/gnome/omf/eog/eog-ja.omf
-share/gnome/omf/eog/eog-ko.omf
-share/gnome/omf/eog/eog-sv.omf
-share/gnome/omf/eog/eog-uk.omf
-share/gnome/omf/eog/eog-zh_CN.omf
-share/gnome/omf/eog/eog-zh_TW.omf
 share/gnome/pixmaps/eog/down-right.png
 share/gnome/pixmaps/eog/loading.png
 share/gnome/pixmaps/eog/orient-horizontal.png
@@ -70,7 +25,7 @@ share/locale/az/LC_MESSAGES/eog.mo
 share/locale/be/LC_MESSAGES/eog.mo
 share/locale/bg/LC_MESSAGES/eog.mo
 share/locale/bn/LC_MESSAGES/eog.mo
-share/locale/br/LC_MESSAGES/eog.mo
+share/locale/bn_IN/LC_MESSAGES/eog.mo
 share/locale/bs/LC_MESSAGES/eog.mo
 share/locale/ca/LC_MESSAGES/eog.mo
 share/locale/cs/LC_MESSAGES/eog.mo
@@ -104,6 +59,7 @@ share/locale/ko/LC_MESSAGES/eog.mo
 share/locale/ku/LC_MESSAGES/eog.mo
 share/locale/lt/LC_MESSAGES/eog.mo
 share/locale/lv/LC_MESSAGES/eog.mo
+share/locale/mg/LC_MESSAGES/eog.mo
 share/locale/mk/LC_MESSAGES/eog.mo
 share/locale/ml/LC_MESSAGES/eog.mo
 share/locale/mn/LC_MESSAGES/eog.mo
@@ -112,7 +68,6 @@ share/locale/nb/LC_MESSAGES/eog.mo
 share/locale/ne/LC_MESSAGES/eog.mo
 share/locale/nl/LC_MESSAGES/eog.mo
 share/locale/nn/LC_MESSAGES/eog.mo
-share/locale/no/LC_MESSAGES/eog.mo
 share/locale/nso/LC_MESSAGES/eog.mo
 share/locale/or/LC_MESSAGES/eog.mo
 share/locale/pa/LC_MESSAGES/eog.mo
@@ -141,52 +96,70 @@ share/locale/zh_CN/LC_MESSAGES/eog.mo
 share/locale/zh_HK/LC_MESSAGES/eog.mo
 share/locale/zh_TW/LC_MESSAGES/eog.mo
 share/locale/zu/LC_MESSAGES/eog.mo
+@dirrm share/gnome/pixmaps/eog
+@dirrm share/gnome/omf/eog
+@dirrm share/gnome/help/eog/C/figures
+@dirrm share/gnome/help/eog/C
+@dirrm share/gnome/help/eog
+@dirrm share/gnome/eog/glade
+@dirrm share/gnome/eog
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || true
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/pixmaps/eog
-@dirrm share/gnome/omf/eog
-@dirrm share/gnome/help/eog/zh_TW/figures
-@dirrm share/gnome/help/eog/zh_TW
-@dirrm share/gnome/help/eog/zh_CN/figures
-@dirrm share/gnome/help/eog/zh_CN
-@dirrm share/gnome/help/eog/uk/figures
-@dirrm share/gnome/help/eog/uk
-@dirrm share/gnome/help/eog/sv/figures
-@dirrm share/gnome/help/eog/sv
-@dirrm share/gnome/help/eog/ko/figures
-@dirrm share/gnome/help/eog/ko
-@dirrm share/gnome/help/eog/ja/figures
-@dirrm share/gnome/help/eog/ja
-@dirrm share/gnome/help/eog/it/figures
-@dirrm share/gnome/help/eog/it
-@dirrm share/gnome/help/eog/fr/figures
-@dirrm share/gnome/help/eog/fr
-@dirrm share/gnome/help/eog/eu/figures
-@dirrm share/gnome/help/eog/eu
-@dirrm share/gnome/help/eog/es/figures
-@dirrm share/gnome/help/eog/es
-@dirrm share/gnome/help/eog/de/figures
-@dirrm share/gnome/help/eog/de
-@dirrm share/gnome/help/eog/C/figures
-@dirrm share/gnome/help/eog/C
-@dirrm share/gnome/help/eog
-@dirrm share/gnome/eog/glade
-@dirrm share/gnome/eog
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index dd4aaef39bf4..e128489f834c 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,26 +3,26 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/evince/Makefile,v 1.50 2006/04/24 00:54:32 ahze Exp $
+#   $MCom: ports/graphics/evince/Makefile,v 1.58 2006/10/10 02:27:26 ahze Exp $
 #
 
 PORTNAME=	evince
-PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTVERSION=	0.6.1
 CATEGORIES=	graphics print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 multi-format document viewer
 
 LIB_DEPENDS=	poppler-glib.1:${PORTSDIR}/graphics/poppler-gtk
 
+USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GHOSTSCRIPT=yes
 INSTALLS_OMF=	yes
@@ -38,6 +38,7 @@ OPTIONS=	DVI		"Enable DVI viewer support"		off \
 		NAUTILUS	"Enable Nautilus plugin"		on  \
 		DBUS		"Enable D-BUS support"			on \
 		COMICS		"Enable comic book archives support"	off
+#		IMPRESS		"Enable Impress presentations support"	off \
 #		DJVU		"Enable DJVU support"			off
 
 .include <bsd.port.pre.mk>
@@ -69,12 +70,18 @@ CONFIGURE_ARGS+=	--disable-nautilus
 PLIST_SUB+=		NAUTILUS="@comment "
 .endif
 
-.if exists(${X11BASE}/bin/djview)
-DJVU_DIR?=	# empty
-.else
-DJVU_DIR?=	-nox11
-.endif
+#.if defined(WITH_IMPRESS)
+#CONFIGURE_ARGS+=	--enable-impress
+#.else
+CONFIGURE_ARGS+=	--disable-impress
+#.endif
 
+#.if exists(${X11BASE}/bin/djview)
+#DJVU_DIR?=	# empty
+#.else
+#DJVU_DIR?=	-nox11
+#.endif
+#
 #.if defined(WITH_DJVU)
 #LIB_DEPENDS+=		djvulibre.17:${PORTSDIR}/graphics/djvulibre${DJVU_DIR}
 #CONFIGURE_ARGS+=	--enable-djvu
@@ -84,7 +91,7 @@ CONFIGURE_ARGS+=	--disable-djvu
 #.endif
 
 .if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 .endif
 
 .if defined(WITH_COMICS)
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index f4b9a8609ff7..f80ff610751a 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (evince-0.5.3.tar.bz2) = 94be73485eeb8584b4aeaa8ac87699f0
-SHA256 (evince-0.5.3.tar.bz2) = 793067426e0adf18129642426c4b4e8e4f61747dfea48111690525eff06822a0
-SIZE (evince-0.5.3.tar.bz2) = 994976
+MD5 (gnome2/evince-0.6.1.tar.bz2) = 55a1d4af3cac209c7cfbe83b7ffcee1d
+SHA256 (gnome2/evince-0.6.1.tar.bz2) = ee72f48ec0c76a8f44d8a6aed6759d43a147a9d5bb2b15f06460c4d6ef86025e
+SIZE (gnome2/evince-0.6.1.tar.bz2) = 1212271
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 1d6b1780feb5..06e0564df2b5 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -18,29 +18,42 @@ share/gnome/help/evince/el/evince.xml
 share/gnome/help/evince/el/figures/evince_start_window.png
 share/gnome/help/evince/es/evince.xml
 share/gnome/help/evince/es/figures/evince_start_window.png
+share/gnome/help/evince/fi/evince.xml
+share/gnome/help/evince/fi/figures/evince_start_window.png
+share/gnome/help/evince/fr/evince.xml
+share/gnome/help/evince/fr/figures/evince_start_window.png
+share/gnome/help/evince/it/evince.xml
+share/gnome/help/evince/it/figures/evince_start_window.png
 share/gnome/help/evince/nl/evince.xml
 share/gnome/help/evince/nl/figures/evince_start_window.png
 share/gnome/help/evince/ru/evince.xml
 share/gnome/help/evince/ru/figures/evince_start_window.png
 share/gnome/help/evince/sr/evince.xml
 share/gnome/help/evince/sr/figures/evince_start_window.png
+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/omf/evince/evince-C.omf
 share/gnome/omf/evince/evince-bg.omf
 share/gnome/omf/evince/evince-el.omf
 share/gnome/omf/evince/evince-es.omf
+share/gnome/omf/evince/evince-fi.omf
+share/gnome/omf/evince/evince-fr.omf
+share/gnome/omf/evince/evince-it.omf
 share/gnome/omf/evince/evince-nl.omf
 share/gnome/omf/evince/evince-ru.omf
 share/gnome/omf/evince/evince-sr.omf
+share/gnome/omf/evince/evince-sv.omf
 share/gnome/omf/evince/evince-uk.omf
-share/icons/hicolor/16x16/apps/evince-16.png
-share/icons/hicolor/22x22/apps/evince-22.png
+share/icons/hicolor/16x16/apps/evince.png
+share/icons/hicolor/22x22/apps/evince.png
 share/icons/hicolor/48x48/apps/evince.png
 share/icons/hicolor/scalable/apps/evince.svg
 share/locale/be/LC_MESSAGES/evince.mo
 share/locale/bg/LC_MESSAGES/evince.mo
 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/cs/LC_MESSAGES/evince.mo
@@ -71,10 +84,13 @@ share/locale/ku/LC_MESSAGES/evince.mo
 share/locale/lt/LC_MESSAGES/evince.mo
 share/locale/lv/LC_MESSAGES/evince.mo
 share/locale/mk/LC_MESSAGES/evince.mo
+share/locale/ml/LC_MESSAGES/evince.mo
+share/locale/mr/LC_MESSAGES/evince.mo
 share/locale/nb/LC_MESSAGES/evince.mo
 share/locale/ne/LC_MESSAGES/evince.mo
 share/locale/nl/LC_MESSAGES/evince.mo
 share/locale/nn/LC_MESSAGES/evince.mo
+share/locale/or/LC_MESSAGES/evince.mo
 share/locale/pa/LC_MESSAGES/evince.mo
 share/locale/pl/LC_MESSAGES/evince.mo
 share/locale/pt/LC_MESSAGES/evince.mo
@@ -83,10 +99,12 @@ share/locale/ro/LC_MESSAGES/evince.mo
 share/locale/ru/LC_MESSAGES/evince.mo
 share/locale/rw/LC_MESSAGES/evince.mo
 share/locale/sk/LC_MESSAGES/evince.mo
+share/locale/sl/LC_MESSAGES/evince.mo
 share/locale/sq/LC_MESSAGES/evince.mo
 share/locale/sr/LC_MESSAGES/evince.mo
 share/locale/sr@Latn/LC_MESSAGES/evince.mo
 share/locale/sv/LC_MESSAGES/evince.mo
+share/locale/ta/LC_MESSAGES/evince.mo
 share/locale/th/LC_MESSAGES/evince.mo
 share/locale/tr/LC_MESSAGES/evince.mo
 share/locale/uk/LC_MESSAGES/evince.mo
@@ -95,25 +113,23 @@ share/locale/wa/LC_MESSAGES/evince.mo
 share/locale/zh_CN/LC_MESSAGES/evince.mo
 share/locale/zh_HK/LC_MESSAGES/evince.mo
 share/locale/zh_TW/LC_MESSAGES/evince.mo
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
 @dirrm share/gnome/omf/evince
 @dirrm share/gnome/help/evince/uk/figures
 @dirrm share/gnome/help/evince/uk
+@dirrm share/gnome/help/evince/sv/figures
+@dirrm share/gnome/help/evince/sv
 @dirrm share/gnome/help/evince/sr/figures
 @dirrm share/gnome/help/evince/sr
 @dirrm share/gnome/help/evince/ru/figures
 @dirrm share/gnome/help/evince/ru
 @dirrm share/gnome/help/evince/nl/figures
 @dirrm share/gnome/help/evince/nl
+@dirrm share/gnome/help/evince/it/figures
+@dirrm share/gnome/help/evince/it
+@dirrm share/gnome/help/evince/fr/figures
+@dirrm share/gnome/help/evince/fr
+@dirrm share/gnome/help/evince/fi/figures
+@dirrm share/gnome/help/evince/fi
 @dirrm share/gnome/help/evince/es/figures
 @dirrm share/gnome/help/evince/es
 @dirrm share/gnome/help/evince/el/figures
@@ -126,3 +142,51 @@ share/locale/zh_TW/LC_MESSAGES/evince.mo
 @dirrm share/gnome/evince
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile
index dfccc56066b2..c648490a3841 100644
--- a/graphics/glitz/Makefile
+++ b/graphics/glitz/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/glitz/Makefile,v 1.4 2005/08/09 22:54:54 ahze Exp $
+#   $MCom: ports/graphics/glitz/Makefile,v 1.8 2006/09/10 00:51:10 mezz Exp $
 #
 
 PORTNAME=	glitz
-PORTVERSION=	0.4.4
-PORTREVISION=	1
+PORTVERSION=	0.5.6
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
@@ -18,7 +17,7 @@ COMMENT=	OpenGL image compositing library
 USE_GL=		yes
 USE_GNOME=	pkgconfig gnometarget gnomehack
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS}"
@@ -28,7 +27,7 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 post-patch:
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
-		${WRKSRC}/src/glitz.h
+		${WRKSRC}/src/glitzint.h
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/glitz/distinfo b/graphics/glitz/distinfo
index 7237973497d6..86714e7e51ce 100644
--- a/graphics/glitz/distinfo
+++ b/graphics/glitz/distinfo
@@ -1,3 +1,3 @@
-MD5 (glitz-0.4.4.tar.gz) = 56162ec6f5df9603c0e98391c64565f8
-SHA256 (glitz-0.4.4.tar.gz) = 35287ae5949d67e67a9f275885896615c83e6322b2b85c338514cf198fda6540
-SIZE (glitz-0.4.4.tar.gz) = 425742
+MD5 (glitz-0.5.6.tar.gz) = c507f140ecccc06aed8888c958edda4c
+SHA256 (glitz-0.5.6.tar.gz) = 132adf06e48531f4c01b6ba5843881e2b584a170c5222353d03cbef736d4a471
+SIZE (glitz-0.5.6.tar.gz) = 459224
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 33cf472f7f8a..0a91f569a42d 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.57 2006/04/13 07:52:35 bland Exp $
-#
+#   $MCom: ports/graphics/libgnomecanvas/Makefile,v 1.60 2006/09/10 00:51:11 mezz Exp $
 
 PORTNAME=	libgnomecanvas
 PORTVERSION=	2.14.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,8 +22,8 @@ USE_BZIP2=	yes
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
-INSTALLS_SHLIB=	yes
+USE_XLIB=	yes
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack libglade2 libartlgpl2 ltverhack referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index a6ac3bcb3f72..37e354fc0265 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -94,15 +94,61 @@ share/locale/yi/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo
+@dirrm include/libgnomecanvas-2.0/libgnomecanvas
+@dirrm include/libgnomecanvas-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
-@dirrm include/libgnomecanvas-2.0/libgnomecanvas
-@dirrm include/libgnomecanvas-2.0
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 29430d5de1b1..712ed42ee9f2 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,11 +3,12 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/librsvg2/Makefile,v 1.98 2006/04/13 07:52:35 bland Exp $
+#    $MCom: ports/graphics/librsvg2/Makefile,v 1.109 2006/10/02 04:52:51 bland Exp $
 #
 
 PORTNAME=	librsvg2
-PORTVERSION=	2.14.4
+PORTVERSION=	2.16.0
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,14 +20,13 @@ COMMENT=	Library for parsing and rendering SVG vector-graphic files
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		popt.0:${PORTSDIR}/devel/popt \
 		croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco
-RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-INSTALLS_SHLIB=	yes
+USE_XLIB=	yes
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnomeprefix libgsf gtk20 ltverhack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -36,7 +36,8 @@ CONFIGURE_ARGS=	--with-svgz \
 		--without-gimp \
 		--with-croco \
 		--disable-gnome-vfs \
-		--enable-gtk-theme
+		--enable-gtk-theme \
+		--disable-gnome-print
 
 CROCO_VERSION=	0.6
 
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 2a1a170c93cb..19f271896599 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/librsvg-2.14.4.tar.bz2) = 945617bb094975d7353a3852302297c1
-SHA256 (gnome2/librsvg-2.14.4.tar.bz2) = 877f016487042eedc78c472bddd008fe70e17837374ede50726445eb8f5872d5
-SIZE (gnome2/librsvg-2.14.4.tar.bz2) = 415862
+MD5 (gnome2/librsvg-2.16.0.tar.bz2) = dc6385e62ed278732146bca5aab74568
+SHA256 (gnome2/librsvg-2.16.0.tar.bz2) = 2a918455246e8541ce737ea499fd0bcfa207d712cb4efa5583031b9c23c51c66
+SIZE (gnome2/librsvg-2.16.0.tar.bz2) = 420858
diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
index b129aca5aa90..5db06266c965 100644
--- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
+++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
@@ -1,15 +1,15 @@
---- moz-plugin/Makefile.in.orig	Sat Apr  1 15:25:20 2006
-+++ moz-plugin/Makefile.in	Sat Apr  1 15:27:58 2006
-@@ -246,7 +246,7 @@ sbindir = @sbindir@
+--- moz-plugin/Makefile.in.orig	Thu Jul 27 11:13:53 2006
++++ moz-plugin/Makefile.in	Thu Jul 27 11:14:38 2006
+@@ -241,7 +241,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--plugindir = $(libdir)/mozilla/plugins/
-+plugindir = $(libdir)/browser_plugins/
+-plugindir = $(libdir)/mozilla/plugins
++plugindir = $(libdir)/browser_plugins
  @WITH_MOZILLA_FALSE@plugin_LTLIBRARIES = 
  @WITH_MOZILLA_TRUE@plugin_LTLIBRARIES = libmozsvgdec.la
  INCLUDES = $(MOZILLA_CFLAGS) -DBINDIR=\"$(bindir)/\" $(GLIB_CFLAGS) $(GDK_X11_CFLAGS)
-@@ -289,7 +289,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+@@ -284,7 +284,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 82ac9dc7a828..ceeb03c21173 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -19,7 +19,25 @@ lib/librsvg-2.la
 lib/librsvg-2.so
 lib/librsvg-2.so.2
 libdata/pkgconfig/librsvg-2.0.pc
+share/doc/rsvg/home.png
+share/doc/rsvg/index.html
+share/doc/rsvg/index.sgml
+share/doc/rsvg/ix01.html
+share/doc/rsvg/left.png
+share/doc/rsvg/pt02.html
+share/doc/rsvg/pt03.html
+share/doc/rsvg/pt04.html
+share/doc/rsvg/right.png
+share/doc/rsvg/rsvg-Cairo.html
+share/doc/rsvg/rsvg-Core-API.html
+share/doc/rsvg/rsvg-GdkPixbuf.html
+share/doc/rsvg/rsvg.devhelp
+share/doc/rsvg/rsvg.devhelp2
+share/doc/rsvg/rsvg.html
+share/doc/rsvg/style.css
+share/doc/rsvg/up.png
 share/gnome/pixmaps/svg-viewer.svg
+@dirrm share/doc/rsvg
 @dirrm include/librsvg-2/librsvg
 @dirrm include/librsvg-2
 @exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile
index e61c2b20004a..19ea8a81c1c2 100644
--- a/graphics/poppler-qt/Makefile
+++ b/graphics/poppler-qt/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/poppler-qt/Makefile,v 1.6 2006/04/12 17:10:20 ahze Exp $
+#    $MCom: ports/graphics/poppler-qt/Makefile,v 1.9 2006/10/10 20:22:10 mezz Exp $
 
 PORTREVISION=	0
 PKGNAMESUFFIX=	-qt
diff --git a/graphics/poppler-qt/pkg-plist b/graphics/poppler-qt/pkg-plist
index bc152aa05973..d342c0288363 100644
--- a/graphics/poppler-qt/pkg-plist
+++ b/graphics/poppler-qt/pkg-plist
@@ -1,3 +1,4 @@
+include/poppler/poppler-link-qt3.h
 include/poppler/poppler-page-transition.h
 include/poppler/poppler-qt.h
 lib/libpoppler-qt.a
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 2187c2dbe9e8..99a265f5326f 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 marcus@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/poppler/Makefile,v 1.23 2006/04/12 17:10:20 ahze Exp $
+#   $MCom: ports/graphics/poppler/Makefile,v 1.30 2006/09/30 04:55:20 ahze Exp $
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.5.3
+PORTVERSION=	0.5.4
 PORTREVISION?=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
@@ -15,11 +15,12 @@ MASTER_SITES=	http://poppler.freedesktop.org/
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	A PDF rendering library
 
+RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
+
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-xpdf-headers \
 		--with-html-dir=${DOCSDIR}
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 19f573b59e7f..58d7459cd7e7 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.5.3.tar.gz) = d06207536555f5711e7bc61711c1b8a0
-SHA256 (poppler-0.5.3.tar.gz) = 5cfabff39670610fa8f5c33da7b9b0ae89d445445be6d6c245cdce8bf3f24190
-SIZE (poppler-0.5.3.tar.gz) = 1049900
+MD5 (poppler-0.5.4.tar.gz) = 053fdfd70533ecce1a06353fa945f061
+SHA256 (poppler-0.5.4.tar.gz) = ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
+SIZE (poppler-0.5.4.tar.gz) = 1062401
diff --git a/graphics/poppler/files/patch-Makefile.in b/graphics/poppler/files/patch-Makefile.in
index a93d4d7c840d..02c8919d0713 100644
--- a/graphics/poppler/files/patch-Makefile.in
+++ b/graphics/poppler/files/patch-Makefile.in
@@ -1,20 +1,24 @@
---- Makefile.in.orig	Tue May 23 07:59:21 2006
-+++ Makefile.in	Tue May 23 08:00:41 2006
+--- Makefile.in.orig	Thu Sep 21 20:54:29 2006
++++ Makefile.in	Sat Sep 30 10:51:57 2006
 @@ -76,7 +76,7 @@
  DATA = $(pkgconfig_DATA)
  ETAGS = etags
  CTAGS = ctags
 -DIST_SUBDIRS = goo fofi splash poppler utils glib qt test qt4
-+DIST_SUBDIRS = goo fofi splash poppler utils glib qt qt4
++DIST_SUBDIRS = goo fofi splash poppler utils glib qt
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
-@@ -254,7 +254,7 @@
- @BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
+@@ -254,10 +254,10 @@
+ @BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
+ @BUILD_POPPLER_QT_TRUE@qt_subdir = qt
+ @BUILD_POPPLER_QT_TRUE@qt_pc_file = poppler-qt.pc
+-@BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
++@BUILD_POPPLER_QT4_TRUE@qt4_subdir =
  @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
  @BUILD_UTILS_TRUE@utils_subdir = utils
 -SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
-+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) $(qt4_subdir)
++SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir)
  EXTRA_DIST = \
  	README-XPDF				\
  	poppler.pc.in				\
diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure
index c8c36c268cea..2af4940c3582 100644
--- a/graphics/poppler/files/patch-configure
+++ b/graphics/poppler/files/patch-configure
@@ -1,11 +1,119 @@
---- configure.orig	Tue May 23 08:07:51 2006
-+++ configure	Tue May 23 08:08:07 2006
-@@ -24856,7 +24856,7 @@
-     fi
+--- configure.orig	Sat Sep 30 00:27:43 2006
++++ configure	Sat Sep 30 00:30:00 2006
+@@ -24957,12 +24957,12 @@
+         pkg_cv_POPPLER_GLIB_CFLAGS="$POPPLER_GLIB_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib >= 2.6\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.4.0 glib >= 2.6" 2>/dev/null`
++  pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6" 2>/dev/null`
+ else
+   pkg_failed=yes
  fi
+@@ -24975,12 +24975,12 @@
+         pkg_cv_POPPLER_GLIB_LIBS="$POPPLER_GLIB_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib >= 2.6\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.4.0 glib >= 2.6" 2>/dev/null`
++  pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -24999,14 +24999,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6"`
++	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6"`
+         else
+-	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib >= 2.6"`
++	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$POPPLER_GLIB_PKG_ERRORS" >&5
+ 
+-	{ { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.4.0 glib >= 2.6) were not met:
++	{ { echo "$as_me:$LINENO: error: Package requirements (gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) were not met:
+ 
+ $POPPLER_GLIB_PKG_ERRORS
+ 
+@@ -25017,7 +25017,7 @@
+ and POPPLER_GLIB_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (gdk-2.0 >= 2.4.0 glib >= 2.6) were not met:
++echo "$as_me: error: Package requirements (gdk-2.0 >= 2.4.0 glib-2.0 >= 2.6) were not met:
+ 
+ $POPPLER_GLIB_PKG_ERRORS
+ 
+@@ -25298,10 +25298,10 @@
+   enable_poppler_qt="try"
+ fi;
+ 
+-if test x$enable_poppler_qt = xyes; then
++if test "$enable_poppler_qt" = xyes; then
+ 
+-qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
+-qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
++qt_incdirs="$QTINC /usr/X11R6/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
++qt_libdirs="$QTLIB /usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
+ if test -n "$QTDIR" ; then
+     qt_incdirs="$QTDIR/include $qt_incdirs"
+     qt_libdirs="$QTDIR/lib $qt_libdirs"
+@@ -25488,8 +25488,8 @@
+ 
+ elif test x$enable_poppler_qt = xtry; then
+ 
+-qt_incdirs="$QTINC /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
+-qt_libdirs="$QTLIB /usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
++qt_incdirs="$QTINC /usr/X11R6/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt3/include /usr/lib/qt/include /usr/share/qt3/include"
++qt_libdirs="$QTLIB /usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt3/lib /usr/lib/qt/lib /usr/share/qt3/lib"
+ if test -n "$QTDIR" ; then
+     qt_incdirs="$QTDIR/include $qt_incdirs"
+     qt_libdirs="$QTDIR/lib $qt_libdirs"
+@@ -25700,8 +25700,8 @@
+ if test x$enable_poppler_qt4 = xyes; then
+ 
+ have_qt4=no
+-qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
+-qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
++qt4_incdirs="/usr/X11R6/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
++qt4_libdirs="/usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
+ 
+ if test -n "$QTDIR" ; then
+     qt4_incdirs="$QTDIR/include $qt4_incdirs"
+@@ -25773,8 +25773,8 @@
+ elif test x$enable_poppler_qt4 = xtry; then
+ 
+ have_qt4=no
+-qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
+-qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
++qt4_incdirs="/usr/X11R6/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include /usr/lib/qt4/include"
++qt4_libdirs="/usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib /usr/lib/qt4/lib"
+ 
+ if test -n "$QTDIR" ; then
+     qt4_incdirs="$QTDIR/include $qt4_incdirs"
+@@ -25863,8 +25863,8 @@
+ 
+ have_qt4testlib=no
+ 
+-qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
+-qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
++qt4_incdirs="/usr/X11R6/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
++qt4_libdirs="/usr/X11R6/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
  
--if test "x$have_qt" == "xyes"; then
-+if test "x$have_qt" = "xyes"; then
-     ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ if test -n "$QTDIR" ; then
+     qt4_incdirs="$QTDIR/include $qt4_incdirs"
diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
index 29d9a5fa298f..756621674b26 100644
--- a/graphics/poppler/files/patch-qt_Makefile.in
+++ b/graphics/poppler/files/patch-qt_Makefile.in
@@ -1,5 +1,5 @@
---- qt/Makefile.in.orig	Thu Jan 12 21:37:56 2006
-+++ qt/Makefile.in	Thu Jan 12 21:38:47 2006
+--- qt/Makefile.in.orig	Sat Sep 30 00:10:34 2006
++++ qt/Makefile.in	Sat Sep 30 00:11:29 2006
 @@ -63,16 +63,14 @@
  libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -8,32 +8,32 @@
 -	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 +libpoppler_qt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
- 	poppler-page.lo poppler-page-transition.lo
+ 	poppler-link.lo poppler-page.lo poppler-page-transition.lo
  libpoppler_qt_la_OBJECTS = $(am_libpoppler_qt_la_OBJECTS)
  PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
  test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS)
 -test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 -	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+test_poppler_qt_DEPENDENCIES = libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++test_poppler_qt_DEPENDENCIES = 	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -273,7 +271,7 @@
+@@ -281,7 +279,7 @@
  	poppler-private.h
  
  libpoppler_qt_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
++	-lpoppler -lqt-mt			\
  	$(POPPLER_QT_LIBS)			\
  	$(FREETYPE_LIBS)
  
-@@ -281,7 +279,7 @@
+@@ -290,7 +288,7 @@
         test-poppler-qt.cpp
  
  test_poppler_qt_LDADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
++	-lpoppler -lqt-mt			\
  	libpoppler-qt.la			\
  	$(POPPLER_QT_LIBS)			\
  	$(FREETYPE_LIBS)
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 88cf20d30f1f..547c93f81559 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,56 +1,49 @@
---- utils/Makefile.in.orig	Sat May  6 22:21:41 2006
-+++ utils/Makefile.in	Sat May  6 22:22:56 2006
-@@ -61,42 +61,35 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+--- utils/Makefile.in.orig	Sat Sep 30 00:11:46 2006
++++ utils/Makefile.in	Sat Sep 30 00:13:02 2006
+@@ -60,35 +60,35 @@
+ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
- am__DEPENDENCIES_1 =
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdffonts_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdffonts_DEPENDENCIES = 
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
  	$(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdfimages_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfimages_DEPENDENCIES = 
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdfinfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfinfo_DEPENDENCIES = 
  am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
  	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
--pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdftohtml_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftohtml_DEPENDENCIES =
  am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h
  @BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
  @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdftoppm_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftoppm_DEPENDENCIES =
  am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdftops_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftops_DEPENDENCIES =
  am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
--	$(am__DEPENDENCIES_1)
-+pdftotext_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftotext_DEPENDENCIES =
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -294,7 +287,7 @@ INCLUDES = \
+@@ -291,7 +291,7 @@
  	$(UTILS_CFLAGS)
  
  LDADD = \
@@ -58,4 +51,4 @@
 +	-lpoppler				\
  	$(UTILS_LIBS)
  
- 
+ dist_man1_MANS = \
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index f5deff12f13d..7b35c95741b6 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#	$MCom: ports/graphics/py-cairo/Makefile,v 1.15 2005/10/12 16:31:53 ahze Exp $
+#	$MCom: ports/graphics/py-cairo/Makefile,v 1.20 2006/09/06 22:05:06 marcus Exp $
 #
 
 PORTNAME=	cairo
-PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	graphics python
 MASTER_SITES=	http://cairographics.org/releases/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -26,20 +25,11 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget gnomehack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-pygtk
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_SVG) && !exists(${LOCALBASE}/lib/libsvg-cairo.a)
-PLIST_SUB+=	SVG="@comment "
-.else
-PLIST_SUB+=	SVG=""
-LIB_DEPENDS+=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
-.endif
-
-pre-everything::
-	@${ECHO_MSG} "Disable SVG support by defining WITHOUT_SVG"
-	@${ECHO_MSG}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
 		s|SUBDIRS = cairo examples test|SUBDIRS = cairo examples|' \
diff --git a/graphics/py-cairo/distinfo b/graphics/py-cairo/distinfo
index 5c11a7531ec6..875475752ea9 100644
--- a/graphics/py-cairo/distinfo
+++ b/graphics/py-cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (pycairo-1.0.2.tar.gz) = 5bb6a202ebc3990712bced1da6dfb7a8
-SHA256 (pycairo-1.0.2.tar.gz) = f4827f7d8f5fd423b58fef33c95790c6615cd6fad7d68dc780c343ed292b8d9a
-SIZE (pycairo-1.0.2.tar.gz) = 469704
+MD5 (pycairo-1.2.2.tar.gz) = 83a2e06d9fc3530753701d580a18087e
+SHA256 (pycairo-1.2.2.tar.gz) = ab10b00c209e9feaebfff944d411f300ca032d09d3ebb64e3498acf9fea09c6d
+SIZE (pycairo-1.2.2.tar.gz) = 482417
diff --git a/graphics/py-cairo/files/patch-cairo_pycairo-font.c b/graphics/py-cairo/files/patch-cairo_pycairo-font.c
deleted file mode 100644
index ca7321d6f549..000000000000
--- a/graphics/py-cairo/files/patch-cairo_pycairo-font.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- cairo/pycairo-font.c.orig	Mon Aug  1 05:31:41 2005
-+++ cairo/pycairo-font.c	Wed Aug  3 01:09:38 2005
-@@ -196,6 +196,7 @@ scaled_font_new (PyTypeObject *type, PyO
-     PycairoFontFace *ff;
-     PycairoFontOptions *fo;
-     PycairoMatrix *mx1, *mx2;
-+    PyObject *o;
- 
-     if (!PyArg_ParseTuple(args, "O!O!O!O!:ScaledFont.__new__",
- 			  &PycairoFontFace_Type, &ff,
-@@ -204,7 +205,7 @@ scaled_font_new (PyTypeObject *type, PyO
- 			  &PycairoFontOptions_Type, &fo))
- 	return NULL;
- 
--    PyObject *o = type->tp_alloc(type, 0);
-+    o = type->tp_alloc(type, 0);
-     if (o) {
- 	cairo_scaled_font_t *scaled_font = cairo_scaled_font_create 
- 	    (ff->font_face, &mx1->matrix, &mx2->matrix, fo->font_options);
diff --git a/graphics/py-cairo/pkg-plist b/graphics/py-cairo/pkg-plist
index bfc5bf308852..0d5ac3d2b6d6 100644
--- a/graphics/py-cairo/pkg-plist
+++ b/graphics/py-cairo/pkg-plist
@@ -4,8 +4,6 @@ include/pycairo/pycairo.h
 %%PYTHON_SITELIBDIR%%/cairo/__init__.pyo
 %%PYTHON_SITELIBDIR%%/cairo/_cairo.la
 %%PYTHON_SITELIBDIR%%/cairo/_cairo.so
-%%SVG%%%%PYTHON_SITELIBDIR%%/cairo/svg.la
-%%SVG%%%%PYTHON_SITELIBDIR%%/cairo/svg.so
 libdata/pkgconfig/pycairo.pc
 @dirrm %%PYTHON_SITELIBDIR%%/cairo
 @dirrm include/pycairo
author	marcus <marcus@FreeBSD.org>	2006-10-14 16:35:50 +0800
committer	marcus <marcus@FreeBSD.org>	2006-10-14 16:35:50 +0800
commit	9b9c902909a87b589432804ec4e8a7fa23943ff4 (patch)
tree	aa2e443568b953ce772558b2be74a8451e38ec3d /graphics
parent	f5a682ff4e0a5d73ce8bffeb88c799eb8ef0e816 (diff)
download	freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.tar.gz freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.tar.zst freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.zip