diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
| commit | 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /editors | |
| parent | 70004632b203c88d357d29ec8f217d1caa85f9c7 (diff) | |
| download | pkgsrc-63fc151cb9f15f8bcc66bbeca21050fea30c29d3.tar.gz | |
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/abiword/Makefile | 3 | ||||
| -rw-r--r-- | editors/vim-gtk/Makefile | 4 | ||||
| -rw-r--r-- | editors/vim-xaw/Makefile | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 831bb21906a..d589470c0d4 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2001/08/17 21:16:50 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2001/08/29 22:41:09 jlam Exp $ # # According to AbiSource's explanation of their trademark rights, # compilations/distributions of AbiWord not provided by AbiSource must @@ -65,4 +65,5 @@ post-install: .include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index 8cad7c4a101..a3501aee39a 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/08/06 17:44:45 pooka Exp $ +# $NetBSD: Makefile,v 1.25 2001/08/29 22:41:09 jlam Exp $ .include "../vim-share/Makefile.common" @@ -11,7 +11,6 @@ CONFLICTS+= vim-[0-9]* vim-xaw-* DISTFILES+= ${DISTNAME}-rt${EXTRACT_SUFX} -USE_X11= yes USE_BUILDLINK_ONLY= yes CONFIGURE_ARGS+= --enable-gui=gtk @@ -32,4 +31,5 @@ post-install: .include "../../devel/ncurses/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index 04681a0b0c0..2c858075a3b 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/08/23 04:26:52 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/08/29 22:41:09 jlam Exp $ .include "../vim-share/Makefile.common" @@ -9,9 +9,7 @@ COMMENT= Vim editor (vi clone) with X11 Athena GUI DEPENDS+= vim-share-${VIM_VERSION}:../vim-share CONFLICTS+= vim-[0-9]* vim-gtk-* -USE_X11= yes USE_BUILDLINK_ONLY= yes - CONFIGURE_ARGS+= --enable-gui=athena CONFIGURE_ARGS+= --with-tlib=ncurses @@ -39,4 +37,5 @@ post-install: .include "../../devel/ncurses/buildlink.mk" .include "../../mk/xaw.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |