Fri Feb 14 05:54:51 2014 UTC ()
Fixes detection of builtin editline after automatic conversion from
devel/readline/buillink3.mk to mk/readline.buildlink.mk.
Resolve "No usable termcap library found on the system." error without
builtin termcap.


(obache)
diff -r1.33 -r1.34 pkgsrc/net/tnftp/Makefile
cvs diff -r1.33 -r1.34 pkgsrc/net/tnftp/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tnftp/Makefile 2013/09/12 11:18:40 1.33
+++ pkgsrc/net/tnftp/Makefile 2014/02/14 05:54:51 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2013/09/12 11:18:40 jperkin Exp $ 1# $NetBSD: Makefile,v 1.34 2014/02/14 05:54:51 obache Exp $
2 2
3DISTNAME= tnftp-20070806 3DISTNAME= tnftp-20070806
4SVR4_PKGNAME= tnftp 4SVR4_PKGNAME= tnftp
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp 9# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp
10 10
11CONFLICTS+= kth-krb4-[0-9]* 11CONFLICTS+= kth-krb4-[0-9]*
12CONFLICTS+= lukemftp-[0-9]* 12CONFLICTS+= lukemftp-[0-9]*
13 13
14MAINTAINER= lukem@NetBSD.org 14MAINTAINER= lukem@NetBSD.org
@@ -26,31 +26,31 @@ MAKE_ENV.SunOS+= CPPFLAGS="" @@ -26,31 +26,31 @@ MAKE_ENV.SunOS+= CPPFLAGS=""
26MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q} 26MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
27MAKE_ENV+= MANINSTALL=${MANINSTALL:Q} 27MAKE_ENV+= MANINSTALL=${MANINSTALL:Q}
28 28
29.include "options.mk" 29.include "options.mk"
30 30
31do-extract: 31do-extract:
32 @${CP} -R ${FILESDIR} ${WRKSRC} 32 @${CP} -R ${FILESDIR} ${WRKSRC}
33 @${RM} -f ${WRKSRC}/INSTALL 33 @${RM} -f ${WRKSRC}/INSTALL
34 34
35# Use mk/readline.builtin.mk to check for an editline library on the 35# Use mk/readline.builtin.mk to check for an editline library on the
36# system. If we use the system editline library, then use the built-in 36# system. If we use the system editline library, then use the built-in
37# termcap library. 37# termcap library.
38# 38#
39CHECK_BUILTIN.readline:= yes 39CHECK_BUILTIN.editline:= yes
40.include "../../mk/readline.builtin.mk" 40.include "../../devel/editline/builtin.mk"
41CHECK_BUILTIN.readline:= no 41CHECK_BUILTIN.editline:= no
42 42
43.if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) 43.if !empty(USE_BUILTIN.editline:M[yY][eE][sS])
44USE_BUILTIN.termcap?= yes 44USE_BUILTIN.termcap?= yes
45.endif 45.endif
46 46
47# Check usability of builtin termcap if FETCH_USING=ftp 47# Check usability of builtin termcap if FETCH_USING=ftp
48# to avoid circular dependency with termcap from pkgsrc (devel/ncurses). 48# to avoid circular dependency with termcap from pkgsrc (devel/ncurses).
49CHECK_BUILTIN.termcap:= yes 49CHECK_BUILTIN.termcap:= yes
50.include "../../mk/termcap.builtin.mk" 50.include "../../mk/termcap.builtin.mk"
51CHECK_BUILTIN.termcap:= no 51CHECK_BUILTIN.termcap:= no
52 52
53.if !empty(FETCH_USING:Mftp) && !empty(USE_BUILTIN.termcap:M[Nn][Oo]) 53.if !empty(FETCH_USING:Mftp) && !empty(USE_BUILTIN.termcap:M[Nn][Oo])
54CONFIGURE_ARGS+= --disable-editcomplete 54CONFIGURE_ARGS+= --disable-editcomplete
55.else 55.else
56.include "../../mk/termcap.buildlink3.mk" 56.include "../../mk/termcap.buildlink3.mk"