diff -urN mozilla-bonobo.orig/Makefile mozilla-bonobo/Makefile
--- mozilla-bonobo.orig/Makefile	Fri May 19 21:59:08 2006
+++ mozilla-bonobo/Makefile	Wed Jul 26 22:46:24 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		mozilla-bonobo
-PORTVERSION=		0.4.0
-PORTREVISION=		6
+PORTVERSION=		0.4.2.1
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	moz-bonobo
@@ -15,43 +14,31 @@
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		A Netscape/Mozilla plugin using Bonobo controls to display files
 
+LIB_DEPENDS=		nspr4.1:${PORTSDIR}/devel/nspr/
 BUILD_DEPENDS=		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 RUN_DEPENDS=		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
 MOZILLA=		mozilla
 HEADERS_SUFX=
 
-.if !defined(WITH_MOZILLA)
 MOZILLA=		mozilla
 HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
-MOZILLA=		mozilla-devel
-HEADERS_SUFX=		-devel
-.else
-MOZILLA=		mozilla
-HEADERS_SUFX=
-.endif
-.endif
 
 USE_X_PREFIX=		yes
-USE_GNOME=		gnomeprefix libgnomeui libgnomeprint
-GNU_CONFIGURE=	yes
+USE_GNOME=		gnomeprefix libgnomeui libgnomeprint pkgconfig
+GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS=		--with-plugin-install-dir="${PREFIX}/lib/browser_plugins" \
 			--with-mozilla-include-dir="${X11BASE}/include/mozilla${HEADERS_SUFX}"
+CONFIGURE_ENV=		CPPFLAGS="`pkg-config --cflags nspr`"	\
+			LDFLAGS="${LDFLAGS} `pkg-config --libs nspr`"
 
-BROKEN=	"Does not build with new Mozilla"
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default mozilla-bonobo uses www/mozilla for html rendering, but you can"
-	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  mozilla-devel "
-	@${ECHO_MSG} ""
+GCONF_SCHEMAS=		${PORTNAME}.schemas
+PORTDOCS=		README AUTHORS ChangeLog NEWS TODO
+PLIST_FILES=		bin/mozilla-bonobo-viewer	\
+			lib/browser_plugins/libmozilla_bonobo.so
 
-post-patch:
+pre-configure:
 	@${REINPLACE_CMD} -e \
 		's|\$${prefix}/doc/mozilla-bonobo|${DOCSDIR}| ; \
 		 s|COPYING\\|\\| ; \
diff -urN mozilla-bonobo.orig/distinfo mozilla-bonobo/distinfo
--- mozilla-bonobo.orig/distinfo	Sun Jan  1 15:14:13 2006
+++ mozilla-bonobo/distinfo	Wed Jul 26 16:49:08 2006
@@ -1,3 +1,3 @@
-MD5 (mozilla-bonobo-0.4.0.tar.gz) = e8080758f7319ac3255ba7cc4bdeb514
-SHA256 (mozilla-bonobo-0.4.0.tar.gz) = a6eac6c3bdfa53a50de0a3ed8a1cbe7e6b82889841f2d1225d22f64474bcd526
-SIZE (mozilla-bonobo-0.4.0.tar.gz) = 317184
+MD5 (mozilla-bonobo-0.4.2.1.tar.gz) = 101ad2c3f8bb25d0ce89e2a7820143b7
+SHA256 (mozilla-bonobo-0.4.2.1.tar.gz) = 1761aecbad2d977fa87d5f7c53151e7bf7df835720cfa6e6fce094b978455736
+SIZE (mozilla-bonobo-0.4.2.1.tar.gz) = 263972
diff -urN mozilla-bonobo.orig/pkg-plist mozilla-bonobo/pkg-plist
--- mozilla-bonobo.orig/pkg-plist	Wed Jul  7 18:23:49 2004
+++ mozilla-bonobo/pkg-plist	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
-bin/mozilla-bonobo-viewer
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/mozilla-bonobo.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/mozilla-bonobo.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/mozilla-bonobo.schemas > /dev/null || /usr/bin/true
-lib/browser_plugins/libmozilla_bonobo.so
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%