diff options
author | minskim <minskim> | 2004-12-14 19:49:41 +0000 |
---|---|---|
committer | minskim <minskim> | 2004-12-14 19:49:41 +0000 |
commit | 9fdbdcbbb47c82b1250fc540c100d7d38178b212 (patch) | |
tree | 12054e5a0d57eb382a54b7e8788c90f6e9b93159 | |
parent | 4908e7d05c5d0eddec7bd89980c750083d039cbc (diff) | |
download | pkgsrc-9fdbdcbbb47c82b1250fc540c100d7d38178b212.tar.gz |
Explicitly depend on directly-used packages, including glib2, gtk2,
and pkgconfig.
While here, rearrange paragraphs so that buildlink3.mk files are
included before overriding targets.
-rw-r--r-- | devel/coconut/Makefile | 17 | ||||
-rw-r--r-- | devel/devhelp/Makefile | 9 |
2 files changed, 16 insertions, 10 deletions
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile index d3ec8ba6d11..b65a66cb358 100644 --- a/devel/coconut/Makefile +++ b/devel/coconut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/10/03 00:13:25 tv Exp $ +# $NetBSD: Makefile,v 1.23 2004/12/14 19:49:41 minskim Exp $ # DISTNAME= coconut-0.3.0 @@ -20,18 +20,21 @@ GNU_CONFIGURE= YES CPPFLAGS+= -I${PREFIX}/include/libxml2/libxml -DGL_GLEXT_LEGACY MAKE_ENV+= AM_MAKEFLAGS="am__depfiles_maybe=" -pre-configure: - cd ${WRKSRC} && \ - ${CP} configure configure.old && \ - ${SED} < configure.old > configure \ - 's|^\(INCLUDE_DIR_LIST=\).*|\1"${PREFIX}/include ${X11PREFIX}/include"|' - .include "../../graphics/gtkglext/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/gnet1/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +pre-configure: + cd ${WRKSRC} && \ + ${CP} configure configure.old && \ + ${SED} < configure.old > configure \ + 's|^\(INCLUDE_DIR_LIST=\).*|\1"${PREFIX}/include ${X11PREFIX}/include"|' + .include "../../mk/bsd.pkg.mk" diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 3f3dad0f3f4..e26aca9ec69 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/11/27 11:43:34 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2004/12/14 19:53:48 minskim Exp $ DISTNAME= devhelp-0.7 PKGREVISION= 10 @@ -24,6 +24,11 @@ CONFIGURE_ARGS+= --with-html-widget=gtkhtml2 BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/devhelp ${INSTALL_DATA} ${WRKSRC}/misc/devhelp.el ${WRKSRC}/misc/devhelp.vim \ @@ -32,6 +37,4 @@ post-install: cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS COPYING ChangeLog README TODO \ ${PREFIX}/share/doc/devhelp -.include "../../devel/libgnomeui/buildlink3.mk" -.include "../../www/libgtkhtml/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |