NEED_NCURSES check doesn't have to be after bsd.pkg.mk inclusion anymore

(only after bsd.prefs.mk inclusion)
This commit is contained in:
wiz 2000-11-02 03:25:32 +00:00
parent d4379bce71
commit 3d00d4c119
7 changed files with 35 additions and 26 deletions

View file

@ -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 DISTNAME= timidity-0.2i
@ -31,7 +31,7 @@ post-install:
cd ${PREFIX}/share/timidity/patch && \ cd ${PREFIX}/share/timidity/patch && \
unzip -o -q -L ${DISTDIR}/${TIINS} unzip -o -q -L ${DISTDIR}/${TIINS}
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.prefs.mk"
.if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES" .if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES"
EXTRAINCS+= -DHAVE_NCURSES_H=1 -I${LOCALBASE}/include EXTRAINCS+= -DHAVE_NCURSES_H=1 -I${LOCALBASE}/include
@ -42,3 +42,5 @@ EXTRALIBS+= -lcurses -ltermcap
.endif .endif
MAKE_ENV+= EXTRALIBS="${EXTRALIBS}" MAKE_ENV+= EXTRALIBS="${EXTRALIBS}"
.include "../../mk/bsd.pkg.mk"

View file

@ -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 DISTNAME= cscope-15.0bl2
PKGNAME= cscope-15.0.2 PKGNAME= cscope-15.0.2
@ -11,21 +11,18 @@ HOMEPAGE= http://cscope.sourceforge.net/
GNU_CONFIGURE= YES GNU_CONFIGURE= YES
USE_CURSES= YES USE_CURSES= YES
post-extract: cscope-post-extract .include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.pkg.mk"
.if ${NEED_NCURSES} == "YES" .if ${NEED_NCURSES} == "YES"
CONFIGURE_ARGS+=--with-ncurses=${LOCALBASE} 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 .for FILE in command.c display.c edit.c exec.c find.c help.c input.c main.c
@cd ${WRKSRC}/src; \ @cd ${WRKSRC}/src; \
${MV} ${FILE} ${FILE}.orig; \ ${MV} ${FILE} ${FILE}.orig; \
${SED} "s/^#include <curses.h>/#include <ncurses.h>/" \ ${SED} "s/^#include <curses.h>/#include <ncurses.h>/" \
< ${FILE}.orig > ${FILE} < ${FILE}.orig > ${FILE}
.endfor .endfor
.else
cscope-post-extract:
${TRUE}
.endif .endif
.include "../../mk/bsd.pkg.mk"

View file

@ -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" .include "../vim-share/Makefile.common"
@ -31,7 +31,7 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \ ${LN} -s vim ${PREFIX}/bin/$$f; \
done done
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.prefs.mk"
.if ${NEED_NCURSES} == "YES" .if ${NEED_NCURSES} == "YES"
CONFIGURE_ARGS+= --with-tlib=ncurses CONFIGURE_ARGS+= --with-tlib=ncurses
@ -39,3 +39,5 @@ CONFIGURE_ARGS+= --with-tlib=ncurses
CPPFLAGS= CPPFLAGS=
CONFIGURE_ARGS+= --with-tlib=curses CONFIGURE_ARGS+= --with-tlib=curses
.endif .endif
.include "../../mk/bsd.pkg.mk"

View file

@ -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" .include "../vim-share/Makefile.common"
@ -29,13 +29,7 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \ ${LN} -s vim ${PREFIX}/bin/$$f; \
done done
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.prefs.mk"
.if (${XAW_TYPE} == "standard")
MAKE_ENV+= XAW_LIB=Xaw
.else
MAKE_ENV+= XAW_LIB=Xaw3d
.endif
.if ${NEED_NCURSES} == "YES" .if ${NEED_NCURSES} == "YES"
CONFIGURE_ARGS+= --with-tlib=ncurses CONFIGURE_ARGS+= --with-tlib=ncurses
@ -43,3 +37,11 @@ CONFIGURE_ARGS+= --with-tlib=ncurses
CPPFLAGS= CPPFLAGS=
CONFIGURE_ARGS+= --with-tlib=curses CONFIGURE_ARGS+= --with-tlib=curses
.endif .endif
.include "../../mk/bsd.pkg.mk"
.if (${XAW_TYPE} == "standard")
MAKE_ENV+= XAW_LIB=Xaw
.else
MAKE_ENV+= XAW_LIB=Xaw3d
.endif

View file

@ -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" .include "../vim-share/Makefile.common"
@ -24,7 +24,7 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \ ${LN} -s vim ${PREFIX}/bin/$$f; \
done done
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.prefs.mk"
.if ${NEED_NCURSES} == "YES" .if ${NEED_NCURSES} == "YES"
CONFIGURE_ARGS+= --with-tlib=ncurses CONFIGURE_ARGS+= --with-tlib=ncurses
@ -32,3 +32,5 @@ CONFIGURE_ARGS+= --with-tlib=ncurses
CPPFLAGS= CPPFLAGS=
CONFIGURE_ARGS+= --with-tlib=curses CONFIGURE_ARGS+= --with-tlib=curses
.endif .endif
.include "../../mk/bsd.pkg.mk"

View file

@ -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 DISTNAME= gnome-games-1.2.0
CATEGORIES= games gnome CATEGORIES= games gnome
@ -26,8 +26,10 @@ post-build:
${SED} -e 's#@@INSTALL@@#${INSTALL}#' \ ${SED} -e 's#@@INSTALL@@#${INSTALL}#' \
${PKGDIR}/INSTALL >${INSTALL_FILE} ${PKGDIR}/INSTALL >${INSTALL_FILE}
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.prefs.mk"
.if ${NEED_NCURSES} == "YES" .if ${NEED_NCURSES} == "YES"
CONFIGURE_ARGS+=--with-ncurses=${LOCALBASE} CONFIGURE_ARGS+=--with-ncurses=${LOCALBASE}
.endif .endif
.include "../../mk/bsd.pkg.mk"

View file

@ -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 DISTNAME= dialog-0.6z
@ -21,8 +21,10 @@ post-install:
${RM} ${WRKSRC}/samples/${file}.tmp ${RM} ${WRKSRC}/samples/${file}.tmp
.endfor .endfor
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.prefs.mk"
.if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES" .if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES"
MAKE_ENV+= HAVE_TRUE_NCURSES=true MAKE_ENV+= HAVE_TRUE_NCURSES=true
.endif .endif
.include "../../mk/bsd.pkg.mk"