Index: x11-toolkits/gtk20/Makefile
===================================================================
RCS file: /import/FreeBSD-CVS/ports/x11-toolkits/gtk20/Makefile,v
retrieving revision 1.222
diff -u -p -u -r1.222 Makefile
--- x11-toolkits/gtk20/Makefile	4 Sep 2008 22:05:34 -0000	1.222
+++ x11-toolkits/gtk20/Makefile	23 Sep 2008 11:40:36 -0000
@@ -31,7 +31,9 @@ LATEST_LINK=	gtk20
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		cairo:${PORTSDIR}/graphics/cairo
+# XXX: cairo is used in all printbackends
 RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
@@ -39,7 +41,7 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomehack atk pango ltverhack
+USE_GNOME=	gnomehack atk glib20 pango ltverhack
 USE_GETTEXT=	yes
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
@@ -85,6 +87,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
 	@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
 		${WRKSRC}/gtk/Makefile.in
+	@${REINPLACE_CMD} -e 's/@GDK_EXTRA_LIBS@//g ; s/@GDK_EXTRA_CFLAGS@//g ;\
+		s/@GDK_PIXBUF_EXTRA_LIBS@//g ; s/@GDK_PIXBUF_EXTRA_CFLAGS@//g ;\
+		s/@GTK_EXTRA_LIBS@//g ; s/@GTK_EXTRA_CFLAGS@//g' \
+		${WRKSRC}/*-2.0.pc.in
 
 pre-build:
 	@${RM} -rf ${WRKSRC}/docs/gtk.info*