summaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
Diffstat (limited to 'ftp')
-rw-r--r--ftp/linux-f10-curl/Makefile23
-rw-r--r--ftp/linux-f10-curl/distinfo.i3866
-rw-r--r--ftp/linux-f8-curl/Makefile23
-rw-r--r--ftp/linux-f8-curl/distinfo.i3866
-rw-r--r--ftp/ncftp1/Makefile35
-rw-r--r--ftp/ncftp1/distinfo3
-rw-r--r--ftp/ncftp1/files/patch-aa35
-rw-r--r--ftp/ncftp1/files/patch-ab11
-rw-r--r--ftp/ncftp1/files/patch-sys.h10
-rw-r--r--ftp/ncftp1/pkg-descr5
-rw-r--r--ftp/proftpd-devel/Makefile289
-rw-r--r--ftp/proftpd-devel/distinfo6
-rw-r--r--ftp/proftpd-devel/files/extra-patch-cyrillic-fix-netio.c50
-rw-r--r--ftp/proftpd-devel/files/patch-ah10
-rw-r--r--ftp/proftpd-devel/files/patch-contrib-mod_wrap2-Makefile.in11
-rw-r--r--ftp/proftpd-devel/files/patch-doc::Configuration.html18
-rw-r--r--ftp/proftpd-devel/files/patch-module::mod_auth_pam.c11
-rw-r--r--ftp/proftpd-devel/files/patch-sample-configurations_basic.conf79
-rw-r--r--ftp/proftpd-devel/files/patch-src-auth.c43
-rw-r--r--ftp/proftpd-devel/files/patch-src_proftpd.8.in15
-rw-r--r--ftp/proftpd-devel/files/proftpd.sh.in43
-rw-r--r--ftp/proftpd-devel/pkg-descr13
-rw-r--r--ftp/proftpd-devel/pkg-plist61
-rw-r--r--ftp/proftpd/Makefile6
-rw-r--r--ftp/proftpd/distinfo6
25 files changed, 6 insertions, 812 deletions
diff --git a/ftp/linux-f10-curl/Makefile b/ftp/linux-f10-curl/Makefile
deleted file mode 100644
index 08519bc08012..000000000000
--- a/ftp/linux-f10-curl/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for: linux-curl
-# Date created: 2006-08-04
-# Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= curl
-PORTVERSION= 7.13.1
-CATEGORIES= ftp linux
-PKGNAMEPREFIX= linux-
-DISTNAME= ${PORTNAME}-${PORTVERSION}-5.fc4
-
-MAINTAINER= acm@FreeBSD.org
-COMMENT= Curl linux version
-
-USE_LINUX_RPM= yes
-LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
-AUTOMATIC_PLIST= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
-.include <bsd.port.mk>
diff --git a/ftp/linux-f10-curl/distinfo.i386 b/ftp/linux-f10-curl/distinfo.i386
deleted file mode 100644
index 636b111cd295..000000000000
--- a/ftp/linux-f10-curl/distinfo.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (rpm/i386/fedora/4/curl-7.13.1-5.fc4.i386.rpm) = ee7edbd4508ba326e2448aa436d93cb4
-SHA256 (rpm/i386/fedora/4/curl-7.13.1-5.fc4.i386.rpm) = ac29a2ea2fa3a78904573e41b51b457df2fa9f4b8228f303abcfcca864718e8e
-SIZE (rpm/i386/fedora/4/curl-7.13.1-5.fc4.i386.rpm) = 268613
-MD5 (rpm/i386/fedora/4/curl-7.13.1-5.fc4.src.rpm) = 6bf9563972cc07ffed5f95b415e3818d
-SHA256 (rpm/i386/fedora/4/curl-7.13.1-5.fc4.src.rpm) = 826bec1ba67dbb1ef2192b7b11d1a14dee6e44c8fb1e1fae3f0efc947efb1e3d
-SIZE (rpm/i386/fedora/4/curl-7.13.1-5.fc4.src.rpm) = 1879750
diff --git a/ftp/linux-f8-curl/Makefile b/ftp/linux-f8-curl/Makefile
deleted file mode 100644
index 08519bc08012..000000000000
--- a/ftp/linux-f8-curl/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for: linux-curl
-# Date created: 2006-08-04
-# Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= curl
-PORTVERSION= 7.13.1
-CATEGORIES= ftp linux
-PKGNAMEPREFIX= linux-
-DISTNAME= ${PORTNAME}-${PORTVERSION}-5.fc4
-
-MAINTAINER= acm@FreeBSD.org
-COMMENT= Curl linux version
-
-USE_LINUX_RPM= yes
-LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
-AUTOMATIC_PLIST= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
-.include <bsd.port.mk>
diff --git a/ftp/linux-f8-curl/distinfo.i386 b/ftp/linux-f8-curl/distinfo.i386
deleted file mode 100644
index 636b111cd295..000000000000
--- a/ftp/linux-f8-curl/distinfo.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (rpm/i386/fedora/4/curl-7.13.1-5.fc4.i386.rpm) = ee7edbd4508ba326e2448aa436d93cb4
-SHA256 (rpm/i386/fedora/4/curl-7.13.1-5.fc4.i386.rpm) = ac29a2ea2fa3a78904573e41b51b457df2fa9f4b8228f303abcfcca864718e8e
-SIZE (rpm/i386/fedora/4/curl-7.13.1-5.fc4.i386.rpm) = 268613
-MD5 (rpm/i386/fedora/4/curl-7.13.1-5.fc4.src.rpm) = 6bf9563972cc07ffed5f95b415e3818d
-SHA256 (rpm/i386/fedora/4/curl-7.13.1-5.fc4.src.rpm) = 826bec1ba67dbb1ef2192b7b11d1a14dee6e44c8fb1e1fae3f0efc947efb1e3d
-SIZE (rpm/i386/fedora/4/curl-7.13.1-5.fc4.src.rpm) = 1879750
diff --git a/ftp/ncftp1/Makefile b/ftp/ncftp1/Makefile
deleted file mode 100644
index 774dacdc0827..000000000000
--- a/ftp/ncftp1/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for: ncftp
-# Date created: 20 Jun 1996
-# Whom: jkh
-#
-# $FreeBSD$
-#
-
-PORTNAME= ncftp1
-PORTVERSION= 1.9.5
-CATEGORIES= ftp
-MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
-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:
- ${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/distinfo b/ftp/ncftp1/distinfo
deleted file mode 100644
index a315809f0a62..000000000000
--- a/ftp/ncftp1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ncftp-1.9.5.tar.gz) = 302b24206852d727723ef8797ddb5164
-SHA256 (ncftp-1.9.5.tar.gz) = 00e35e8f1b59f5d9df7a4207faad14d51c60b4f9cda72158e49053eca85b4bfe
-SIZE (ncftp-1.9.5.tar.gz) = 95832
diff --git a/ftp/ncftp1/files/patch-aa b/ftp/ncftp1/files/patch-aa
deleted file mode 100644
index 7b5e57335254..000000000000
--- a/ftp/ncftp1/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig Sun Oct 1 17:50:58 1995
-+++ Makefile Sun Oct 19 02:18:45 2003
-@@ -13,7 +13,7 @@
-
- # Program definitions. See the README, part C.
- #--------------------------------------------------------------------------
--PDEFS =
-+PDEFS = -DREADLINE
- #PDEFS = -DGETLINE
- #PDEFS = -DREADLINE -DCURSES
- #PDEFS = -DSOCKS
-@@ -24,11 +24,12 @@
- # Choose your compiler and flags below. Make sure you use an ANSI compiler
- # that handles new style function declarations and prototypes (gcc should).
- #--------------------------------------------------------------------------
--CC = cc
-+CC ?= cc
- #CC = gcc
-
-+CFLAGS ?= -O -pipe
- #CFLAGS = $(TERM_INC) -O
--CFLAGS = $(TERM_INC) -O2
-+CFLAGS += $(TERM_INC)
- #CFLAGS = $(TERM_INC) -g
-
- LFLAGS = -s
-@@ -53,7 +54,7 @@
- # You'll need to know where the Rconnect.o object file is if you want
- # to use Socks.
- #--------------------------------------------------------------------------
--LIBS =
-+LIBS = -lreadline
- #LIBS = -ldbmalloc
- #LIBS = -lgetline
- #LIBS = -lreadline -lcurses
diff --git a/ftp/ncftp1/files/patch-ab b/ftp/ncftp1/files/patch-ab
deleted file mode 100644
index 05f6711e416e..000000000000
--- a/ftp/ncftp1/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.c.orig Sun Oct 29 19:17:55 1995
-+++ main.c Tue Feb 18 19:11:56 1997
-@@ -200,7 +200,7 @@
- ansi_escapes = 0;
- if ((cp = getenv("TERM")) != NULL) {
- if ((*cp == 'v' && cp[1] == 't') /* vt100, vt102, ... */
-- || (strcmp(cp, "xterm") == 0))
-+ || (strncmp(cp, "xterm", 5) == 0))
- ansi_escapes = 1;
- }
- #endif
diff --git a/ftp/ncftp1/files/patch-sys.h b/ftp/ncftp1/files/patch-sys.h
deleted file mode 100644
index 8d65c5ddc96c..000000000000
--- a/ftp/ncftp1/files/patch-sys.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- sys.h.orig Tue Jun 4 21:12:36 2002
-+++ sys.h Tue Jun 4 21:12:44 2002
-@@ -423,7 +423,6 @@
- # define HERROR 1
- # define TERMIOS 1
- # define HAS_GETCWD 1
--# define U_WAIT 1
- # define NO_CONST 1 /* avoid prototype conflict */
- #endif
-
diff --git a/ftp/ncftp1/pkg-descr b/ftp/ncftp1/pkg-descr
deleted file mode 100644
index f57dd5cbd429..000000000000
--- a/ftp/ncftp1/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
- NcFTP is a user interface to the Internet standard File
- Transfer Protocol. This program allows a user to transfer
- files to and from a remote network site, and offers addi-
- tional features that are not found in the standard inter-
- face, ftp.
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
deleted file mode 100644
index 636414396699..000000000000
--- a/ftp/proftpd-devel/Makefile
+++ /dev/null
@@ -1,289 +0,0 @@
-# New ports collection makefile for: proftpd
-# Date created: 26 January 1998
-# Whom: Stephane Legrand
-#
-# $FreeBSD$
-#
-
-PORTNAME= proftpd
-DISTVERSION= 1.3.1
-PORTREVISION= 2
-CATEGORIES= ftp
-MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
- ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
- ftp://ftp.dataguard.no/ftp/pub/proftpd/distrib/source/ \
- ftp://spirit.bentel.sk/mirrors/Proftpd/distrib/source/ \
- ftp://proftpd.networkedsystems.co.uk/distrib/source/ \
- http://mirrors.ibiblio.org/pub/mirrors/proftpd/distrib/source/ \
- http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ \
- CENKES:clam
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER?= beech@FreeBSD.org
-COMMENT?= Highly configurable ftp daemon
-
-MAN1= ftpcount.1 ftpwho.1 ftptop.1
-MAN5= xferlog.5
-MAN8= proftpd.8 ftpshut.8 ftpdctl.8
-
-PORTDOCSdoc= Configuration.html faq.html
-PORTDOCScontrib=mod_ifsession.html mod_radius.html mod_rewrite.html \
- mod_tls.html mod_wrap2.html mod_wrap2_file.html mod_wrap2_sql.html \
- mod_ban.html mod_quotatab_radius.html ftpasswd.html
-PORTDOCSreadme= README README.DSO README.FreeBSD README.IPv6 README.LDAP README.PAM \
- README.capabilities README.classes README.facl README.modules \
- README.ports RELEASE_NOTES
-PORTDOCS= ${PORTDOCSdoc} ${PORTDOCScontrib} ${PORTDOCSreadme}
-
-PORTEXAMPLES= ASCII.html CreateHome.html Filters.html SQL.html Umask.html \
- AuthFiles.html DNS.html Globbing.html SSH.html Upgrade.html \
- Authentication.html DSO.html Limit.html Scoreboard.html Vhost.html \
- BCP.html Debugging.html ListOptions.html ServerType.html \
- VirtualUsers.html Chroot.html Directory.html Logging.html Stopping.html \
- index.html Classes.html DisplayFiles.html NAT.html TLS.html ConfigFile.html \
- FTP.html Quotas.html Timestamps.html Controls.html \
- FXP.html Regex.html Tracing.html
-
-USE_GMAKE= yes
-USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:261
-GNU_CONFIGURE= yes
-
-USE_RC_SUBR= proftpd.sh
-
-CONFIGURE_ARGS= --localstatedir=/var/run \
- --sysconfdir=${PREFIX}/etc \
- --disable-sendfile
-
-OPTIONS= IPV6 "Use IPv6" off \
- LDAP "Use LDAP" off \
- LDAP_TLS "Use LDAP TLS (Requires LDAP, OPENSSL)" off\
- MYSQL "Use MySQL" off \
- PGSQL "Use Postgres" off \
- OPENSSL "Include mod_tls" on \
- QUOTA "Include mod_quota" off \
- IFSESSION "Include mod_ifsession" on \
- README "Include mod_readme" on \
- RATIO "Include mod_ratio" on \
- CTRLS "Include controls" off \
- REWRITE "Include mod_rewrite" on \
- WRAP "Include mod_wrap2" on \
- WRAP_FILE "Include mod_wrap2_file" off \
- WRAP_SQL "Include mod_wrap2_sql" off \
- RADIUS "Include mod_radius" on \
- QUOTATAB_RADIUS "include mod_quotatab_radius" off \
- BAN "Include mod_ban (Requires CTRLS)" off \
- NLS "Use nls (builds mod_lang)" off \
- CYRFIX "Patch to fix cyrillic encoding" off \
- CLAMAV "Include mod_clamav " off
-
-MODULES?=
-LIBDIRS?=
-INCLUDEDIRS?=
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_RATIO)
-MODULES:=${MODULES}:mod_ratio
-.endif
-
-.if !defined(WITHOUT_README)
-MODULES:=${MODULES}:mod_readme
-.endif
-
-.if !defined(WITHOUT_REWRITE)
-MODULES:=${MODULES}:mod_rewrite
-.endif
-
-.if !defined(WITHOUT_WRAP)
-MODULES:=${MODULES}:mod_wrap2
-INCLUDEDIRS:=${INCLUDEDIRS}:${WORKDIR}/include
-LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-PLIST_FILES+= include/proftpd/mod_wrap2.h
-.endif
-
-.if defined(WITH_WRAP_FILE)
-INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
-LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-MODULES:=${MODULES}:mod_wrap2_file
-.endif
-
-.if defined(WITH_WRAP_SQL)
-INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
-LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-MODULES:=${MODULES}:mod_wrap2_sql
-.endif
-
-.if defined(WITH_RADIUS)
-MODULES:=${MODULES}:mod_radius
-.endif
-
-.if defined(WITH_QUOTATAB_RADIUS)
-MODULES:=${MODULES}:mod_quotatab_radius
-.endif
-
-.if defined(WITH_BAN)
-MODULES:=${MODULES}:mod_ban
-.endif
-
-.if defined(WITH_SETPASSENT)
-CONFIGURE_ARGS+= --enable-force-setpassent
-.endif
-
-.if defined(WITHOUT_PAM)
-CONFIGURE_ARGS+= --disable-auth-pam
-.endif
-
-.if defined(WITH_IPV6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
-
-.if !defined(WITH_IPV6)
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-.if defined(WITH_NLS)
-INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
-LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-CONFIGURE_ARGS+= --enable-nls
-USE_GETTEXT=yes
-PROFTPD_LIBS+= -lintl -L${LOCALBASE}/lib
-.endif
-
-.if defined (WITH_CYRFIX)
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-cyrillic-fix-netio.c
-.endif
-
-#allow user to override
-MODULES?= mod_ratio:mod_readme:mod_rewrite:mod_wrap2:mod_ifsession
-
-INCLUDEDIRS?=
-LIBDIRS?=
-
-.if defined(WITH_LDAP)
-USE_OPENLDAP= yes
-MODULES:=${MODULES}:mod_ldap
-INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
-LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-.endif
-
-.if defined(WITH_MYSQL)
-USE_MYSQL= yes
-MODULES:=${MODULES}:mod_sql_mysql
-INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include:${LOCALBASE}/include/mysql
-LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql
-.endif
-
-.if defined(WITH_PGSQL)
-USE_PGSQL= yes
-MODULES:=${MODULES}:mod_sql_postgres
-INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
-LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-.endif
-
-.if ${MODULES:M*mod_sql_*}
-MODULES:=mod_sql${MODULES}
-PLIST_FILES+= include/proftpd/mod_sql.h
-.endif
-
-.if defined(WITH_OPENSSL)
-CFLAGS+= -DHAVE_OPENSSL
-.include <${PORTSDIR}/Mk/bsd.openssl.mk>
-PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib
-MODULES:=${MODULES}:mod_tls
-.endif
-
-.if defined(WITH_CTRLS)
-CONFIGURE_ARGS+= --enable-ctrls
-PLIST_FILES+= sbin/ftpdctl
-.if !defined(WITHOUT_CTRLS_ADMIN)
-MODULES:=${MODULES}:mod_ctrls_admin
-.endif
-.endif
-
-.if defined(WITH_QUOTA)
-MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file
-PLIST_FILES+= include/proftpd/mod_quotatab.h
-.if defined(WITH_LDAP)
-MODULES:=${MODULES}:mod_quotatab_ldap
-.endif
-.if defined(WITH_PGSQL) || defined(WITH_MYSQL)
-MODULES:=${MODULES}:mod_quotatab_sql
-.endif
-.endif
-
-.if defined(WITH_CLAMAV)
-#http://www.uglyboxindustries.com/mod_clamav_new.c
-DISTFILES+= mod_clamav-0.5.tar.bz2:clam
-USE_CLAMAV= yes
-MODULES:=${MODULES}:mod_clamav
-LIB_DEPENDS+= clamav.2:${PORTSDIR}/security/clamav
-INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
-LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
-.endif
-
-# mod_ifsession should be the last item in the modules list
-.if !defined(WITHOUT_IFSESSION)
-MODULES:=${MODULES}:mod_ifsession
-.endif
-
-# Keep this here below, in case similar constructs need to be made
-CONFIGURE_ENV+= "LIBS=${PROFTPD_LIBS}"
-
-.if !empty(MODULES)
-CONFIGURE_ARGS+= --with-modules=${MODULES}
-.endif
-
-.if !empty(INCLUDEDIRS)
-CONFIGURE_ARGS+= --with-includes=${INCLUDEDIRS}
-.endif
-
-.if !empty(LIBDIRS)
-CONFIGURE_ARGS+= --with-libraries=${LIBDIRS}
-.endif
-
-MODULES!=${ECHO} ${MODULES} | ${SED} -e 's,^:,,' -e 's,:$$,,'
-
-post-extract:
-.if defined(WITH_CLAMAV)
- @${MV} ${WRKDIR}/mod_clamav_new.c ${WRKSRC}/modules/mod_clamav.c
-.endif
-
-post-patch:
-.if defined(WITH_NLS)
- @${REINPLACE_CMD} -e 's|-lsupp|-lsupp -lintl|g' ${WRKSRC}/Makefile.in
-.endif
-.if defined(WITH_LDAP_TLS)
- @${REINPLACE_CMD} -e 's:/\* #define USE_LDAP_TLS \*/:#define USE_LDAP_TLS:' \
- ${WRKSRC}/contrib/mod_ldap.c
-.endif
- @${REINPLACE_CMD} -e 's|proftpd\.conf|proftpd.conf.sample|g' ${WRKSRC}/Makefile.in
-
-pre-configure:
- @${ECHO_MSG} "==> Configuring with ${MODULES}"
-
-post-configure:
- ${REINPLACE_CMD} -e 's: -lnsl::' ${WRKSRC}/Make.rules
- ${REINPLACE_CMD} -e 's:/usr/sbin:${PREFIX}/sbin:' \
- -e 's:/usr/bin:${PREFIX}/bin:' \
- ${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \
- ${WRKSRC}/utils/ftpcount.1
-
-post-install:
- @cd ${PREFIX}/etc/ && ${CP} -n proftpd.conf.sample proftpd.conf
-.if !defined(NOPORTDOCS)
- @${INSTALL} -d ${DOCSDIR}/
- @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCSdoc} ${DOCSDIR}/
- @cd ${WRKSRC}/doc/contrib && ${INSTALL_DATA} ${PORTDOCScontrib} ${DOCSDIR}/
- @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCSreadme} ${DOCSDIR}/
-.endif
-.if !defined(NOPORTEXAMPLES)
- @${INSTALL} -d ${EXAMPLESDIR}/
- @cd ${WRKSRC}/doc/howto/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/
-.endif
-.if defined(WITH_CTRLS)
- @${INSTALL_PROGRAM} ${WRKSRC}/ftpdctl ${PREFIX}/sbin/
- @${INSTALL_MAN} ${WRKSRC}/src/ftpdctl.8 ${MAN8PREFIX}/man/man8/
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
deleted file mode 100644
index 65b3cefbaf73..000000000000
--- a/ftp/proftpd-devel/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (proftpd-1.3.1.tar.bz2) = 175958df8de92d5209b7b1e2e23a5a28
-SHA256 (proftpd-1.3.1.tar.bz2) = 03bc023e5b7b1c04d8eb2d5dca53b931b3e02cc7aba7dd8f629b0878535dc91b
-SIZE (proftpd-1.3.1.tar.bz2) = 2243888
-MD5 (mod_clamav-0.5.tar.bz2) = a098b630db1aa4ce02d77be84c21e59d
-SHA256 (mod_clamav-0.5.tar.bz2) = badab5d0577439e4de4a4d8fa6d1035da4884cc5b8e5569057816da4ced9667f
-SIZE (mod_clamav-0.5.tar.bz2) = 3027
diff --git a/ftp/proftpd-devel/files/extra-patch-cyrillic-fix-netio.c b/ftp/proftpd-devel/files/extra-patch-cyrillic-fix-netio.c
deleted file mode 100644
index 58f6f3d57056..000000000000
--- a/ftp/proftpd-devel/files/extra-patch-cyrillic-fix-netio.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- ./src/netio.c.orig Sun Oct 10 00:46:22 2004
-+++ ./src/netio.c Thu Oct 12 15:17:22 2006
-@@ -901,47 +901,6 @@
- cp = *pbuf->current++;
- pbuf->remaining++;
-
-- switch (mode) {
-- case IAC:
-- switch (cp) {
-- case WILL:
-- case WONT:
-- case DO:
-- case DONT:
-- mode = cp;
-- continue;
--
-- case IAC:
-- mode = 0;
-- break;
--
-- default:
-- /* Ignore */
-- mode = 0;
-- continue;
-- }
-- break;
--
-- case WILL:
-- case WONT:
-- pr_netio_printf(out_nstrm, "%c%c%c", IAC, DONT, cp);
-- mode = 0;
-- continue;
--
-- case DO:
-- case DONT:
-- pr_netio_printf(out_nstrm, "%c%c%c", IAC, WONT, cp);
-- mode = 0;
-- continue;
--
-- default:
-- if (cp == IAC) {
-- mode = cp;
-- continue;
-- }
-- break;
-- }
--
- *bp++ = cp;
- buflen--;
- }
diff --git a/ftp/proftpd-devel/files/patch-ah b/ftp/proftpd-devel/files/patch-ah
deleted file mode 100644
index b534609737fc..000000000000
--- a/ftp/proftpd-devel/files/patch-ah
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/mod_auth_unix.c.orig 2006-06-29 09:16:23.000000000 -0800
-+++ modules/mod_auth_unix.c 2007-10-05 16:23:46.000000000 -0800
-@@ -57,6 +57,7 @@
- #endif /* HAVE_HPSECURITY_H or HPUX10 or HPUX11 */
-
- #if defined(HAVE_PROT_H) || defined(COMSEC)
-+# include <krb.h>
- # include <prot.h>
- #endif
-
diff --git a/ftp/proftpd-devel/files/patch-contrib-mod_wrap2-Makefile.in b/ftp/proftpd-devel/files/patch-contrib-mod_wrap2-Makefile.in
deleted file mode 100644
index db1914062dd4..000000000000
--- a/ftp/proftpd-devel/files/patch-contrib-mod_wrap2-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/mod_wrap2/Makefile.in.orig 2007-01-08 19:16:11.000000000 -0900
-+++ contrib/mod_wrap2/Makefile.in 2007-10-05 14:02:38.000000000 -0800
-@@ -13,7 +13,7 @@
- MODULE_NAME=mod_wrap2
-
- # Necessary redefinitions
--INCLUDES=-I. -I../.. -I../../include
-+INCLUDES=-I. -I../.. -I../../include -I/usr/local/include
- CPPFLAGS= -DHAVE_CONFIG_H $(DEFAULT_PATHS) $(PLATFORM) $(INCLUDES)
- LDFLAGS=-L../../lib
-
diff --git a/ftp/proftpd-devel/files/patch-doc::Configuration.html b/ftp/proftpd-devel/files/patch-doc::Configuration.html
deleted file mode 100644
index 400699d4f8f1..000000000000
--- a/ftp/proftpd-devel/files/patch-doc::Configuration.html
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./doc/Configuration.html.orig Wed Jan 29 12:27:24 2003
-+++ ./doc/Configuration.html Sat Mar 15 11:34:14 2003
-@@ -4226,7 +4226,7 @@
- ></DT
- ><DD
- ><P
-->ftp</P
-+>ftpd</P
- ></DD
- ><DT
- ><PRE
-@@ -32252,4 +32252,4 @@
- ></DIV
- ></BODY
- ></HTML
-->
-\ No newline at end of file
-+>
diff --git a/ftp/proftpd-devel/files/patch-module::mod_auth_pam.c b/ftp/proftpd-devel/files/patch-module::mod_auth_pam.c
deleted file mode 100644
index 6092c58f6d26..000000000000
--- a/ftp/proftpd-devel/files/patch-module::mod_auth_pam.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./modules/mod_auth_pam.c.orig Thu Jan 2 13:25:20 2003
-+++ ./modules/mod_auth_pam.c Sat Mar 15 11:35:00 2003
-@@ -57,7 +57,7 @@
- #endif /* HAVE_PAM_PAM_APPL_H */
-
- static pam_handle_t * pamh = NULL;
--static char * pamconfig = "ftp";
-+static char * pamconfig = "ftpd";
- static char * pam_user = NULL;
- static char * pam_pass = NULL;
- static size_t pam_user_len = 0;
diff --git a/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf b/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf
deleted file mode 100644
index 90ccbf9aff48..000000000000
--- a/ftp/proftpd-devel/files/patch-sample-configurations_basic.conf
+++ /dev/null
@@ -1,79 +0,0 @@
---- sample-configurations/basic.conf.orig 2007-03-09 10:01:30.000000000 -0900
-+++ sample-configurations/basic.conf 2007-07-05 09:29:42.000000000 -0800
-@@ -1,3 +1,7 @@
-+#
-+# For more informations about Proftpd configuration
-+# look at : http://www.proftpd.org/
-+#
- # This is a basic ProFTPD configuration file (rename it to
- # 'proftpd.conf' for actual use. It establishes a single server
- # and a single anonymous login. It assumes that you have a user/group
-@@ -6,6 +10,7 @@
- ServerName "ProFTPD Default Installation"
- ServerType standalone
- DefaultServer on
-+ScoreboardFile /var/run/proftpd.scoreboard
-
- # Port 21 is the standard FTP port.
- Port 21
-@@ -22,6 +27,8 @@
- # (such as xinetd).
- MaxInstances 30
-
-+CommandBufferSize 512
-+
- # Set the user and group under which the server will run.
- User nobody
- Group nogroup
-@@ -40,23 +47,31 @@
-
- # A basic anonymous configuration, no upload directories. If you do not
- # want anonymous users, simply delete this entire <Anonymous> section.
--<Anonymous ~ftp>
-- User ftp
-- Group ftp
--
-- # We want clients to be able to login with "anonymous" as well as "ftp"
-- UserAlias anonymous ftp
--
-- # Limit the maximum number of anonymous logins
-- MaxClients 10
--
-- # We want 'welcome.msg' displayed at login, and '.message' displayed
-- # in each newly chdired directory.
-- DisplayLogin welcome.msg
-- DisplayChdir .message
--
-- # Limit WRITE everywhere in the anonymous chroot
-- <Limit WRITE>
-- DenyAll
-- </Limit>
--</Anonymous>
-+
-+#########################################################################
-+# #
-+# Uncomment lines with only one # to allow basic anonymous access #
-+# #
-+#########################################################################
-+
-+#<Anonymous ~ftp>
-+# User ftp
-+# Group ftp
-+
-+ ### We want clients to be able to login with "anonymous" as well as "ftp"
-+ # UserAlias anonymous ftp
-+
-+ ### Limit the maximum number of anonymous logins
-+ # MaxClients 10
-+
-+ ### We want 'welcome.msg' displayed at login, and '.message' displayed
-+ ### in each newly chdired directory.
-+ # DisplayLogin welcome.msg
-+ # DisplayFirstChdir .message
-+
-+ ### Limit WRITE everywhere in the anonymous chroot
-+ # <Limit WRITE>
-+ # DenyAll
-+ # </Limit>
-+#</Anonymous>
-+
diff --git a/ftp/proftpd-devel/files/patch-src-auth.c b/ftp/proftpd-devel/files/patch-src-auth.c
deleted file mode 100644
index 61386a883e9f..000000000000
--- a/ftp/proftpd-devel/files/patch-src-auth.c
+++ /dev/null
@@ -1,43 +0,0 @@
-ndex: src/auth.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/src/auth.c,v
-retrieving revision 1.52
-diff -u -r1.52 auth.c
---- src/auth.c 5 Oct 2007 17:04:13 -0000 1.52
-+++ src/auth.c 8 Oct 2007 18:44:21 -0000
-@@ -503,6 +503,17 @@
- return res;
- }
-
-+ if (MODRET_ISERROR(mr)) {
-+ res = MODRET_ERROR(mr);
-+
-+ if (cmd->tmp_pool) {
-+ destroy_pool(cmd->tmp_pool);
-+ cmd->tmp_pool = NULL;
-+ }
-+
-+ return res;
-+ }
-+
- m = NULL;
- }
-
-@@ -566,6 +577,17 @@
- return res;
- }
-
-+ if (MODRET_ISERROR(mr)) {
-+ res = MODRET_ERROR(mr);
-+
-+ if (cmd->tmp_pool) {
-+ destroy_pool(cmd->tmp_pool);
-+ cmd->tmp_pool = NULL;
-+ }
-+
-+ return res;
-+ }
-+
- m = NULL;
- }
-
diff --git a/ftp/proftpd-devel/files/patch-src_proftpd.8.in b/ftp/proftpd-devel/files/patch-src_proftpd.8.in
deleted file mode 100644
index 9578f30ec3b3..000000000000
--- a/ftp/proftpd-devel/files/patch-src_proftpd.8.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/proftpd.8.in.orig Sat Sep 18 07:40:30 2004
-+++ src/proftpd.8.in Thu Nov 3 15:35:56 2005
-@@ -22,6 +22,12 @@
- connection to the FTP service is made, or alternatively it can be run as a
- standalone daemon.
- .PP
-+.br
-+Each successful and failed ftp(1) session is logged using syslog with a
-+facility of LOG_FTP. Note: LOG_FTP messages are not displayed
-+by syslogd(8) by default, and may have to be enabled in syslogd(8)'s
-+configuration file.
-+.PP
- When
- .B proftpd
- is run in standalone mode and it receives a SIGHUP then it will reread its
diff --git a/ftp/proftpd-devel/files/proftpd.sh.in b/ftp/proftpd-devel/files/proftpd.sh.in
deleted file mode 100644
index 5e72d10cfb88..000000000000
--- a/ftp/proftpd-devel/files/proftpd.sh.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: proftpd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable proftpd:
-#
-#proftpd_enable="YES"
-#
-# See proftpd(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=proftpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/proftpd
-pidfile=/var/run/proftpd.pid
-required_files=%%PREFIX%%/etc/proftpd.conf
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
- rm -f $pidfile
-}
-
-# set defaults
-
-proftpd_enable=${proftpd_enable:-"NO"}
-proftpd_flags=${proftpd_flags:-""}
-
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/ftp/proftpd-devel/pkg-descr b/ftp/proftpd-devel/pkg-descr
deleted file mode 100644
index 4b1860f1cddc..000000000000
--- a/ftp/proftpd-devel/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-ProFTPD is a highly configurable ftp daemon for unix
-and unix-like operating systems. ProFTPD is designed
-to be somewhat of a "drop-in" replacement for wu-ftpd
-with a configuration format like Apache.
-
-Full online documentation is available at
-http://www.proftpd.org/, including a server
-configuration directive reference manual.
-
-- Stephane Legrand
-stephane@lituus.fr
-
-WWW: http://www.proftpd.org/
diff --git a/ftp/proftpd-devel/pkg-plist b/ftp/proftpd-devel/pkg-plist
deleted file mode 100644
index b4d6743b9f81..000000000000
--- a/ftp/proftpd-devel/pkg-plist
+++ /dev/null
@@ -1,61 +0,0 @@
-bin/ftpcount
-bin/ftpdctl
-bin/ftptop
-bin/ftpwho
-include/proftpd/auth.h
-include/proftpd/bindings.h
-include/proftpd/buildstamp.h
-include/proftpd/child.h
-include/proftpd/class.h
-include/proftpd/compat.h
-include/proftpd/conf.h
-include/proftpd/config.h
-include/proftpd/ctrls.h
-include/proftpd/data.h
-include/proftpd/default_paths.h
-include/proftpd/dirtree.h
-include/proftpd/display.h
-include/proftpd/env.h
-include/proftpd/event.h
-include/proftpd/feat.h
-include/proftpd/fsio.h
-include/proftpd/ftp.h
-include/proftpd/glibc-glob.h
-include/proftpd/help.h
-include/proftpd/ident.h
-include/proftpd/inet.h
-include/proftpd/libsupp.h
-include/proftpd/log.h
-include/proftpd/mkhome.h
-include/proftpd/mod_ctrls.h
-include/proftpd/modules.h
-include/proftpd/netacl.h
-include/proftpd/netaddr.h
-include/proftpd/netio.h
-include/proftpd/options.h
-include/proftpd/parser.h
-include/proftpd/pidfile.h
-include/proftpd/pool.h
-include/proftpd/pr-syslog.h
-include/proftpd/privs.h
-include/proftpd/proctitle.h
-include/proftpd/proftpd.h
-include/proftpd/regexp.h
-include/proftpd/response.h
-include/proftpd/scoreboard.h
-include/proftpd/sets.h
-include/proftpd/support.h
-include/proftpd/table.h
-include/proftpd/timers.h
-include/proftpd/trace.h
-include/proftpd/utf8.h
-include/proftpd/var.h
-include/proftpd/version.h
-include/proftpd/xferlog.h
-sbin/ftpshut
-sbin/in.proftpd
-sbin/proftpd
-@unexec if cmp -s %D/etc/proftpd.conf %D/etc/proftpd.conf.sample; then rm -f %D/etc/proftpd.conf; fi
-etc/proftpd.conf.sample
-@exec cp -n %D/%F %B/proftpd.conf
-@dirrm include/proftpd
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 636414396699..6828f7f79cfb 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= proftpd
DISTVERSION= 1.3.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -214,10 +214,10 @@ MODULES:=${MODULES}:mod_quotatab_sql
.if defined(WITH_CLAMAV)
#http://www.uglyboxindustries.com/mod_clamav_new.c
-DISTFILES+= mod_clamav-0.5.tar.bz2:clam
+DISTFILES+= mod_clamav-0.5.1.tar.bz2:clam
USE_CLAMAV= yes
MODULES:=${MODULES}:mod_clamav
-LIB_DEPENDS+= clamav.2:${PORTSDIR}/security/clamav
+LIB_DEPENDS+= clamav.3:${PORTSDIR}/security/clamav
INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
.endif
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index 65b3cefbaf73..6e9e27132d93 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1,6 +1,6 @@
MD5 (proftpd-1.3.1.tar.bz2) = 175958df8de92d5209b7b1e2e23a5a28
SHA256 (proftpd-1.3.1.tar.bz2) = 03bc023e5b7b1c04d8eb2d5dca53b931b3e02cc7aba7dd8f629b0878535dc91b
SIZE (proftpd-1.3.1.tar.bz2) = 2243888
-MD5 (mod_clamav-0.5.tar.bz2) = a098b630db1aa4ce02d77be84c21e59d
-SHA256 (mod_clamav-0.5.tar.bz2) = badab5d0577439e4de4a4d8fa6d1035da4884cc5b8e5569057816da4ced9667f
-SIZE (mod_clamav-0.5.tar.bz2) = 3027
+MD5 (mod_clamav-0.5.1.tar.bz2) = ce9e3f58f05d55d7ec98f97a69889bb8
+SHA256 (mod_clamav-0.5.1.tar.bz2) = de6779ed7a6fe8f5ab809366d7b7793c7658b513d2147c2b7ea0d530549dc92b
+SIZE (mod_clamav-0.5.1.tar.bz2) = 3054