summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2000-11-02 03:25:32 +0000
committerwiz <wiz@pkgsrc.org>2000-11-02 03:25:32 +0000
commit3d00d4c11963daee2b14fcf7db3ba043aa719d01 (patch)
treed820a2e345b88d60135b9e3edc15e3a1494120c7 /editors
parentd4379bce7163f24e2b8bee0615d6177dc9f4ebd7 (diff)
downloadpkgsrc-3d00d4c11963daee2b14fcf7db3ba043aa719d01.tar.gz
NEED_NCURSES check doesn't have to be after bsd.pkg.mk inclusion anymore
(only after bsd.prefs.mk inclusion)
Diffstat (limited to 'editors')
-rw-r--r--editors/vim-gtk/Makefile6
-rw-r--r--editors/vim-xaw/Makefile18
-rw-r--r--editors/vim/Makefile6
3 files changed, 18 insertions, 12 deletions
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 79093e99e28..91a9dae74d2 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/07/28 10:33:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2000/11/02 03:25:32 wiz Exp $
.include "../vim-share/Makefile.common"
@@ -31,7 +31,7 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \
done
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.prefs.mk"
.if ${NEED_NCURSES} == "YES"
CONFIGURE_ARGS+= --with-tlib=ncurses
@@ -39,3 +39,5 @@ CONFIGURE_ARGS+= --with-tlib=ncurses
CPPFLAGS=
CONFIGURE_ARGS+= --with-tlib=curses
.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 15901ea6360..4646111f618 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/07/28 10:33:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/11/02 03:25:33 wiz Exp $
.include "../vim-share/Makefile.common"
@@ -29,13 +29,7 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \
done
-.include "../../mk/bsd.pkg.mk"
-
-.if (${XAW_TYPE} == "standard")
-MAKE_ENV+= XAW_LIB=Xaw
-.else
-MAKE_ENV+= XAW_LIB=Xaw3d
-.endif
+.include "../../mk/bsd.prefs.mk"
.if ${NEED_NCURSES} == "YES"
CONFIGURE_ARGS+= --with-tlib=ncurses
@@ -43,3 +37,11 @@ CONFIGURE_ARGS+= --with-tlib=ncurses
CPPFLAGS=
CONFIGURE_ARGS+= --with-tlib=curses
.endif
+
+.include "../../mk/bsd.pkg.mk"
+
+.if (${XAW_TYPE} == "standard")
+MAKE_ENV+= XAW_LIB=Xaw
+.else
+MAKE_ENV+= XAW_LIB=Xaw3d
+.endif
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index e022dfdad6f..89b4352a043 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2000/07/28 10:33:57 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2000/11/02 03:25:33 wiz Exp $
.include "../vim-share/Makefile.common"
@@ -24,7 +24,7 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \
done
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/bsd.prefs.mk"
.if ${NEED_NCURSES} == "YES"
CONFIGURE_ARGS+= --with-tlib=ncurses
@@ -32,3 +32,5 @@ CONFIGURE_ARGS+= --with-tlib=ncurses
CPPFLAGS=
CONFIGURE_ARGS+= --with-tlib=curses
.endif
+
+.include "../../mk/bsd.pkg.mk"