diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:48:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:48:57 +0000 |
| commit | 1c57323789a922a7182ba378831f2c0a336a6959 (patch) | |
| tree | c8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /net/ncftp2 | |
| parent | ee84541509a09b09b26167f474c4b53185c17b5f (diff) | |
| download | pkgsrc-1c57323789a922a7182ba378831f2c0a336a6959.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'net/ncftp2')
| -rw-r--r-- | net/ncftp2/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile index de835d63314..099969daf29 100644 --- a/net/ncftp2/Makefile +++ b/net/ncftp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2001/07/27 19:11:29 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2002/08/25 21:50:04 jlam Exp $ # FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp # @@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ncftp.com/ncftp/ COMMENT= FTP replacement with advanced user interface -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-extra-dirs CONFIGURE_ARGS+= --disable-ncurses @@ -21,18 +21,18 @@ CONFIGURE_ENV+= ac_cv_lib_intl_strftime=no # Include SOCKS firewall support .if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5) BUILD_DEFS+= USE_SOCKS -.if ${USE_SOCKS} == 4 +. if ${USE_SOCKS} == 4 CONFIGURE_ARGS+= --enable-socks -.include "../../net/socks4/buildlink.mk" -.else +. include "../../net/socks4/buildlink2.mk" +. else CONFIGURE_ARGS+= --enable-socks5 -.include "../../net/socks5/buildlink.mk" -.endif +. include "../../net/socks5/buildlink2.mk" +. endif .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2 ${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/man/man1/ncftp2.1 -.include "../../devel/readline/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |