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.25
retrieving revision 1.39
diff -u -p -r1.25 -r1.39
--- pkgsrc/misc/yelp/Attic/Makefile	2004/10/03 00:13:01	1.25
+++ pkgsrc/misc/yelp/Attic/Makefile	2005/12/31 12:32:42	1.39
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2004/10/03 00:13:01 tv Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/31 12:32:42 wiz Exp $
 #
 
-DISTNAME=		yelp-2.6.3
-PKGREVISION=	1
+DISTNAME=		yelp-2.12.1
+PKGREVISION=		1
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.6/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.12/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -16,31 +16,43 @@ BUILD_USES_MSGFMT=	yes
 
 BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.4
 
-USE_BUILDLINK3=		yes
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-html-widget=gtkhtml2
 
+GCONF2_SCHEMAS=		yelp.schemas
+
+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/buildlink3.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/libgtkhtml/buildlink3.mk"
+.include "../../www/mozilla/gecko-depends.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"