Date: Fri, 18 Apr 2014 19:00:31 +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: r351559 - head/ftp/bsdftpd-ssl Message-ID: <201404181900.s3IJ0VwT097185@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri Apr 18 19:00:31 2014 New Revision: 351559 URL: http://svnweb.freebsd.org/changeset/ports/351559 QAT: https://qat.redports.org/buildarchive/r351559/ Log: STAGE support. Turn "CLIENT_ONLY" into an OPTION. Put examples into EXAMPLESDIR instead of DOCSDIR. Modified: head/ftp/bsdftpd-ssl/Makefile head/ftp/bsdftpd-ssl/pkg-plist Modified: head/ftp/bsdftpd-ssl/Makefile ============================================================================== --- head/ftp/bsdftpd-ssl/Makefile Fri Apr 18 18:54:31 2014 (r351558) +++ head/ftp/bsdftpd-ssl/Makefile Fri Apr 18 19:00:31 2014 (r351559) @@ -3,118 +3,76 @@ PORTNAME= bsdftpd-ssl PORTVERSION= 1.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ftp MASTER_SITES= http://bsdftpd.org/files/bsdftpd-ssl/archive/1.1/src/ \ http://www.sourcefiles.org/System/Daemons/FTP/ -.if defined(CLIENT_ONLY) -PKGNAMESUFFIX= -client -.endif MAINTAINER= skynick@mail.sc.ru -COMMENT= Secure FTP server with the TLS/SSL support -.if defined(CLIENT_ONLY) -COMMENT= FTP command-line client utility with the TLS/SSL support -.endif +COMMENT= Secure FTP client/server with TLS/SSL support USE_OPENSSL= yes - MAKE_ENV+= OBJFORMAT=elf +MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= SERVER +SERVER_DESC= Build/install FTP server as well +OPTIONS_SUB= yes +USE_RC_SUBR= ${PORTNAME} -# Client only part -.if defined(CLIENT_ONLY) -DESCR= ${FILESDIR}/pkg-descr.client -PLIST= ${FILESDIR}/pkg-plist.client -.endif -# Client part -MAN1= ftps.1 -# Server part +# in case people still have CLIENT_ONLY defined... .if !defined(CLIENT_ONLY) -MAN5= ftpchroot.5 xferlog.5 -MAN8= ftpd.8 -MLINKS= ftpd.8 ftpd-ssl.8 ftpchroot.5 ftpchroot-ssl.5 -.if ${PORT_OPTIONS:MEXAMPLES} -SUB_FILES= pkg-message -.endif -USE_RC_SUBR= ${PORTNAME} +OPTIONS_DEFAULT=SERVER .endif -MANCOMPRESSED= yes +.include <bsd.port.options.mk> -BINOWN= root -BINGRP= wheel -SHAREOWN= ${BINOWN} -SHAREGRP= ${BINGRP} -MANOWN= ${BINOWN} -MANGRP= ${BINGRP} -BINMODE= 555 -SHAREMODE= 444 -MANMODE= ${SHAREMODE} +.if ${PORT_OPTIONS:MSERVER} && ${PORT_OPTIONS:MEXAMPLES} +SUB_FILES= pkg-message +.endif -MANDIR= ${PREFIX}/man/man -DOCDIR= ${DOCSDIR}${PKGNAMESUFFIX} +post-patch: + ${MV} ${WRKSRC}/docs/README ${WRKSRC}/docs/README-docs -pre-build: - (cd ${WRKSRC} && ./config.sh FreeBSD) || exit +do-configure: + (cd ${WRKSRC} && ./config.sh FreeBSD) || true do-build: -# Client part - (cd ${WRKSRC}/port && ${SETENV} ${MAKE_ENV} make && cd ${WRKSRC}/ftp && ${SETENV} ${MAKE_ENV} make) || exit -# Server part -.if !defined(CLIENT_ONLY) - (cd ${WRKSRC}/ftpd && ${SETENV} ${MAKE_ENV} make) || exit + ${DO_MAKE_BUILD} -C ${WRKSRC}/port + ${DO_MAKE_BUILD} -C ${WRKSRC}/ftp +.if ${PORT_OPTIONS:MSERVER} + ${DO_MAKE_BUILD} -C ${WRKSRC}/ftpd .endif do-install: # Client part - ${INSTALL_PROGRAM} ${WRKSRC}/ftp/ftps ${PREFIX}/bin/ftps - ${INSTALL_MAN} ${WRKSRC}/ftp/ftps.1.gz ${MANDIR}1/ftps.1.gz + ${INSTALL_PROGRAM} ${WRKSRC}/ftp/ftps ${STAGEDIR}${PREFIX}/bin/ftps + ${INSTALL_MAN} ${WRKSRC}/ftp/ftps.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ftps.1.gz # Server part -.if !defined(CLIENT_ONLY) - ${INSTALL_PROGRAM} ${WRKSRC}/ftpd/ftpd ${PREFIX}/libexec/ftpd - ${INSTALL_MAN} ${WRKSRC}/ftpd/ftpchroot.5.gz ${MANDIR}5/ftpchroot.5.gz - ${INSTALL_MAN} ${WRKSRC}/ftpd/xferlog.5.gz ${MANDIR}5/xferlog.5.gz - ${INSTALL_MAN} ${WRKSRC}/ftpd/ftpd.8.gz ${MANDIR}8/ftpd.8.gz +.if ${PORT_OPTIONS:MSERVER} + ${INSTALL_PROGRAM} ${WRKSRC}/ftpd/ftpd ${STAGEDIR}${PREFIX}/libexec/ftpd + ${INSTALL_MAN} ${WRKSRC}/ftpd/ftpchroot.5.gz ${STAGEDIR}${MANPREFIX}/man/man5/ftpchroot.5.gz + ${INSTALL_MAN} ${WRKSRC}/ftpd/xferlog.5.gz ${STAGEDIR}${MANPREFIX}/man/man5/xferlog.5.gz + ${INSTALL_MAN} ${WRKSRC}/ftpd/ftpd.8.gz ${STAGEDIR}${MANPREFIX}/man/man8/ftpd.8.gz + ${LN} -s ftpchroot.5.gz ${STAGEDIR}${MANPREFIX}/man/man5/ftpchroot-ssl.5.gz + ${LN} -s ftpd.8.gz ${STAGEDIR}${MANPREFIX}/man/man8/ftpd-ssl.8.gz .endif post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCDIR} - ${INSTALL_DATA} -p ${WRKSRC}/COPYRIGHT ${DOCDIR}/COPYRIGHT - ${INSTALL_DATA} -p ${WRKSRC}/README ${DOCDIR}/README - ${INSTALL_DATA} -p ${WRKSRC}/INSTALL ${DOCDIR}/INSTALL - ${INSTALL_DATA} -p ${WRKSRC}/ChangeLog ${DOCDIR}/ChangeLog - - ${MKDIR} ${DOCDIR}/docs - ${INSTALL_DATA} -p ${WRKSRC}/docs/README ${DOCDIR}/docs/README - ${INSTALL_DATA} -p ${WRKSRC}/docs/cert-basics.txt ${DOCDIR}/docs/cert-basics.txt - ${INSTALL_DATA} -p ${WRKSRC}/docs/cert-howto.txt ${DOCDIR}/docs/cert-howto.txt - ${INSTALL_DATA} -p ${WRKSRC}/docs/ciphers.txt ${DOCDIR}/docs/ciphers.txt - ${INSTALL_DATA} -p ${WRKSRC}/docs/licenses ${DOCDIR}/docs/licenses - ${INSTALL_DATA} -p ${WRKSRC}/docs/standards.txt ${DOCDIR}/docs/standards.txt - ${INSTALL_DATA} -p ${WRKSRC}/docs/verify.txt ${DOCDIR}/docs/verify.txt - ${INSTALL_DATA} -p ${WRKSRC}/docs/x509_auth.txt ${DOCDIR}/docs/x509_auth.txt - - ${MKDIR} ${DOCDIR}/cert - ${INSTALL_SCRIPT} -p ${WRKSRC}/cert/cert-nopass.sh ${DOCDIR}/cert/cert-nopass.sh - ${INSTALL_SCRIPT} -p ${WRKSRC}/cert/cert-pass.sh ${DOCDIR}/cert/cert-pass.sh - ${INSTALL_SCRIPT} -p ${WRKSRC}/cert/cert-dummy.sh ${DOCDIR}/cert/cert-dummy.sh - ${INSTALL_SCRIPT} -p ${WRKSRC}/cert/xCA.sh ${DOCDIR}/cert/xCA.sh -.endif -.if !defined(CLIENT_ONLY) -.if ${PORT_OPTIONS:MEXAMPLES} - ${MKDIR} ${EXAMPLESDIR}/rc.conf.d - ${INSTALL_DATA} -p ${FILESDIR}/README.examples ${EXAMPLESDIR}/README - ${INSTALL_DATA} -p ${FILESDIR}/ftpchroot ${EXAMPLESDIR}/ftpchroot - ${INSTALL_DATA} -p ${FILESDIR}/ftpusers ${EXAMPLESDIR}/ftpusers - ${INSTALL_DATA} -p ${FILESDIR}/rc_conf_d.bsdftpd_ssl ${EXAMPLESDIR}/rc.conf.d/bsdftpd_ssl - @${ECHO_CMD} "*******************************************************************************" - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} "*******************************************************************************" -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} +. for file in COPYRIGHT README INSTALL ChangeLog + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} +. endfor +.endif + +.if ${PORT_OPTIONS:MSERVER} && ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/cert + ${INSTALL_SCRIPT} ${WRKSRC}/cert/* ${STAGEDIR}${EXAMPLESDIR}/cert +. for file in README.examples ftpchroot ftpusers rc_conf_d.bsdftpd_ssl + ${INSTALL_DATA} ${FILESDIR}/${file} ${STAGEDIR}${EXAMPLESDIR} +. endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/ftp/bsdftpd-ssl/pkg-plist ============================================================================== --- head/ftp/bsdftpd-ssl/pkg-plist Fri Apr 18 18:54:31 2014 (r351558) +++ head/ftp/bsdftpd-ssl/pkg-plist Fri Apr 18 19:00:31 2014 (r351559) @@ -1,27 +1,31 @@ bin/ftps -libexec/ftpd +man/man1/ftps.1.gz +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/cert/cert-nopass.sh -%%PORTDOCS%%%%DOCSDIR%%/cert/cert-pass.sh -%%PORTDOCS%%%%DOCSDIR%%/cert/cert-dummy.sh -%%PORTDOCS%%%%DOCSDIR%%/cert/xCA.sh -%%PORTDOCS%%%%DOCSDIR%%/docs/README -%%PORTDOCS%%%%DOCSDIR%%/docs/cert-basics.txt -%%PORTDOCS%%%%DOCSDIR%%/docs/cert-howto.txt -%%PORTDOCS%%%%DOCSDIR%%/docs/ciphers.txt -%%PORTDOCS%%%%DOCSDIR%%/docs/licenses -%%PORTDOCS%%%%DOCSDIR%%/docs/standards.txt -%%PORTDOCS%%%%DOCSDIR%%/docs/verify.txt -%%PORTDOCS%%%%DOCSDIR%%/docs/x509_auth.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpchroot -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpusers -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc.conf.d/bsdftpd_ssl -%%PORTDOCS%%@dirrm %%DOCSDIR%%/cert -%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rc.conf.d +%%PORTDOCS%%%%DOCSDIR%%/README-docs +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/cert-basics.txt +%%PORTDOCS%%%%DOCSDIR%%/cert-howto.txt +%%PORTDOCS%%%%DOCSDIR%%/ciphers.txt +%%PORTDOCS%%%%DOCSDIR%%/licenses +%%PORTDOCS%%%%DOCSDIR%%/standards.txt +%%PORTDOCS%%%%DOCSDIR%%/verify.txt +%%PORTDOCS%%%%DOCSDIR%%/x509_auth.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cert/cert-nopass.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cert/cert-pass.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cert/cert-dummy.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cert/xCA.sh +%%SERVER%%libexec/ftpd +%%SERVER%%man/man5/ftpchroot.5.gz +%%SERVER%%man/man5/ftpchroot-ssl.5.gz +%%SERVER%%man/man5/xferlog.5.gz +%%SERVER%%man/man8/ftpd.8.gz +%%SERVER%%man/man8/ftpd-ssl.8.gz +%%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.examples +%%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpchroot +%%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpusers +%%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc_conf_d.bsdftpd_ssl +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cert %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404181900.s3IJ0VwT097185>