diff options
author | ahoka <ahoka@pkgsrc.org> | 2009-07-12 17:23:13 +0000 |
---|---|---|
committer | ahoka <ahoka@pkgsrc.org> | 2009-07-12 17:23:13 +0000 |
commit | 6bff9c1ef29589fa945dd4a873e0f2a06bfef52a (patch) | |
tree | a9e738cf55f6f5533c0d87c6c9cb224ad02338db /devel | |
parent | a35f7cb89468d8c9d161d693e40e2674c225d4e2 (diff) | |
download | pkgsrc-6bff9c1ef29589fa945dd4a873e0f2a06bfef52a.tar.gz |
Install ncurses headers to include/ncurses. This fixes a bug, when having
/usr/pkg/include in the header search path shadows some of the system's
curses headers (happens when building or developing curses application
outside of the pkgsrc build system).
Diffstat (limited to 'devel')
-rw-r--r-- | devel/ncurses/Makefile.common | 6 | ||||
-rw-r--r-- | devel/ncurses/PLIST | 41 | ||||
-rw-r--r-- | devel/ncurses/buildlink3.mk | 35 |
3 files changed, 48 insertions, 34 deletions
diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common index 601cd0753f5..64a44189804 100644 --- a/devel/ncurses/Makefile.common +++ b/devel/ncurses/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.10 2008/11/16 17:03:00 adrianp Exp $ +# $NetBSD: Makefile.common,v 1.11 2009/07/12 17:23:13 ahoka Exp $ # # used by devel/ncursesw/Makefile DISTNAME= ncurses-${NC_VERS} NC_VERS= 5.7 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=ncurses/} \ ftp://dickey.his.com/ncurses/ \ @@ -25,12 +25,12 @@ CONFIGURE_ARGS+= --enable-bsdpad CONFIGURE_ARGS+= --enable-overwrite CONFIGURE_ARGS+= --with-cxx-binding CONFIGURE_ARGS+= --without-ada -CONFIGURE_ARGS+= --without-curses-h CONFIGURE_ARGS+= --without-gpm CONFIGURE_ARGS+= --with-manpage-format=normal CONFIGURE_ARGS+= --with-manpage-tbl CONFIGURE_ARGS+= --with-default-terminfo-dir=${PREFIX}/${TERMINFODIR} CONFIGURE_ARGS+= --with-terminfo-dirs=${PREFIX}/${TERMINFODIR} +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ncurses MAKE_JOBS_SAFE= no .include "../../mk/bsd.prefs.mk" diff --git a/devel/ncurses/PLIST b/devel/ncurses/PLIST index 90e5a909ec1..59f29e3073b 100644 --- a/devel/ncurses/PLIST +++ b/devel/ncurses/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2009/06/14 17:48:59 joerg Exp $ +@comment $NetBSD: PLIST,v 1.18 2009/07/12 17:23:13 ahoka Exp $ bin/captoinfo bin/clear bin/infocmp @@ -9,25 +9,26 @@ bin/tic bin/toe bin/tput bin/tset -include/cursesapp.h -include/cursesf.h -include/cursesm.h -include/cursesp.h -include/cursesw.h -include/cursslk.h -include/eti.h -include/etip.h -include/form.h -include/menu.h -include/nc_tparm.h -include/ncurses.h -include/ncurses_dll.h -include/panel.h -include/term.h -include/term_entry.h -include/termcap.h -include/tic.h -include/unctrl.h +include/ncurses/curses.h +include/ncurses/cursesapp.h +include/ncurses/cursesf.h +include/ncurses/cursesm.h +include/ncurses/cursesp.h +include/ncurses/cursesw.h +include/ncurses/cursslk.h +include/ncurses/eti.h +include/ncurses/etip.h +include/ncurses/form.h +include/ncurses/menu.h +include/ncurses/nc_tparm.h +include/ncurses/ncurses.h +include/ncurses/ncurses_dll.h +include/ncurses/panel.h +include/ncurses/term.h +include/ncurses/term_entry.h +include/ncurses/termcap.h +include/ncurses/tic.h +include/ncurses/unctrl.h lib/libform.la lib/libmenu.la lib/libncurses++.la diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk index 3bcdd5a0006..2cc1c5fb7a4 100644 --- a/devel/ncurses/buildlink3.mk +++ b/devel/ncurses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.33 2009/03/20 19:24:24 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2009/07/12 17:23:13 ahoka Exp $ BUILDLINK_TREE+= ncurses @@ -13,21 +13,34 @@ BUILDLINK_LIBNAME.ncurses= ncurses BUILDLINK_LDADD.ncurses?= ${BUILDLINK_LIBNAME.ncurses:S/^/-l/:S/^-l$//} # Many packages expect the ncurses headers and libraries to be usable as -# <curses.h> and -lcurses. +# <curses.h> and -lcurses and they often only look in include/ rather than +# some properly written autoconf macros wich also try to puck up +# ncurses/ncurses.h. # -BUILDLINK_TARGETS+= buildlink-ncurses-curses-h +BUILDLINK_TARGETS+= buildlink-ncurses-curses-h buildlink-ncurses-ncurses-h BUILDLINK_TRANSFORM+= l:curses:${BUILDLINK_LIBNAME.ncurses} -.PHONY: buildlink-ncurses-curses-h +.PHONY: buildlink-ncurses-curses-h buildlink-ncurses-ncurses-h buildlink-ncurses-curses-h: - ${RUN} \ - src=${BUILDLINK_PREFIX.ncurses:Q}"/include/ncurses.h"; \ - dest=${BUILDLINK_DIR:Q}"/include/curses.h"; \ - if ${TEST} ! -f "$$dest" -a -f "$$src"; then \ - ${ECHO_BUILDLINK_MSG} "Linking curses.h -> ncurses.h."; \ - ${MKDIR} `${DIRNAME} "$$dest"`; \ - ${LN} -s "$$src" "$$dest"; \ + ${RUN} \ + src=${BUILDLINK_PREFIX.ncurses:Q}"/include/ncurses/curses.h"; \ + dest=${BUILDLINK_DIR:Q}"/include/curses.h"; \ + if ${TEST} ! -f "$$dest" -a -f "$$src"; then \ + ${ECHO_BUILDLINK_MSG} "Linking ncurses/curses.h -> curses.h."; \ + ${MKDIR} `${DIRNAME} "$$dest"`; \ + ${LN} -s "$$src" "$$dest"; \ fi + +buildlink-ncurses-ncurses-h: + ${RUN} \ + src=${BUILDLINK_PREFIX.ncurses:Q}"/include/ncurses/ncurses.h"; \ + dest=${BUILDLINK_DIR:Q}"/include/ncurses.h"; \ + if ${TEST} ! -f "$$dest" -a -f "$$src"; then \ + ${ECHO_BUILDLINK_MSG} "Linking ncurses/ncurses.h -> ncurses.h.";\ + ${MKDIR} `${DIRNAME} "$$dest"`; \ + ${LN} -s "$$src" "$$dest"; \ + fi + .endif # NCURSES_BUILDLINK3_MK BUILDLINK_TREE+= -ncurses |