Date: Sun, 16 Mar 2014 21:31:14 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348433 - head/ftp/ncftp3 Message-ID: <201403162131.s2GLVEFO074378@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sun Mar 16 21:31:13 2014 New Revision: 348433 URL: http://svnweb.freebsd.org/changeset/ports/348433 QAT: https://qat.redports.org/buildarchive/r348433/ Log: Clean up. Support STAGE. Turn the optional libraries into an OPTION. Install docs. Respect MAKE_ARGS/MAKE_ENV/MAKE_CMD. Modified: head/ftp/ncftp3/Makefile head/ftp/ncftp3/pkg-plist Modified: head/ftp/ncftp3/Makefile ============================================================================== --- head/ftp/ncftp3/Makefile Sun Mar 16 21:30:48 2014 (r348432) +++ head/ftp/ncftp3/Makefile Sun Mar 16 21:31:13 2014 (r348433) @@ -9,62 +9,52 @@ MASTER_SITES= ftp://ftp.ncftp.com/ncftp/ ftp://ftp.mirrorservice.org/sites/ftp.ncftp.com/ncftp/ DISTNAME= ncftp-${PORTVERSION}-src -.if !defined(WITHOUT_NCFTP_IPV6) && !defined(WITHOUT_IPV6) -#PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ -#PATCHFILES= ncftp-323-v6-20091109.diff.gz -#PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= obrien@FreeBSD.org -COMMENT= ftp replacement with advanced user interface +COMMENT= FTP client with advanced user interface -USE_BZIP2= yes +LICENSE_FILE= ${WRKSRC}/doc/LICENSE.txt -NO_STAGE= yes -.include <bsd.port.pre.mk> +USES= tar:bzip2 WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-ncurses -CONFIGURE_ENV= TAR=/usr/bin/tar -PLIST_SUB= NCFTP=${LATEST_LINK} -MAN1= ${LATEST_LINK}.1 ncftpbatch.1 ncftpget.1 ncftpls.1 ncftpput.1 \ - ncftpspooler.1 -MAN3= Strn.3 + +OPTIONS_DEFINE= LIBS DOCS +OPTIONS_DEFAULT=LIBS +LIBS_DESC= Install optional libraries +OPTIONS_SUB= yes + +PORTDOCS= * LIBNCFTP= libncftp.so.3 LIBSIO= libsio.so.5 LIBSTRN= libStrn.so.1 -pre-fetch: - @${ECHO} "" - @${ECHO} "Use INSTALL_AS_NCFTP3=yes to install ncftp v3 as ${PREFIX}/bin/ncftp3" - @${ECHO} "" +.include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MLIBS} pre-build: - cd ${WRKSRC}/Strn ; make so - cd ${WRKSRC}/libncftp ; make so - cd ${WRKSRC}/sio; make so +.for dir in Strn libncftp sio + ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -C ${WRKSRC}/${dir} so +.endfor +.endif do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/bin/ncftp ${PREFIX}/bin/${LATEST_LINK} - @cd ${WRKSRC}/bin ; ${INSTALL_PROGRAM} \ - ncftpbatch ncftpbookmarks ncftpget ncftpls ncftpput \ - ${PREFIX}/bin - @cd ${PREFIX}/bin && ${LN} -f ncftpbatch ncftpspooler - @cd ${WRKSRC} && ${INSTALL_DATA} \ - Strn/${LIBSTRN} libncftp/${LIBNCFTP} sio/${LIBSIO} \ - ${PREFIX}/lib - @cd ${PREFIX}/lib \ - && ${LN} -sf ${LIBSTRN} libStrn.so \ - && ${LN} -sf ${LIBNCFTP} libncftp.so \ - && ${LN} -sf ${LIBSIO} libsio.so - @${INSTALL_MAN} ${WRKSRC}/doc/man/ncftp.1 \ - ${PREFIX}/man/man1/${LATEST_LINK}.1 - @cd ${WRKSRC}/doc/man ; ${INSTALL_MAN} \ - ncftpbatch.1 ncftpget.1 ncftpls.1 ncftpput.1 ncftpspooler.1 \ - ${PREFIX}/man/man1 - @${INSTALL_MAN} ${WRKSRC}/Strn/Strn.3 ${PREFIX}/man/man3 + ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/bin + ${LN} -sf ncftpbatch ${STAGEDIR}${PREFIX}/bin/ncftpspooler + ${INSTALL_MAN} ${WRKSRC}/doc/man/* ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Strn/Strn.3 ${STAGEDIR}${MANPREFIX}/man/man3 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + -${RM} -r ${STAGEDIR}${DOCSDIR}/man + +.if ${PORT_OPTIONS:MLIBS} + ${INSTALL_LIB} ${WRKSRC}/Strn/${LIBSTRN} ${STAGEDIR}${PREFIX}/lib +.for lib in libncftp/${LIBNCFTP} sio/${LIBSIO} Strn/${LIBSTRN} + ${INSTALL_LIB} ${WRKSRC}/${lib} ${STAGEDIR}${PREFIX}/lib + ${LN} -sf ${lib:T} ${STAGEDIR}${PREFIX}/lib/${lib:T:R} +.endfor +.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/ftp/ncftp3/pkg-plist ============================================================================== --- head/ftp/ncftp3/pkg-plist Sun Mar 16 21:30:48 2014 (r348432) +++ head/ftp/ncftp3/pkg-plist Sun Mar 16 21:31:13 2014 (r348433) @@ -1,13 +1,20 @@ -lib/libStrn.so -lib/libStrn.so.1 -lib/libncftp.so -lib/libncftp.so.3 -lib/libsio.so -lib/libsio.so.5 -bin/%%NCFTP%% +bin/ncftp bin/ncftpbatch bin/ncftpbookmarks bin/ncftpget bin/ncftpls bin/ncftpput bin/ncftpspooler +man/man1/ncftp.1.gz +man/man1/ncftpbatch.1.gz +man/man1/ncftpget.1.gz +man/man1/ncftpls.1.gz +man/man1/ncftpput.1.gz +man/man1/ncftpspooler.1.gz +%%LIBS%%lib/libStrn.so +%%LIBS%%lib/libStrn.so.1 +%%LIBS%%lib/libncftp.so +%%LIBS%%lib/libncftp.so.3 +%%LIBS%%lib/libsio.so +%%LIBS%%lib/libsio.so.5 +%%LIBS%%man/man3/Strn.3.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403162131.s2GLVEFO074378>