Index: head/devel/libglade2/Makefile
===================================================================
--- head/devel/libglade2/Makefile	(revision 496604)
+++ head/devel/libglade2/Makefile	(revision 496605)
@@ -1,56 +1,65 @@
 # Created by: Ade Lovett <ade@lovett.com>
 # $FreeBSD$
-#   $MCom: ports/devel/libglade2/Makefile,v 1.26 2007/08/01 16:13:48 mezz Exp $
 
 PORTNAME=	libglade2
 PORTVERSION=	2.6.4
 PORTREVISION?=	9
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME glade library
 
+LICENSE=	LGPL20
+
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
+
 USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
 RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
 
-GNU_CONFIGURE=	yes
-USES+=		gmake libtool:keepla pathfix pkgconfig
-USE_GNOME=	libxml2 gtk20 referencehack
+USES+=		gmake gnome libtool:keepla pathfix pkgconfig
+USE_GNOME=	cairo gdkpixbuf2 libxml2 gtk20 referencehack
 USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc \
 		--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \
 		CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports"
 
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_DEFAULT=PYTHON
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python:2.7
 PLIST_SUB+=	PYTHON=""
 .else
 PLIST_SUB+=	PYTHON="@comment "
+.endif
 
-post-patch:
+post-patch-PYTHON-off:
 	@${REINPLACE_CMD} -E 's/in (python.*)+ none/in none/' \
 		${WRKSRC}/configure
-.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib-2.0|gmodule-2.0 glib-2.0|g' \
+		${WRKSRC}/configure
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/libglade/2.0
 
 .include <bsd.port.mk>
 
 .endif
Index: head/devel/libglade2/pkg-plist
===================================================================
--- head/devel/libglade2/pkg-plist	(revision 496604)
+++ head/devel/libglade2/pkg-plist	(revision 496605)
@@ -1,16 +1,16 @@
 %%PYTHON%%bin/libglade-convert
 include/libglade-2.0/glade/glade-build.h
 include/libglade-2.0/glade/glade-init.h
 include/libglade-2.0/glade/glade-parser.h
 include/libglade-2.0/glade/glade-xml.h
 include/libglade-2.0/glade/glade.h
 lib/libglade-2.0.a
 lib/libglade-2.0.la
 lib/libglade-2.0.so
 lib/libglade-2.0.so.0
 lib/libglade-2.0.so.0.0.7
 libdata/pkgconfig/libglade-2.0.pc
 share/xml/libglade/glade-2.0.dtd
-@unexec %%XMLCATALOG%% --noout --del %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true
-@exec %%XMLCATALOG%% --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true
+@postunexec %%XMLCATALOG%% --noout --del %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true
+@postexec %%XMLCATALOG%% --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true
 @dir lib/libglade/2.0