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.76
diff -u -p -r1.37 -r1.76
--- pkgsrc/misc/yelp/Attic/Makefile	2005/12/26 23:39:33	1.37
+++ pkgsrc/misc/yelp/Attic/Makefile	2008/04/15 18:27:48	1.76
@@ -1,55 +1,63 @@
-# $NetBSD: Makefile,v 1.37 2005/12/26 23:39:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.76 2008/04/15 18:27:48 drochner Exp $
 #
 
-DISTNAME=		yelp-2.12.1
+DISTNAME=		yelp-2.22.1
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.12/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		tech-pkg@NetBSD.org
+MAINTAINER=		pkgsrc-users@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
 
-BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.4
+BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.4
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c c++
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
+
+GCONF_SCHEMAS=		yelp.schemas
 
-CONFIGURE_ARGS+=	--with-html-widget=gtkhtml2
+.include "options.mk"
 
-GCONF2_SCHEMAS=		yelp.schemas
+BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
+BUILDLINK_API_DEPENDS.libgnome+=		libgnome>=2.14.0
+BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.14.0
+BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
+BUILDLINK_API_DEPENDS.libxml2+=			libxml2>=2.6.5
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.yelp
-.include "../../www/mozilla/gecko-options.mk"
-.include "../../mk/bsd.options.mk"
+BUILDLINK_DEPMETHOD.gnome-doc-utils+=	full
+BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/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/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pango/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 "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/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/mozilla/gecko-depends.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+.include "../../textproc/rarian/buildlink3.mk"
+.include "../../www/seamonkey/gecko-depends.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"