diff options
| -rw-r--r-- | www/galeon/Makefile | 25 | ||||
| -rw-r--r-- | x11/pygtk/Makefile | 14 |
2 files changed, 20 insertions, 19 deletions
diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 1f4518a7ac8..6b1d549d8f2 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2002/09/10 16:06:51 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2002/10/07 11:23:29 wiz Exp $ DISTNAME= galeon-1.2.5 PKGREVISION= 1 @@ -12,9 +12,9 @@ COMMENT= GNOME web browser based on gecko (mozilla rendering engine) CONFLICTS= galeon-current-[0-9]* BUILD_DEPENDS+= xml-i18n-tools>=0.8.1:../../textproc/xml-i18n-tools -DEPENDS+= mozilla-1.1nb1:../../www/mozilla USE_X11BASE= yes +USE_BUILDLINK2= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-mozilla-includes=${PREFIX}/include/mozilla \ @@ -26,16 +26,17 @@ CONFIGURE_ARGS+= --with-mozilla-includes=${PREFIX}/include/mozilla \ # XXX to build against mozilla 1.1 CONFIGURE_ARGS+= --with-mozilla-snapshot=trunk -.include "../../x11/gnome-libs/buildlink.mk" -.include "../../devel/libglade/buildlink.mk" -.include "../../sysutils/gnome-vfs/buildlink.mk" -.include "../../devel/GConf/buildlink.mk" -.include "../../devel/oaf/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" -.include "../../textproc/scrollkeeper/buildlink.mk" -.include "../../converters/libiconv/buildlink.mk" -.include "../../graphics/gdk-pixbuf-gnome/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" +.include "../../converters/libiconv/buildlink2.mk" +.include "../../devel/GConf/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/libglade/buildlink2.mk" +.include "../../devel/oaf/buildlink2.mk" +.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" +.include "../../textproc/scrollkeeper/buildlink2.mk" +.include "../../sysutils/gnome-vfs/buildlink2.mk" +.include "../../www/mozilla/buildlink2.mk" +.include "../../x11/gnome-libs/buildlink2.mk" MOZ_LIBDIR= ${PREFIX}/lib/mozilla LDFLAGS+= -Wl,-R${MOZ_LIBDIR} diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile index 88cc3a48d2c..08ec6cd7f31 100644 --- a/x11/pygtk/Makefile +++ b/x11/pygtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/09/21 23:47:02 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/10/07 11:33:06 wiz Exp $ # DISTNAME= pygtk-0.6.9 @@ -11,8 +11,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.daa.com.au/~james/pygtk/ COMMENT= Python Bindings for the GTK Widget Set -DEPENDS+= gtkglarea-*:../../x11/gtkglarea - GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-numpy CONFIGURE_ENV+= PYTHON=${PYTHONBIN} @@ -20,10 +18,12 @@ USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PY_PATCHPLIST= yes +USE_BUILDLINK2= yes -.include "../../graphics/imlib/buildlink.mk" -.include "../../graphics/gdk-pixbuf/buildlink.mk" -.include "../../devel/libglade/buildlink.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/gdk-pixbuf/buildlink2.mk" +.include "../../devel/libglade/buildlink2.mk" .include "../../lang/python/extension.mk" -.include "../../x11/gtk/buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" +.include "../../x11/gtkglarea/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |