4 files changed, 72 insertions, 15 deletions

diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index d9e0bf92c056..3f889fb76d2b 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -6,32 +6,62 @@
 #
 
 PORTNAME=	devhelp
-PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTVERSION=	0.10
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,}
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	rui@ruilopes.com
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Developer help browser for GNOME 2
 
-BROKEN=		Does not build
+BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
-BUILD_DEPENDS=	${X11BASE}/lib/mozilla/libgtkembedmoz.so:${PORTSDIR}/www/mozilla
-RUN_DEPENDS=	${BUILD_DEPENDS}
+MOZILLA=	mozilla
+
+.if !defined(WITH_MOZILLA)
+MOZILLA=	mozilla
+.else
+.if ${WITH_MOZILLA}=="firefox"
+MOZILLA=	firefox
+.endif
+.endif
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libgtkhtml libgnomeui
+USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
+USE_RC_SUBR=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+GCONF_SCHEMAS=	devhelp.schemas
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-mozilla=${MOZILLA}
 
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${SED} -E 's,.*share/nls/.+$$,,g;s,^@dirrm share/((gnome/[^d]|pixmaps|application|locale).*|gnome$$),,;s,^@dirrm etc/gconf.*,,;s,^etc/gconf/gconf.*,,'|${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " By default the port 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} "  firefox       "
+	@${ECHO_MSG} ""
+
+
+post-patch:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+		-e 's|%%MOZILLA%%|${MOZILLA}|g' \
+		${FILESDIR}/devhelp.sh > ${WRKDIR}/devhelp.sh
+
+post-install:
+	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/devhelp.sh ${PREFIX}/etc/rc.d/000.devhelp.sh
+	@ldconfig -m ${X11BASE}/lib/${MOZILLA}
+
+.include <bsd.port.post.mk>
diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo
index 7f52fad58aa1..dcec4a7b4c26 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/devhelp-0.9.1.tar.bz2) = 2d6358178bbb4e74cf564b7c608d46fa
-SIZE (gnome2/devhelp-0.9.1.tar.bz2) = 372190
+MD5 (gnome2/devhelp-0.10.tar.bz2) = 14374f2a9bf952e58e2c4674afd2c6d6
+SIZE (gnome2/devhelp-0.10.tar.bz2) = 403189
diff --git a/devel/devhelp/files/devhelp.sh b/devel/devhelp/files/devhelp.sh
new file mode 100644
index 000000000000..86bb9b432296
--- /dev/null
+++ b/devel/devhelp/files/devhelp.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: devhelp
+# REQUIRE: ldconfig
+# KEYWORD: FreeBSD
+
+. /etc/rc.subr
+
+name=devhelp
+
+start_cmd=devhelp_start
+stop_cmd=:
+
+[ -z "$devhelp_libdir" ] && devhelp_libdir="%%X11BASE%%/lib/%%MOZILLA%%"
+
+devhelp_start() {
+    if [ -d "$devhelp_libdir" ]; then
+	/sbin/ldconfig -m "$devhelp_libdir"
+    fi
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 49f41bf2584a..c9ff21e47b8f 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -1,8 +1,5 @@
 bin/devhelp
-bin/devhelp-bin
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/devhelp.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/devhelp.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/devhelp.schemas > /dev/null || /usr/bin/true
+etc/rc.d/000.devhelp.sh
 include/devhelp-1.0/devhelp/dh-base.h
 include/devhelp-1.0/devhelp/dh-book-tree.h
 include/devhelp-1.0/devhelp/dh-error.h
@@ -41,17 +38,21 @@ share/locale/en_GB/LC_MESSAGES/devhelp.mo
 share/locale/es/LC_MESSAGES/devhelp.mo
 share/locale/fi/LC_MESSAGES/devhelp.mo
 share/locale/fr/LC_MESSAGES/devhelp.mo
+share/locale/gu/LC_MESSAGES/devhelp.mo
 share/locale/he/LC_MESSAGES/devhelp.mo
 share/locale/hi/LC_MESSAGES/devhelp.mo
 share/locale/hr/LC_MESSAGES/devhelp.mo
+share/locale/hu/LC_MESSAGES/devhelp.mo
 share/locale/is/LC_MESSAGES/devhelp.mo
 share/locale/it/LC_MESSAGES/devhelp.mo
 share/locale/ja/LC_MESSAGES/devhelp.mo
 share/locale/kn/LC_MESSAGES/devhelp.mo
 share/locale/ko/LC_MESSAGES/devhelp.mo
 share/locale/lv/LC_MESSAGES/devhelp.mo
+share/locale/mk/LC_MESSAGES/devhelp.mo
 share/locale/ml/LC_MESSAGES/devhelp.mo
 share/locale/ms/LC_MESSAGES/devhelp.mo
+share/locale/nb/LC_MESSAGES/devhelp.mo
 share/locale/nl/LC_MESSAGES/devhelp.mo
 share/locale/no/LC_MESSAGES/devhelp.mo
 share/locale/pa/LC_MESSAGES/devhelp.mo
@@ -59,6 +60,7 @@ share/locale/pl/LC_MESSAGES/devhelp.mo
 share/locale/pt/LC_MESSAGES/devhelp.mo
 share/locale/pt_BR/LC_MESSAGES/devhelp.mo
 share/locale/ru/LC_MESSAGES/devhelp.mo
+share/locale/rw/LC_MESSAGES/devhelp.mo
 share/locale/sk/LC_MESSAGES/devhelp.mo
 share/locale/sq/LC_MESSAGES/devhelp.mo
 share/locale/sr/LC_MESSAGES/devhelp.mo