From 72173ae40a3c3cc1a23bba84b7ed08e57ae4f92e Mon Sep 17 00:00:00 2001 From: pav Date: Mon, 5 Jan 2009 19:44:02 +0000 Subject: - Remove conditional checks for FreeBSD 5.x and older --- ftp/bsdftpd-ssl/Makefile | 16 --------- ftp/bsdftpd-ssl/files/bsdftpd_ssl.sh.compat | 48 ------------------------- ftp/bsdftpd-ssl/files/pkg-message.server.compat | 14 -------- ftp/bsdftpd-ssl/files/pkg-plist.server.compat | 22 ------------ 4 files changed, 100 deletions(-) delete mode 100644 ftp/bsdftpd-ssl/files/bsdftpd_ssl.sh.compat delete mode 100644 ftp/bsdftpd-ssl/files/pkg-message.server.compat delete mode 100644 ftp/bsdftpd-ssl/files/pkg-plist.server.compat (limited to 'ftp/bsdftpd-ssl') diff --git a/ftp/bsdftpd-ssl/Makefile b/ftp/bsdftpd-ssl/Makefile index 3d8a44b9ffef..53042f104f04 100644 --- a/ftp/bsdftpd-ssl/Makefile +++ b/ftp/bsdftpd-ssl/Makefile @@ -35,12 +35,7 @@ MAN8= ftpd.8 MLINKS= ftpd.8 ftpd-ssl.8 ftpchroot.5 ftpchroot-ssl.5 PKGMESSAGE= ${WRKDIR}/pkg-message SED_ARG= 's|%%PREFIX%%|${PREFIX}|g; s|%%DOCSDIR%%|${DOCSDIR}|g; s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g; s|%%RC_SUBR%%|${RC_SUBR}|g' -. if ${OSVERSION} >= 503001 -# FreeBSD >= 5.3 USE_RC_SUBR= yes -. else -PLIST= ${FILESDIR}/pkg-plist.server.compat -. endif .endif MANCOMPRESSED= yes @@ -67,16 +62,10 @@ do-build: # Server part .if !defined(CLIENT_ONLY) (cd ${WRKSRC}/ftpd && make) || exit -. if ${OSVERSION} >= 503001 -# FreeBSD >= 5.3 @${SED} ${SED_ARG} ${FILESDIR}/pkg-message.server > \ ${WRKDIR}/pkg-message @${SED} ${SED_ARG} ${FILESDIR}/bsdftpd_ssl.sh > \ ${WRKDIR}/bsdftpd_ssl.sh -. else - @${SED} ${SED_ARG} ${FILESDIR}/pkg-message.server.compat > \ - ${WRKDIR}/pkg-message -. endif .endif do-install: @@ -116,8 +105,6 @@ post-install: ${INSTALL_SCRIPT} -p ${WRKSRC}/cert/xCA.sh ${DOCDIR}/cert/xCA.sh .endif .if !defined(CLIENT_ONLY) -. if ${OSVERSION} >= 503001 -# FreeBSD >= 5.3 ${MKDIR} ${EXAMPLESDIR} ${MKDIR} ${EXAMPLESDIR}/rc.conf.d ${INSTALL_DATA} -p ${FILESDIR}/README.examples ${EXAMPLESDIR}/README @@ -125,9 +112,6 @@ post-install: ${INSTALL_DATA} -p ${FILESDIR}/ftpusers ${EXAMPLESDIR}/ftpusers ${INSTALL_DATA} -p ${FILESDIR}/rc_conf_d.bsdftpd_ssl ${EXAMPLESDIR}/rc.conf.d/bsdftpd_ssl ${INSTALL_SCRIPT} ${WRKDIR}/bsdftpd_ssl.sh ${PREFIX}/etc/rc.d/bsdftpd_ssl.sh -. else - ${INSTALL_SCRIPT} ${FILESDIR}/bsdftpd_ssl.sh.compat ${PREFIX}/etc/rc.d/bsdftpd_ssl.sh.sample -. endif @${ECHO_CMD} "*******************************************************************************" @${CAT} ${PKGMESSAGE} @${ECHO_CMD} "*******************************************************************************" diff --git a/ftp/bsdftpd-ssl/files/bsdftpd_ssl.sh.compat b/ftp/bsdftpd-ssl/files/bsdftpd_ssl.sh.compat deleted file mode 100644 index 94f75034ee6d..000000000000 --- a/ftp/bsdftpd-ssl/files/bsdftpd_ssl.sh.compat +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -# This is the startup script that runs bsdftpd-ssl FTP server in FreeBSD 4.x. - -# Set the value to "YES" to make this script actually do something. -ENABLE="NO" - -# Add extra options here for the FTP server. -# See ftpd-ssl(8) for more details. -EXTRAOPTS="-l" - -# You shouldn't edit anything below... -case ${ENABLE} in - [Yy][Ee][Ss]) - ;; - *) - exit 0 - ;; -esac - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - if [ -x ${PREFIX}/libexec/ftpd ]; then - ${PREFIX}/libexec/ftpd -D -p /var/run/ftpd.pid ${EXTRAOPTS} > /dev/null - echo -n ' BSDftpd-ssl' - fi - ;; -stop) - if [ -r /var/run/ftpd.pid ]; then - kill -TERM `cat /var/run/ftpd.pid` - rm -f /var/run/ftpd.pid - echo -n ' BSDftpd-ssl' - fi - ;; -*) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 1 - ;; -esac - -exit 0 diff --git a/ftp/bsdftpd-ssl/files/pkg-message.server.compat b/ftp/bsdftpd-ssl/files/pkg-message.server.compat deleted file mode 100644 index 8637a1fbc643..000000000000 --- a/ftp/bsdftpd-ssl/files/pkg-message.server.compat +++ /dev/null @@ -1,14 +0,0 @@ -============================================================================= -You will also need to read "Configuration" and "Supplement information" parts -of %%DOCSDIR%%/INSTALL file from the package documentation -for the subsequent configuration steps: - 1. Create the server certificate - 2. Edit PAM configuration - 3. Start the FTP server - -If you want to run the FTP server in the daemon mode, you can copy the sample -start-up script %%PREFIX%%/etc/rc.d/bsdftpd_ssl.sh.sample to -%%PREFIX%%/etc/rc.d/bsdftpd_ssl.sh. - -Please note: the manual page for the FTP server is available as ftpd-ssl(8). -============================================================================= diff --git a/ftp/bsdftpd-ssl/files/pkg-plist.server.compat b/ftp/bsdftpd-ssl/files/pkg-plist.server.compat deleted file mode 100644 index 71c4aff5a04d..000000000000 --- a/ftp/bsdftpd-ssl/files/pkg-plist.server.compat +++ /dev/null @@ -1,22 +0,0 @@ -bin/ftps -etc/rc.d/bsdftpd_ssl.sh.sample -libexec/ftpd -%%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 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/cert -%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs -%%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit