diff options
| -rw-r--r-- | ftp/ncftp/Makefile | 13 | ||||
| -rw-r--r-- | ftp/ncftp/pkg-plist | 2 | ||||
| -rw-r--r-- | ftp/ncftp1/Makefile | 13 | ||||
| -rw-r--r-- | ftp/ncftp1/pkg-plist | 2 | ||||
| -rw-r--r-- | ftp/ncftp2/Makefile | 14 | ||||
| -rw-r--r-- | ftp/ncftp3/Makefile | 8 |
6 files changed, 40 insertions, 12 deletions
diff --git a/ftp/ncftp/Makefile b/ftp/ncftp/Makefile index 1766676e5911..774dacdc0827 100644 --- a/ftp/ncftp/Makefile +++ b/ftp/ncftp/Makefile @@ -15,10 +15,21 @@ DISTNAME= ncftp-${PORTVERSION} MAINTAINER= obrien@FreeBSD.org COMMENT= FTP replacement with advanced user interface +.if defined(INSTALL_AS_NCFTP) +LATEST_LINK= ncftp +.else +LATEST_LINK= ncftp1 +.endif +PLIST_FILES= bin/${LATEST_LINK} MAN1= ncftp.1 +pre-fetch: + @${ECHO} "" + @${ECHO} "Use INSTALL_AS_NCFTP=yes to install ncftp1 as ${PREFIX}/bin/ncftp" + @${ECHO} "" + do-install: - cd ${WRKSRC}; ${INSTALL_PROGRAM} ncftp ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/${LATEST_LINK} cd ${WRKSRC}; ${INSTALL_MAN} ncftp.1 ${PREFIX}/man/man1 .include <bsd.port.mk> diff --git a/ftp/ncftp/pkg-plist b/ftp/ncftp/pkg-plist deleted file mode 100644 index 6a1d82889115..000000000000 --- a/ftp/ncftp/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -@comment $FreeBSD$ -bin/ncftp diff --git a/ftp/ncftp1/Makefile b/ftp/ncftp1/Makefile index 1766676e5911..774dacdc0827 100644 --- a/ftp/ncftp1/Makefile +++ b/ftp/ncftp1/Makefile @@ -15,10 +15,21 @@ DISTNAME= ncftp-${PORTVERSION} MAINTAINER= obrien@FreeBSD.org COMMENT= FTP replacement with advanced user interface +.if defined(INSTALL_AS_NCFTP) +LATEST_LINK= ncftp +.else +LATEST_LINK= ncftp1 +.endif +PLIST_FILES= bin/${LATEST_LINK} MAN1= ncftp.1 +pre-fetch: + @${ECHO} "" + @${ECHO} "Use INSTALL_AS_NCFTP=yes to install ncftp1 as ${PREFIX}/bin/ncftp" + @${ECHO} "" + do-install: - cd ${WRKSRC}; ${INSTALL_PROGRAM} ncftp ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/${LATEST_LINK} cd ${WRKSRC}; ${INSTALL_MAN} ncftp.1 ${PREFIX}/man/man1 .include <bsd.port.mk> diff --git a/ftp/ncftp1/pkg-plist b/ftp/ncftp1/pkg-plist deleted file mode 100644 index 6a1d82889115..000000000000 --- a/ftp/ncftp1/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -@comment $FreeBSD$ -bin/ncftp diff --git a/ftp/ncftp2/Makefile b/ftp/ncftp2/Makefile index f2e59f07b00d..88fa13aaaee0 100644 --- a/ftp/ncftp2/Makefile +++ b/ftp/ncftp2/Makefile @@ -13,18 +13,28 @@ MASTER_SITES= ftp://ftp.ncftp.com/ncftp/ MAINTAINER= ports@FreeBSD.org COMMENT= FTP replacement with advanced user interface +.if defined(INSTALL_AS_NCFTP) +LATEST_LINK= ncftp +.else +LATEST_LINK= ncftp2 +.endif +PLIST_FILES= bin/${LATEST_LINK} GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_func_getmaxyx=yes ac_cv_lib_readline=yes MAN1= ncftp2.1 -PLIST_FILES= bin/ncftp2 .if defined(WITH_SOCKS) BUILD_DEPENDS= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 CONFIGURE_ARGS+=--enable-socks5 .endif +pre-fetch: + @${ECHO} "" + @${ECHO} "Use INSTALL_AS_NCFTP=yes to install ncftp1 as ${PREFIX}/bin/ncftp" + @${ECHO} "" + do-install: - $(INSTALL_PROGRAM) $(WRKSRC)/ncftp $(PREFIX)/bin/ncftp2 + $(INSTALL_PROGRAM) $(WRKSRC)/ncftp $(PREFIX)/bin/${LATEST_LINK} $(INSTALL_MAN) $(WRKSRC)/ncftp.1 $(PREFIX)/man/man1/ncftp2.1 .include <bsd.port.mk> diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile index c72f10da36a2..2066070255a7 100644 --- a/ftp/ncftp3/Makefile +++ b/ftp/ncftp3/Makefile @@ -24,10 +24,10 @@ USE_BZIP2= yes .include <bsd.port.pre.mk> -.if defined(INSTALL_AS_NCFTP) -LATEST_LINK= ncftp -.else +.if defined(INSTALL_AS_NCFTP3) LATEST_LINK= ncftp3 +.else +LATEST_LINK= ncftp .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} INSTALLS_SHLIB= yes @@ -44,7 +44,7 @@ LIBSTRN= libStrn.so.1 pre-fetch: @${ECHO} "" - @${ECHO} "Use INSTALL_AS_NCFTP=yes to install ncftp3 as ${PREFIX}/bin/ncftp" + @${ECHO} "Use INSTALL_AS_NCFTP3=yes to install ncftp v3 as ${PREFIX}/bin/ncftp3" @${ECHO} "" pre-build: |