- Update to version 2.0.10

- Remove workaround to build on 10.0-CURRENT

Changes:
Upgrades to the build system have been made. The documentation has been
updated and other minor improvements made.

3 files changed, 27 insertions, 26 deletions

diff --git a/x11-toolkits/c++-gtk-utils/Makefile b/x11-toolkits/c++-gtk-utils/Makefile
index da00eb314a48..164e908a5bd3 100644
--- a/x11-toolkits/c++-gtk-utils/Makefile
+++ b/x11-toolkits/c++-gtk-utils/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	c++-gtk-utils
-PORTVERSION=	2.0.9
-PORTREVISION=	1
+PORTVERSION=	2.0.10
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/cxx-gtk-utils/cxx-gtk-utils/${PORTVERSION}/
 DISTNAME=	c%2B%2B-gtk-utils-${PORTVERSION}
@@ -21,11 +20,13 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 USE_GCC=	4.4+
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 gnomehack
 USE_LDCONFIG=	yes
 
+CONFIGURE_SCRIPT=	configure-gtk2
+CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-CONFIGURE_ARGS+=--docdir=${DOCSDIR}
 
 OPTIONS_DEFINE=	DEBUG
 
@@ -35,23 +36,4 @@ OPTIONS_DEFINE=	DEBUG
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
-		${REINPLACE_FILE}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 1000000
-USE_AUTOTOOLS=	autoconf aclocal libtool
-ACLOCAL_ARGS=	-I${LOCALBASE}/share/aclocal
-REINPLACE_FILE=	${WRKSRC}/Makefile.am
-
-pre-configure:
-	@cd ${WRKSRC} && ./bootstrap-gtk2.sh
-
-.else
-CONFIGURE_SCRIPT=	configure-gtk2
-REINPLACE_FILE=		${WRKSRC}/Makefile.in
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/c++-gtk-utils/distinfo b/x11-toolkits/c++-gtk-utils/distinfo
index 3fdde7a27061..3bad6172919b 100644
--- a/x11-toolkits/c++-gtk-utils/distinfo
+++ b/x11-toolkits/c++-gtk-utils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (c%2B%2B-gtk-utils-2.0.9.tar.gz) = ed84c411f41ea853577a8a89002ae206273107ba4df4451ebf24c2bcb2afeeeb
-SIZE (c%2B%2B-gtk-utils-2.0.9.tar.gz) = 2100195
+SHA256 (c%2B%2B-gtk-utils-2.0.10.tar.gz) = f33790fa3ea06407da6e828b741f533747a9cab172e56e6673800aeba9f1c5b6
+SIZE (c%2B%2B-gtk-utils-2.0.10.tar.gz) = 2200851
diff --git a/x11-toolkits/c++-gtk-utils/pkg-plist b/x11-toolkits/c++-gtk-utils/pkg-plist
index c4f62a6ec80d..a309d5f8f0bb 100644
--- a/x11-toolkits/c++-gtk-utils/pkg-plist
+++ b/x11-toolkits/c++-gtk-utils/pkg-plist
@@ -59,6 +59,7 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/async__result_8h.html
 %%DOCSDIR%%/2.0/html/async__result_8h_source.html
 %%DOCSDIR%%/2.0/html/bc_s.png
+%%DOCSDIR%%/2.0/html/bdwn.png
 %%DOCSDIR%%/2.0/html/callback_8h.html
 %%DOCSDIR%%/2.0/html/callback_8h_source.html
 %%DOCSDIR%%/2.0/html/cgu__config_8h.html
@@ -280,6 +281,7 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/closed.png
 %%DOCSDIR%%/2.0/html/convert_8h.html
 %%DOCSDIR%%/2.0/html/convert_8h_source.html
+%%DOCSDIR%%/2.0/html/dir_101f02d72531e1268e20029abbed11e1.html
 %%DOCSDIR%%/2.0/html/do__if_8h.html
 %%DOCSDIR%%/2.0/html/do__if_8h_source.html
 %%DOCSDIR%%/2.0/html/doxygen.css
@@ -292,6 +294,22 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/file__print__manager_8h.html
 %%DOCSDIR%%/2.0/html/file__print__manager_8h_source.html
 %%DOCSDIR%%/2.0/html/files.html
+%%DOCSDIR%%/2.0/html/ftv2blank.png
+%%DOCSDIR%%/2.0/html/ftv2cl.png
+%%DOCSDIR%%/2.0/html/ftv2doc.png
+%%DOCSDIR%%/2.0/html/ftv2folderclosed.png
+%%DOCSDIR%%/2.0/html/ftv2folderopen.png
+%%DOCSDIR%%/2.0/html/ftv2lastnode.png
+%%DOCSDIR%%/2.0/html/ftv2link.png
+%%DOCSDIR%%/2.0/html/ftv2mlastnode.png
+%%DOCSDIR%%/2.0/html/ftv2mnode.png
+%%DOCSDIR%%/2.0/html/ftv2mo.png
+%%DOCSDIR%%/2.0/html/ftv2node.png
+%%DOCSDIR%%/2.0/html/ftv2ns.png
+%%DOCSDIR%%/2.0/html/ftv2plastnode.png
+%%DOCSDIR%%/2.0/html/ftv2pnode.png
+%%DOCSDIR%%/2.0/html/ftv2splitbar.png
+%%DOCSDIR%%/2.0/html/ftv2vertline.png
 %%DOCSDIR%%/2.0/html/functions.html
 %%DOCSDIR%%/2.0/html/functions_0x62.html
 %%DOCSDIR%%/2.0/html/functions_0x63.html
@@ -387,6 +405,7 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/namespacemembers_type.html
 %%DOCSDIR%%/2.0/html/namespaces.html
 %%DOCSDIR%%/2.0/html/nav_f.png
+%%DOCSDIR%%/2.0/html/nav_g.png
 %%DOCSDIR%%/2.0/html/nav_h.png
 %%DOCSDIR%%/2.0/html/notifier_8h.html
 %%DOCSDIR%%/2.0/html/notifier_8h_source.html