diff options
| -rw-r--r-- | comms/plptools/Makefile | 6 | ||||
| -rw-r--r-- | devel/cdecl/Makefile | 6 | ||||
| -rw-r--r-- | devel/cmdline/Makefile | 12 | ||||
| -rw-r--r-- | devel/py-readline/Makefile | 7 |
4 files changed, 15 insertions, 16 deletions
diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile index 7cdb4cd1e8c..ab75cf751f7 100644 --- a/comms/plptools/Makefile +++ b/comms/plptools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/11/29 01:12:27 hubertf Exp $ +# $NetBSD: Makefile,v 1.21 2002/10/25 18:26:46 wiz Exp $ # DISTNAME= plptools-0.6 @@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.to.com/pub/psion/tarballs/ MAINTAINER= sakamoto@netbsd.org COMMENT= FTP-like and NFS-like access tools to talk to the PSION -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_GNU_READLINE= # uses rl_filename_quoting_desired flag USE_LIBTOOL= YES @@ -19,5 +19,5 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-serial=${DEFAULT_SERIAL_DEVICE} LIBS+= -ltermcap -.include "../../devel/readline/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile index ff3a04070f9..4937bc152b4 100644 --- a/devel/cdecl/Makefile +++ b/devel/cdecl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/07/09 22:25:24 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2002/10/25 18:28:32 wiz Exp $ # DISTNAME= cdecl-2.5 @@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.netsw.org/softeng/lang/c/tools/cdecl/ \ MAINTAINER= packages@netbsd.org COMMENT= utility to explain and compose C and C++ declarations -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined ALL_TARGET= cdecl EGDIR= ${PREFIX}/share/examples/cdecl @@ -20,5 +20,5 @@ post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/testset* ${EGDIR} -.include "../../devel/readline/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cmdline/Makefile b/devel/cmdline/Makefile index 9ff533985f5..b770fd1ef34 100644 --- a/devel/cmdline/Makefile +++ b/devel/cmdline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/09/04 16:00:41 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/25 18:29:40 wiz Exp $ DISTNAME= CmdLine PKGNAME= cmdline-${PKG_VERS} @@ -13,16 +13,16 @@ COMMENT= C++ library for parsing command arguments DIST_SUBDIR= cmdline-${DIST_VERS} -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined USE_LIBTOOL= # defined -MOREUSRDEFS= -I${BUILDLINK_DIR}/include/readline -MOREUSRDEFS+= -I${BUILDLINK_DIR}/include/readline/readline -MOREUSRLIBS= -L${BUILDLINK_DIR}/lib -lreadline -ltermcap +MOREUSRDEFS= -I${BUILDLINK_PREFIX.readline}/include/readline +MOREUSRDEFS+= -I${BUILDLINK_PREFIX.readline}/include/readline/readline +MOREUSRLIBS= -L${BUILDLINK_PREFIX.readline}/lib -lreadline -ltermcap MAKE_ENV+= OPT="${CXXFLAGS}" MAKE_ENV+= MOREUSRDEFS="${MOREUSRDEFS}" MAKE_ENV+= MOREUSRLIBS="${MOREUSRLIBS}" -.include "../../devel/readline/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile index 677b5d0b84e..3f8442bd0d9 100644 --- a/devel/py-readline/Makefile +++ b/devel/py-readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:49 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/10/25 18:31:33 wiz Exp $ # PKGNAME= ${PYPKGPREFIX}-readline-0 @@ -10,14 +10,12 @@ COMMENT= line editing support for Python EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/readline.c +USE_BUILDLINK2= # defined USE_GNU_READLINE= # defined -.include "../../devel/readline/buildlink.mk" - PYDISTUTILSPKG= yes PYBINMODULE= yes PY_PATCHPLIST= yes -PY_SETUP_SUBST+= RLPREFIX=${BUILDLINK_DIR} PY_SETUP_SUBST+= RLRTPREFIX=${BUILDLINK_PREFIX.readline} # ignore errors due to missing files (EXTRACT_ELEMENTS!) @@ -27,6 +25,7 @@ do-patch: ${PATCH} --batch <$$f || true; \ done) +.include "../../devel/readline/buildlink2.mk" .include "../../lang/python/srcdist.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" |