diff options
author | wiz <wiz> | 2000-11-02 03:25:32 +0000 |
---|---|---|
committer | wiz <wiz> | 2000-11-02 03:25:32 +0000 |
commit | 76326b9d4ed12054a03e18b7cccf860f2d22f7cd (patch) | |
tree | d820a2e345b88d60135b9e3edc15e3a1494120c7 | |
parent | 429fc9bdbc2405cc11e509883468d47eb9e50805 (diff) | |
download | pkgsrc-76326b9d4ed12054a03e18b7cccf860f2d22f7cd.tar.gz |
NEED_NCURSES check doesn't have to be after bsd.pkg.mk inclusion anymore
(only after bsd.prefs.mk inclusion)
-rw-r--r-- | audio/timidity/Makefile | 6 | ||||
-rw-r--r-- | devel/cscope/Makefile | 13 | ||||
-rw-r--r-- | editors/vim-gtk/Makefile | 6 | ||||
-rw-r--r-- | editors/vim-xaw/Makefile | 18 | ||||
-rw-r--r-- | editors/vim/Makefile | 6 | ||||
-rw-r--r-- | games/gnome-games/Makefile | 6 | ||||
-rw-r--r-- | misc/dialog/Makefile | 6 |
7 files changed, 35 insertions, 26 deletions
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile index b559fd3250e..fd52e4620f1 100644 --- a/audio/timidity/Makefile +++ b/audio/timidity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2000/08/31 16:07:43 jwise Exp $ +# $NetBSD: Makefile,v 1.27 2000/11/02 03:25:32 wiz Exp $ # DISTNAME= timidity-0.2i @@ -31,7 +31,7 @@ post-install: cd ${PREFIX}/share/timidity/patch && \ unzip -o -q -L ${DISTDIR}/${TIINS} -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.prefs.mk" .if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES" EXTRAINCS+= -DHAVE_NCURSES_H=1 -I${LOCALBASE}/include @@ -42,3 +42,5 @@ EXTRALIBS+= -lcurses -ltermcap .endif MAKE_ENV+= EXTRALIBS="${EXTRALIBS}" + +.include "../../mk/bsd.pkg.mk" diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile index 810c1fcf987..a7ac1e8a9c0 100644 --- a/devel/cscope/Makefile +++ b/devel/cscope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/09/28 12:41:36 agc Exp $ +# $NetBSD: Makefile,v 1.12 2000/11/02 03:25:32 wiz Exp $ DISTNAME= cscope-15.0bl2 PKGNAME= cscope-15.0.2 @@ -11,21 +11,18 @@ HOMEPAGE= http://cscope.sourceforge.net/ GNU_CONFIGURE= YES USE_CURSES= YES -post-extract: cscope-post-extract - -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.prefs.mk" .if ${NEED_NCURSES} == "YES" CONFIGURE_ARGS+=--with-ncurses=${LOCALBASE} -cscope-post-extract: +post-extract: .for FILE in command.c display.c edit.c exec.c find.c help.c input.c main.c @cd ${WRKSRC}/src; \ ${MV} ${FILE} ${FILE}.orig; \ ${SED} "s/^#include <curses.h>/#include <ncurses.h>/" \ < ${FILE}.orig > ${FILE} .endfor -.else -cscope-post-extract: - ${TRUE} .endif + +.include "../../mk/bsd.pkg.mk" 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" diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 1765f5f133e..86d145723f8 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/07/28 10:33:58 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2000/11/02 03:25:33 wiz Exp $ DISTNAME= gnome-games-1.2.0 CATEGORIES= games gnome @@ -26,8 +26,10 @@ post-build: ${SED} -e 's#@@INSTALL@@#${INSTALL}#' \ ${PKGDIR}/INSTALL >${INSTALL_FILE} -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.prefs.mk" .if ${NEED_NCURSES} == "YES" CONFIGURE_ARGS+=--with-ncurses=${LOCALBASE} .endif + +.include "../../mk/bsd.pkg.mk" diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile index ad1a6591ef9..d8f5abb05ab 100644 --- a/misc/dialog/Makefile +++ b/misc/dialog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/28 20:30:08 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2000/11/02 03:25:33 wiz Exp $ # DISTNAME= dialog-0.6z @@ -21,8 +21,10 @@ post-install: ${RM} ${WRKSRC}/samples/${file}.tmp .endfor -.include "../../mk/bsd.pkg.mk" +.include "../../mk/bsd.prefs.mk" .if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES" MAKE_ENV+= HAVE_TRUE_NCURSES=true .endif + +.include "../../mk/bsd.pkg.mk" |