5 files changed, 16 insertions, 32 deletions
diff --git a/deskutils/chmsee/Makefile b/deskutils/chmsee/Makefile
index 5f0c5a030877..e0ca8b0eba76 100644
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@@ -7,17 +7,18 @@
 
 PORTNAME=	chmsee
 PORTVERSION=	0.9.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://chmsee.gro.clinux.org/
 
 MAINTAINER=	liu_yinghong@yahoo.com.cn
 COMMENT=	A viewer for Microsoft Help "CHM" files
 
-LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib
+LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib \
+    		libgtkhtml-3.8.15:${PORTSDIR}/www/gtkhtml38
 
 USE_GETTEXT=	yes
-USE_GNOME=	gtk20 libglade2 gnomeprefix gnomehack libgnome gtkhtml3
+USE_GNOME=	gtk20 libglade2 gnomeprefix gnomehack libgnome
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -27,8 +28,4 @@ USE_BZIP2=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
-	    	${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 45b2019e452a..45b3ac2807c7 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	2.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	finance gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.gnucash.org/pub/gnucash/sources/stable/
@@ -20,7 +20,8 @@ COMMENT=	Quicken-like money and finance manager
 BUILD_DEPENDS=	guile>=1.6.8_2:${PORTSDIR}/lang/guile
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		ofx.3:${PORTSDIR}/finance/libofx \
-		gwrap-core-runtime.0:${PORTSDIR}/devel/g-wrap
+		gwrap-core-runtime.0:${PORTSDIR}/devel/g-wrap \
+    		libgtkhtml-3.8.15:${PORTSDIR}/www/gtkhtml38
 RUN_DEPENDS=	guile>=1.6.8_2:${PORTSDIR}/lang/guile \
 		${LOCALBASE}/share/guile/1.6/slibcat:${PORTSDIR}/lang/slib-guile \
 		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
@@ -38,7 +39,7 @@ USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_XPM=	yes
 USE_PERL5=	yes
-USE_GNOME=	gnomeprefix gtkhtml3 libgsf_gnome libglade2 \
+USE_GNOME=	gnomeprefix libgsf_gnome libglade2 \
 		libgnomeprint libgnomeprintui
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -80,8 +81,7 @@ PLIST_SUB=	AQBANKING="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${datarootdir}/info|${PREFIX}/info| ; \
-	    	s|libgtkhtml-3.8|libgtkhtml-3.14|g' \
+	@${REINPLACE_CMD} -e 's|$${datarootdir}/info|${PREFIX}/info|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$(datadir)/aclocal|${PREFIX}/share/aclocal|' \
 		${WRKSRC}/Makefile.in
diff --git a/finance/gnucash/files/patch-src_gnome-utils_gnc-html.c b/finance/gnucash/files/patch-src_gnome-utils_gnc-html.c
deleted file mode 100644
index 92058ac13ade..000000000000
--- a/finance/gnucash/files/patch-src_gnome-utils_gnc-html.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gnome-utils/gnc-html.c.orig	Tue Feb 20 23:18:48 2007
-+++ src/gnome-utils/gnc-html.c	Tue Feb 20 23:18:38 2007
-@@ -1325,7 +1325,7 @@
-     return;
-   }
- 
--  gtk_html_print(GTK_HTML(html->html), ps->context);
-+  gtk_html_print_page(GTK_HTML(html->html), ps->context);
-   gnc_print_session_done(ps);
- }
- 
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 777be4314be5..78c24f6393da 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	erwn
 PORTVERSION=	0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www editors
 MASTER_SITES=	http://lisas.de/erwin/
 DISTNAME=	erwin-${PORTVERSION}
@@ -16,14 +16,14 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple GTK+-2 HTML editor
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget gtkhtml3 gtksourceview
+USE_GNOME=	gnomehack gnomeprefix gnometarget gtksourceview
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		erwin.1
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|gtkhtml-3.6|gtkhtml-3.14|g" \
+	@${REINPLACE_CMD} -e "s|gtkhtml-3.6|gtkhtml-3.8|g" \
 		${WRKSRC}/configure
 
 post-install:
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index 9485b733829e..713724bce378 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	peacock
 PORTVERSION=	1.9.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,13 +15,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	A GUI-based HTML Editor for GTK+/GNOME
 
+LIB_DEPENDS=	libgtkhtml-3.8.15:${PORTSDIR}/www/gtkhtml38
+
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui gtksourceview gtkhtml3
+USE_GNOME=	gnomeprefix gnomehack libgnomeui gtksourceview
 GNU_CONFIGURE=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
-	    	${WRKSRC}/configure
-
 .include <bsd.port.mk>