Thu Apr 10 16:44:19 2008 UTC ()
clean up dependencies


(drochner)
diff -r1.45 -r1.46 pkgsrc/www/libgtkhtml/Makefile
diff -r1.19 -r1.20 pkgsrc/www/libgtkhtml/buildlink3.mk
cvs diff -r1.45 -r1.46 pkgsrc/www/libgtkhtml/Makefile (expand / switch to unified diff)

--- pkgsrc/www/libgtkhtml/Makefile 2008/03/06 14:53:56 1.45
+++ pkgsrc/www/libgtkhtml/Makefile 2008/04/10 16:44:19 1.46
@@ -1,28 +1,26 @@ @@ -1,28 +1,26 @@
1# $NetBSD: Makefile,v 1.45 2008/03/06 14:53:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.46 2008/04/10 16:44:19 drochner Exp $
2# 2#
3 3
4DISTNAME= libgtkhtml-2.6.3 4DISTNAME= libgtkhtml-2.6.3
5PKGREVISION= 10 5PKGREVISION= 10
6CATEGORIES= www devel gnome 6CATEGORIES= www devel gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtkhtml/2.6/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtkhtml/2.6/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= jmmv@NetBSD.org 10MAINTAINER= jmmv@NetBSD.org
11HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
12COMMENT= Lightweight HTML rendering GTK2 widget 12COMMENT= Lightweight HTML rendering GTK2 widget
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_TOOLS+= gmake msgfmt pkg-config 17USE_TOOLS+= gmake msgfmt pkg-config
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19 19
20PKGCONFIG_OVERRIDE= libgtkhtml-2.0.pc.in 20PKGCONFIG_OVERRIDE= libgtkhtml-2.0.pc.in
21 21
22.include "../../devel/gail/buildlink3.mk" 22.include "../../devel/gail/buildlink3.mk"
23.include "../../sysutils/gnome-vfs/buildlink3.mk" 
24.include "../../textproc/libxml2/buildlink3.mk" 23.include "../../textproc/libxml2/buildlink3.mk"
25.include "../../x11/gtk2/buildlink3.mk" 24.include "../../x11/gtk2/buildlink3.mk"
26.include "../../mk/bdb.buildlink3.mk" 
27.include "../../mk/pthread.buildlink3.mk" 25.include "../../mk/pthread.buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/www/libgtkhtml/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/libgtkhtml/buildlink3.mk 2008/03/06 14:53:56 1.19
+++ pkgsrc/www/libgtkhtml/buildlink3.mk 2008/04/10 16:44:19 1.20
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.19 2008/03/06 14:53:56 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.20 2008/04/10 16:44:19 drochner Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4LIBGTKHTML_BUILDLINK3_MK:= ${LIBGTKHTML_BUILDLINK3_MK}+ 4LIBGTKHTML_BUILDLINK3_MK:= ${LIBGTKHTML_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= libgtkhtml 7BUILDLINK_DEPENDS+= libgtkhtml
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtkhtml} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgtkhtml}
11BUILDLINK_PACKAGES+= libgtkhtml 11BUILDLINK_PACKAGES+= libgtkhtml
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgtkhtml 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgtkhtml
13 13
14.if !empty(LIBGTKHTML_BUILDLINK3_MK:M+) 14.if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.0 15BUILDLINK_API_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.0
16BUILDLINK_ABI_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.3nb10 16BUILDLINK_ABI_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.3nb10
17BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml 17BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml
18.endif # LIBGTKHTML_BUILDLINK3_MK 18.endif # LIBGTKHTML_BUILDLINK3_MK
19 19
20.include "../../devel/gail/buildlink3.mk" 20.include "../../devel/gail/buildlink3.mk"
21.include "../../sysutils/gnome-vfs/buildlink3.mk" 
22.include "../../textproc/libxml2/buildlink3.mk" 21.include "../../textproc/libxml2/buildlink3.mk"
23.include "../../x11/gtk2/buildlink3.mk" 22.include "../../x11/gtk2/buildlink3.mk"
24 23
25BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 24BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}