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.18
retrieving revision 1.35
diff -u -p -r1.18 -r1.35
--- pkgsrc/misc/yelp/Attic/Makefile	2004/04/01 18:48:36	1.18
+++ pkgsrc/misc/yelp/Attic/Makefile	2005/10/12 22:04:01	1.35
@@ -1,30 +1,33 @@
-# $NetBSD: Makefile,v 1.18 2004/04/01 18:48:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2005/10/12 22:04:01 jmmv Exp $
 #
 
-DISTNAME=		yelp-2.6.0
+DISTNAME=		yelp-2.10.0
+PKGREVISION=		1
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.6/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.10/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		xtraeme@NetBSD.org
+MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Help browser for GNOME 2 desktop
 
-DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		docbook>=4.2:../../textproc/docbook
 BUILD_USES_MSGFMT=	yes
 
 BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.4
 
-USE_BUILDLINK3=		yes
-USE_GNU_TOOLS+=		make
+USE_DIRS+=		gnome2-1.5
+USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-html-widget=gtkhtml2
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.yelp
+.include "../../www/mozilla/gecko-options.mk"
+.include "../../mk/bsd.options.mk"
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -33,13 +36,14 @@ CONFIGURE_ARGS+=	--with-html-widget=gtkh
 .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 "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/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 "../../mk/bsd.pkg.mk"