diff options
| author | joerg <joerg@pkgsrc.org> | 2007-01-30 19:48:47 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-01-30 19:48:47 +0000 |
| commit | c0f1666c17362a96bcbb55b297b2f754899b3ec9 (patch) | |
| tree | ca234954307998c28d2ad09c93aabea9b34cfb8c | |
| parent | 2559c32e7b69145b2b0b00b482f29d55a71e109c (diff) | |
| download | pkgsrc-c0f1666c17362a96bcbb55b297b2f754899b3ec9.tar.gz | |
Modular Xorg support.
| -rw-r--r-- | cad/ng-spice/Makefile | 5 | ||||
| -rw-r--r-- | chat/gaim/Makefile | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index 8b9612047c7..bc94d818d14 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/03/30 03:44:41 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2007/01/30 19:48:47 joerg Exp $ # DISTNAME= ng-spice-rework-17 @@ -27,5 +27,6 @@ TEXINFO_REQD= 4.6 .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index f34e4297a1e..f1414d9aad6 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.109 2006/08/28 17:11:04 ben Exp $ +# $NetBSD: Makefile,v 1.110 2007/01/30 19:50:54 joerg Exp $ DISTNAME= gaim-1.5.0 PKGREVISION= 6 @@ -32,7 +32,9 @@ CONFIGURE_ENV+= DLLIB=${BUILDLINK_LDADD.dl} _INSTALL_UNSTRIPPED= yes .endif -.if !exists(${X11BASE}/include/X11/extensions/scrnsaver.h) +.if ${X11_TYPE} != "native" +.include "../../x11/libXScrnSaver/buildlink3.mk" +.elif !exists(${X11BASE}/include/X11/extensions/scrnsaver.h) CONFIGURE_ARGS+= --disable-screensaver .endif @@ -40,9 +42,9 @@ CONFIGURE_ARGS+= --disable-screensaver .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |