diff options
author | wiz <wiz> | 2000-07-28 10:33:56 +0000 |
---|---|---|
committer | wiz <wiz> | 2000-07-28 10:33:56 +0000 |
commit | 447dd194129ffa63029cd4ab90ff025c7547bb53 (patch) | |
tree | 645721463659c2eb41c243dc65126304596e7750 /editors | |
parent | c40fcc3929c4250af43bd4dc9db3c4838d9d6843 (diff) | |
download | pkgsrc-447dd194129ffa63029cd4ab90ff025c7547bb53.tar.gz |
Add USE_CURSES for packages that need curses functionality that only
got added in 1.4Y; on older version of NetBSD, ncurses will be used.
Replace previous code that did the same, but wasn't shared.
Diffstat (limited to 'editors')
-rw-r--r-- | editors/vim-gtk/Makefile | 34 | ||||
-rw-r--r-- | editors/vim-xaw/Makefile | 34 | ||||
-rw-r--r-- | editors/vim/Makefile | 35 |
3 files changed, 28 insertions, 75 deletions
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index 0ba932dd201..79093e99e28 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2000/06/25 11:50:34 pooka Exp $ +# $NetBSD: Makefile,v 1.17 2000/07/28 10:33:57 wiz Exp $ .include "../vim-share/Makefile.common" @@ -11,6 +11,7 @@ CONFLICTS= vim-[0-9]* vim-xaw-* DISTFILES+= ${DISTNAME}-rt${EXTRACT_SUFX} USE_X11= yes +USE_CURSES= yes CONFIGURE_ARGS+= --enable-gui=gtk CPPFLAGS+= -I${LOCALBASE}/include # for ncurses' termcap.h @@ -20,30 +21,6 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" ALL_TARGET= vim INSTALL_TARGET= installvimbin -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -GOOD_CURSES= 1.4[Y-Z] 1.4Z[A-Z] 1.[5-9]* - -.for PATTERN in ${GOOD_CURSES} -.if ${OS_VERSION:M${PATTERN}} != "" -CURSES_GOOD?= #defined -.endif -.endfor -.endif - -.if ${OPSYS} == "SunOS" -CURSES_GOOD?= #defined -.endif - -.if defined(CURSES_GOOD) -CPPFLAGS= -CONFIGURE_ARGS+= --with-tlib=curses -.else -DEPENDS+= ncurses>=4.2:../../devel/ncurses -CONFIGURE_ARGS+= --with-tlib=ncurses -.endif - post-install: for f in gvim.1 gview.1 rgvim.1 rgview.1; do \ ${RM} -f ${PREFIX}/man/man1/$$f; \ @@ -55,3 +32,10 @@ post-install: done .include "../../mk/bsd.pkg.mk" + +.if ${NEED_NCURSES} == "YES" +CONFIGURE_ARGS+= --with-tlib=ncurses +.else +CPPFLAGS= +CONFIGURE_ARGS+= --with-tlib=curses +.endif diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index 7e90b9e3d37..15901ea6360 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/06/25 11:50:40 pooka Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/28 10:33:57 wiz Exp $ .include "../vim-share/Makefile.common" @@ -9,6 +9,7 @@ CONFLICTS= vim-[0-9]* vim-gtk-* USE_X11= yes USE_XAW= yes +USE_CURSES= yes CONFIGURE_ARGS+= --enable-gui=athena CPPFLAGS+= -I${LOCALBASE}/include # for ncurses' termcap.h @@ -18,30 +19,6 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" ALL_TARGET= vim INSTALL_TARGET= installvimbin -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -GOOD_CURSES= 1.4[Y-Z] 1.4Z[A-Z] 1.[5-9]* - -.for PATTERN in ${GOOD_CURSES} -.if ${OS_VERSION:M${PATTERN}} != "" -CURSES_GOOD?= #defined -.endif -.endfor -.endif - -.if ${OPSYS} == "SunOS" -CURSES_GOOD?= #defined -.endif - -.if defined(CURSES_GOOD) -CPPFLAGS= -CONFIGURE_ARGS+= --with-tlib=curses -.else -DEPENDS+= ncurses>=4.2:../../devel/ncurses -CONFIGURE_ARGS+= --with-tlib=ncurses -.endif - post-install: for f in gvim.1 gview.1 rgvim.1 rgview.1; do \ ${RM} -f ${PREFIX}/man/man1/$$f; \ @@ -59,3 +36,10 @@ MAKE_ENV+= XAW_LIB=Xaw .else MAKE_ENV+= XAW_LIB=Xaw3d .endif + +.if ${NEED_NCURSES} == "YES" +CONFIGURE_ARGS+= --with-tlib=ncurses +.else +CPPFLAGS= +CONFIGURE_ARGS+= --with-tlib=curses +.endif diff --git a/editors/vim/Makefile b/editors/vim/Makefile index d22ba349717..e022dfdad6f 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2000/06/25 11:50:32 pooka Exp $ +# $NetBSD: Makefile,v 1.34 2000/07/28 10:33:57 wiz Exp $ .include "../vim-share/Makefile.common" @@ -13,33 +13,11 @@ CPPFLAGS+= -I${LOCALBASE}/include # for ncurses' termcap.h LDFLAGS+= -L${LOCALBASE}/lib # for -lncurses CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +USE_CURSES= yes + ALL_TARGET= vim INSTALL_TARGET= installvimbin -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" -GOOD_CURSES= 1.4[Y-Z] 1.4Z[A-Z] 1.[5-9]* - -.for PATTERN in ${GOOD_CURSES} -.if ${OS_VERSION:M${PATTERN}} != "" -CURSES_GOOD?= #defined -.endif -.endfor -.endif - -.if ${OPSYS} == "SunOS" -CURSES_GOOD?= #defined -.endif - -.if defined(CURSES_GOOD) -CPPFLAGS= -CONFIGURE_ARGS+= --with-tlib=curses -.else -DEPENDS+= ncurses>=4.2:../../devel/ncurses -CONFIGURE_ARGS+= --with-tlib=ncurses -.endif - post-install: for f in rvim rview ; do \ ${RM} -f ${PREFIX}/bin/$$f; \ @@ -47,3 +25,10 @@ post-install: done .include "../../mk/bsd.pkg.mk" + +.if ${NEED_NCURSES} == "YES" +CONFIGURE_ARGS+= --with-tlib=ncurses +.else +CPPFLAGS= +CONFIGURE_ARGS+= --with-tlib=curses +.endif |