diff options
| author | joerg <joerg@pkgsrc.org> | 2007-01-30 20:56:13 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-01-30 20:56:13 +0000 |
| commit | dec58f8e30e800f441dc79d2342a3dd3a34a24f9 (patch) | |
| tree | 8dc0029b990220b925c07cb78cd119aaf73ed417 | |
| parent | 48cbd2ccd5c5299bb86c1f0c377fcaaaaff0fb72 (diff) | |
| download | pkgsrc-dec58f8e30e800f441dc79d2342a3dd3a34a24f9.tar.gz | |
Modular Xorg support.
| -rw-r--r-- | x11/neXtaw/Makefile | 8 | ||||
| -rw-r--r-- | x11/neXtaw/buildlink3.mk | 7 | ||||
| -rw-r--r-- | x11/ocaml-graphics/Makefile | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile index 5d019a1b128..09f7536e2ec 100644 --- a/x11/neXtaw/Makefile +++ b/x11/neXtaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/03/04 21:31:10 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2007/01/30 21:00:31 joerg Exp $ DISTNAME= neXtaw-0.15.1 PKGREVISION= 2 @@ -22,8 +22,6 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} GCC_REQD+= 2.95 .endif -.include "../../mk/x11.buildlink3.mk" - post-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} @@ -34,4 +32,8 @@ post-install: ${INSTALL_DATA} $${file} ${EGDIR}; \ done +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk index 6fe662db25e..4e166c148a0 100644 --- a/x11/neXtaw/buildlink3.mk +++ b/x11/neXtaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/12/12 21:52:38 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2007/01/30 21:00:31 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NEXTAW_BUILDLINK3_MK:= ${NEXTAW_BUILDLINK3_MK}+ @@ -18,7 +18,10 @@ BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw .endif # NEXTAW_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" -.include "../../mk/x11.buildlink3.mk" + +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile index 058cef98742..83bea67b872 100644 --- a/x11/ocaml-graphics/Makefile +++ b/x11/ocaml-graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/02/22 21:00:32 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2007/01/30 20:56:13 joerg Exp $ .include "../../lang/ocaml/Makefile.common" @@ -41,5 +41,5 @@ post-build: @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC .include "../../lang/ocaml/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |