Sun Dec 4 21:26:15 2011 UTC ()
Revert my last (it needs more work).


(sbd)
diff -r1.38 -r1.39 pkgsrc/devel/ncurses/buildlink3.mk
cvs diff -r1.38 -r1.39 pkgsrc/devel/ncurses/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/buildlink3.mk 2011/12/04 21:08:21 1.38
+++ pkgsrc/devel/ncurses/buildlink3.mk 2011/12/04 21:26:15 1.39
@@ -1,46 +1,36 @@ @@ -1,46 +1,36 @@
1# $NetBSD: buildlink3.mk,v 1.38 2011/12/04 21:08:21 sbd Exp $ 1# $NetBSD: buildlink3.mk,v 1.39 2011/12/04 21:26:15 sbd Exp $
2 2
3BUILDLINK_TREE+= ncurses 3BUILDLINK_TREE+= ncurses
4 4
5.if !defined(NCURSES_BUILDLINK3_MK) 5.if !defined(NCURSES_BUILDLINK3_MK)
6NCURSES_BUILDLINK3_MK:= 6NCURSES_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ncurses+= ncurses>=5.3nb1 8BUILDLINK_API_DEPENDS.ncurses+= ncurses>=5.3nb1
9BUILDLINK_ABI_DEPENDS.ncurses+= ncurses>=5.4nb1 9BUILDLINK_ABI_DEPENDS.ncurses+= ncurses>=5.4nb1
10BUILDLINK_PKGSRCDIR.ncurses?= ../../devel/ncurses 10BUILDLINK_PKGSRCDIR.ncurses?= ../../devel/ncurses
11 11
12BUILDLINK_LIBNAME.ncurses= ncurses 12BUILDLINK_LIBNAME.ncurses= ncurses
13BUILDLINK_LDADD.ncurses?= ${BUILDLINK_LIBNAME.ncurses:S/^/-l/:S/^-l$//} 13BUILDLINK_LDADD.ncurses?= ${BUILDLINK_LIBNAME.ncurses:S/^/-l/:S/^-l$//}
14 14
15# Many packages expect the ncurses headers and libraries to be usable as 15# Many packages expect the ncurses headers and libraries to be usable as
16# <curses.h> and -lcurses and they often only look in include/ rather than 16# <curses.h> and -lcurses and they often only look in include/ rather than
17# some properly written autoconf macros which also try to pick up 17# some properly written autoconf macros which also try to pick up
18# ncurses/ncurses.h. 18# ncurses/ncurses.h.
19# 19#
20BUILDLINK_TARGETS+= buildlink-ncurses-curses-h buildlink-ncurses-ncurses-h 20BUILDLINK_TARGETS+= buildlink-ncurses-curses-h buildlink-ncurses-ncurses-h
21BUILDLINK_TRANSFORM+= l:curses:${BUILDLINK_LIBNAME.ncurses} 21BUILDLINK_TRANSFORM+= l:curses:${BUILDLINK_LIBNAME.ncurses}
22BUILDLINK_INCDIRS.ncurses+= include/ncurses 22BUILDLINK_INCDIRS.ncurses+= include/ncurses
23 23
24# Many packages will prefer ncursesw over ncurses if its available (say as 
25# a native library), so unless this file is being included by ncursesw 
26# disable ncursesw autoconf detection and if that doesn't work pretend we 
27# are ncursesw.  
28# 
29. if empty(BUILDLINK_TREE:Mncursesw) 
30CONFIGURE_ENV+= ac_cv_lib_ncursesw_initscr=no 
31BUILDLINK_TRANSFORM+= l:ncursesw:${BUILDLINK_LIBNAME.ncurses} 
32. endif 
33 
34.PHONY: buildlink-ncurses-curses-h buildlink-ncurses-ncurses-h 24.PHONY: buildlink-ncurses-curses-h buildlink-ncurses-ncurses-h
35buildlink-ncurses-curses-h: 25buildlink-ncurses-curses-h:
36 ${RUN} \ 26 ${RUN} \
37 src=${BUILDLINK_PREFIX.ncurses}"/include/ncurses/curses.h"; \ 27 src=${BUILDLINK_PREFIX.ncurses}"/include/ncurses/curses.h"; \
38 dest=${BUILDLINK_DIR}"/include/curses.h"; \ 28 dest=${BUILDLINK_DIR}"/include/curses.h"; \
39 if ${TEST} ! -f "$$dest" -a -f "$$src"; then \ 29 if ${TEST} ! -f "$$dest" -a -f "$$src"; then \
40 ${ECHO_BUILDLINK_MSG} "Linking ncurses/curses.h -> curses.h."; \ 30 ${ECHO_BUILDLINK_MSG} "Linking ncurses/curses.h -> curses.h."; \
41 ${MKDIR} `${DIRNAME} "$$dest"`; \ 31 ${MKDIR} `${DIRNAME} "$$dest"`; \
42 ${LN} -s "$$src" "$$dest"; \ 32 ${LN} -s "$$src" "$$dest"; \
43 fi 33 fi
44 34
45buildlink-ncurses-ncurses-h: 35buildlink-ncurses-ncurses-h:
46 ${RUN} \ 36 ${RUN} \