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.9
retrieving revision 1.30
diff -u -p -r1.9 -r1.30
--- pkgsrc/misc/yelp/Attic/Makefile	2004/02/09 18:47:38	1.9
+++ pkgsrc/misc/yelp/Attic/Makefile	2005/05/31 15:54:26	1.30
@@ -1,33 +1,54 @@
-# $NetBSD: Makefile,v 1.9 2004/02/09 18:47:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/31 15:54:26 drochner Exp $
 #
 
-DISTNAME=		yelp-2.4.2
-PKGREVISION=		4
+DISTNAME=		yelp-2.10.0
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.4/}
+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.2:../../misc/gnome2-dirs
+DEPENDS+=		docbook>=4.2:../../textproc/docbook
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=		yes
-USE_GNU_TOOLS+=		make
+BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.4
+
+USE_DIRS+=		gnome2-1.5
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--with-html-widget=gtkhtml2
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/GConf2/buildlink3.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 "../../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/buildlink2.mk"
+.include "../../www/libgtkhtml/buildlink3.mk"
+.if ${GECKO_PROVIDER} == "firefox"
+# firefox didn't have a pkgconfig file before 1.0.4
+BUILDLINK_DEPENDS.firefox+= firefox>=1.0.4
+.include "../../www/firefox/buildlink3.mk"
+.else
+.include "../../www/mozilla-gtk2/buildlink3.mk"
+.endif
 
 .include "../../mk/bsd.pkg.mk"