diff options
author | pav <pav@FreeBSD.org> | 2009-01-06 03:44:02 +0800 |
---|---|---|
committer | pav <pav@FreeBSD.org> | 2009-01-06 03:44:02 +0800 |
commit | 72173ae40a3c3cc1a23bba84b7ed08e57ae4f92e (patch) | |
tree | d1102c67d6d770e809475dae366f152130cb1883 /ftp | |
parent | 5ae596207dc0bd85ca28a43d715d82bc6b358b81 (diff) | |
download | freebsd-ports-gnome-72173ae40a3c3cc1a23bba84b7ed08e57ae4f92e.tar.gz freebsd-ports-gnome-72173ae40a3c3cc1a23bba84b7ed08e57ae4f92e.tar.zst freebsd-ports-gnome-72173ae40a3c3cc1a23bba84b7ed08e57ae4f92e.zip |
- Remove conditional checks for FreeBSD 5.x and older
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/bsdftpd-ssl/Makefile | 16 | ||||
-rw-r--r-- | ftp/bsdftpd-ssl/files/bsdftpd_ssl.sh.compat | 48 | ||||
-rw-r--r-- | ftp/bsdftpd-ssl/files/pkg-message.server.compat | 14 | ||||
-rw-r--r-- | ftp/bsdftpd-ssl/files/pkg-plist.server.compat | 22 | ||||
-rw-r--r-- | ftp/ftp-proxy/Makefile | 4 | ||||
-rw-r--r-- | ftp/ftpsesame/Makefile | 8 | ||||
-rw-r--r-- | ftp/ncftpd/Makefile | 4 | ||||
-rw-r--r-- | ftp/pftpx/Makefile | 14 | ||||
-rw-r--r-- | ftp/profxp/Makefile | 9 |
9 files changed, 4 insertions, 135 deletions
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%% diff --git a/ftp/ftp-proxy/Makefile b/ftp/ftp-proxy/Makefile index f9d691561ea2..276d829fae65 100644 --- a/ftp/ftp-proxy/Makefile +++ b/ftp/ftp-proxy/Makefile @@ -30,10 +30,6 @@ CFLAGS+= -I${LOCALBASE}/include IGNORE= is a part of base for 7.0 and above .endif -.if ${OSVERSION} < 502106 -IGNORE= only for 5.3 and above -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ftp-proxy ${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/ftp-proxy.8.gz ${PREFIX}/man/man8 diff --git a/ftp/ftpsesame/Makefile b/ftp/ftpsesame/Makefile index 6a5c0f7d476e..074f06febc8c 100644 --- a/ftp/ftpsesame/Makefile +++ b/ftp/ftpsesame/Makefile @@ -21,10 +21,4 @@ USE_RC_SUBR= ftpsesame.sh MAKE_ARGS= PREFIX=${PREFIX} MANPREFIX=${MANPREFIX} -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 600034 -IGNORE= need BIOCLOCK and BIOCSETWF ioctls (FreeBSD 6.0+) -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ftp/ncftpd/Makefile b/ftp/ncftpd/Makefile index a7c17a65cd53..b586018764d0 100644 --- a/ftp/ncftpd/Makefile +++ b/ftp/ncftpd/Makefile @@ -32,10 +32,8 @@ PORTDOCS= install.html README README.freebsd LICENSE .if ${OSVERSION} >= 700000 BINVER= 7.0 -.elif ${OSVERSION} >= 600000 -BINVER= 6.0 .else -BROKEN= FreeBSD version too old +BINVER= 6.0 .endif .if ${ARCH} == amd64 diff --git a/ftp/pftpx/Makefile b/ftp/pftpx/Makefile index 8652223ddcdb..457f90c732f1 100644 --- a/ftp/pftpx/Makefile +++ b/ftp/pftpx/Makefile @@ -21,23 +21,11 @@ MAN8= pftpx.8 PLIST_FILES= sbin/pftpx USE_RC_SUBR= pftpx -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 502116 -MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=34 -.if defined(WITH_ALTQ) && (${WITH_ALTQ} == "yes") -CFLAGS+= -DHAVE_ALTQ=1 -.endif -.elif ${OSVERSION} < 600025 -MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=35 -CFLAGS+= -DHAVE_ALTQ=1 -DHAVE_RULE_ANCHOR=1 -.else MAKE_ARGS= LOCALBASE="${PREFIX}" OSLEVEL=37 CFLAGS+= -DHAVE_ALTQ=1 -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pftpx ${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/pftpx.8 ${PREFIX}/man/man8 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ftp/profxp/Makefile b/ftp/profxp/Makefile index 90d36e2bd9bf..721c373a603f 100644 --- a/ftp/profxp/Makefile +++ b/ftp/profxp/Makefile @@ -17,18 +17,11 @@ COMMENT= FXP (server-to-server FTP) client USE_PERL5= yes -.include <bsd.port.pre.mk> - RUN_DEPENDS= ${PERL_SITELIBDIR}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ ${PERL_SITELIBDIR}/Net/SOCKS.pm:${PORTSDIR}/net/p5-Socks \ ${PERL_SITELIBDIR}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \ ${PERL_SITELIBDIR}/Term/ReadLine/Perl.pm:${PORTSDIR}/devel/p5-ReadLine-Perl -# perl 5.6.0 -.if ${OSVERSION} < 500007 -RUN_DEPENDS+= ${PERL_SITELIBDIR}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor -.endif - PERL_SITELIBDIR= ${SITE_PERL} WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes @@ -40,4 +33,4 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/profxpv3.pl ${PREFIX}/bin/profxp ${CP} -R ${WRKSRC}/profxp ${SITE_PERL} -.include <bsd.port.post.mk> +.include <bsd.port.mk> |