Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/misc/yelp/Attic/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/misc/yelp/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.37
retrieving revision 1.41
diff -u -p -r1.37 -r1.41
--- pkgsrc/misc/yelp/Attic/Makefile	2005/12/26 23:39:33	1.37
+++ pkgsrc/misc/yelp/Attic/Makefile	2006/01/24 07:32:26	1.41
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2005/12/26 23:39:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.41 2006/01/24 07:32:26 wiz Exp $
 #
 
-DISTNAME=		yelp-2.12.1
+DISTNAME=		yelp-2.12.2
+PKGREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.12/}
 EXTRACT_SUFX=		.tar.bz2
@@ -10,9 +11,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Help browser for GNOME 2 desktop
 
-PKG_FAIL_REASON+=	"Broken on NetBSD/i386 3.0 in pkgsrc-2005Q4"
-PKG_FAIL_REASON+=	"Will be removed in pkgsrc-2006Q1 unless fixed"
-
 DEPENDS+=		docbook>=4.2:../../textproc/docbook
 BUILD_USES_MSGFMT=	yes
 
@@ -32,6 +30,11 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.yelp
 .include "../../www/mozilla/gecko-options.mk"
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mfirefox)
+# Require a version that has the .pc files in it.
+BUILDLINK_DEPENDS.firefox+=     firefox>=1.5nb2
+.endif
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"