diff options
Diffstat (limited to 'ftp/proftpd/Makefile')
| -rw-r--r-- | ftp/proftpd/Makefile | 90 |
1 files changed, 31 insertions, 59 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 643f89bde753..43ae07bead2a 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -6,8 +6,8 @@ # PORTNAME= proftpd -DISTVERSION= 1.3.1 -PORTREVISION= 14 +DISTVERSION= 1.3.2rc2 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -16,12 +16,11 @@ MASTER_SITES= ftp://ftp.proftpd.org/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 \ + http://www.alaskaparadise.com/freebsd/:sql_tds \ + http://www.alaskaparadise.com/freebsd/:clam \ http://www.smartftp.com/oss/proftpd/:digest \ - http://lev.serebryakov.spb.ru/mod_comb/:comb\ - http://labratsoftware.com/mod_sql_tds/:sql_tds \ + LOCAL/beech:clam \ LOCAL/beech:digest \ - LOCAL/beech:comb \ LOCAL/beech:sql_tds DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -61,34 +60,32 @@ CONFLICTS= proftpd-devel-1.[0-9].* USE_RC_SUBR= proftpd.sh CONFIGURE_ARGS= --localstatedir=/var/run \ + --with-pkgconfig=libdata/pkgconfig \ --sysconfdir=${PREFIX}/etc \ --disable-sendfile -OPTIONS= IPV6 "Use IPv6" off \ +OPTIONS= BAN "Include mod_ban (Requires CTRLS)" off \ + CLAMAV "Include mod_clamav" off \ + CTRLS "Include controls" off \ + DIGEST "Include mod_digest" off \ + IFSESSION "Include mod_ifsession" on \ + IPV6 "Use IPv6" off \ LDAP "Use LDAP" off \ LDAP_TLS "Use LDAP TLS (Requires LDAP, OPENSSL)" off\ MYSQL "MySQL auth (Can be combined with PGSQL)" off \ - PGSQL "Postgres auth (Can be combined with MYSQL)" off \ - TDS "FreeTDS - Sybase & MS-SQL auth (Exclusive)" off \ + NLS "Use nls (builds mod_lang)" off \ OPENSSL "Include mod_tls" on \ + PGSQL "Postgres auth (Can be combined with MYSQL)" off \ QUOTA "Include mod_quota" off \ - IFSESSION "Include mod_ifsession" on \ - README "Include mod_readme" on \ + QUOTATAB_RADIUS "include mod_quotatab_radius" off \ + RADIUS "Include mod_radius" on \ RATIO "Include mod_ratio" on \ - CTRLS "Include controls" off \ + README "Include mod_readme" on \ REWRITE "Include mod_rewrite" on \ + TDS "FreeTDS - Sybase & MS-SQL auth (Exclusive)" off \ 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 \ - CLAMAV "Include mod_clamav" off \ - DIGEST "Include mod_digest" off \ - COMB "Include mod_comb (multistream upload)" off \ - CODECONV "Use charset conversion (possibly broken)" off \ - RUSSIANCHAR "Disable telnet filterning (Fix Russian)" off + WRAP_SQL "Include mod_wrap2_sql" off MODULES?= LIBDIRS?= INCLUDEDIRS?= @@ -221,14 +218,18 @@ MODULES:=${MODULES}:mod_quotatab_sql .endif .if defined(WITH_CLAMAV) -#http://www.uglyboxindustries.com/mod_clamav_new.c -DISTFILES+= mod_clamav-0.5.1.tar.bz2:clam -EXTRACT_ONLY+= mod_clamav-0.5.1.tar.bz2 +#http://www.thrallingpenguin.com/resources/mod_clamav-0.10.tar.bz2 +DISTFILES+= mod_clamav-0.10.tar.bz2:clam +EXTRACT_ONLY+= mod_clamav-0.10.tar.bz2 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-modules_mod_xfer.c USE_CLAMAV= yes MODULES:=${MODULES}:mod_clamav LIB_DEPENDS+= clamav.5:${PORTSDIR}/security/clamav INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib +PLIST_SUB= CLAMAV="" +.else +PLIST_SUB= CLAMAV="@comment " .endif .if defined(WITH_DIGEST) @@ -236,18 +237,9 @@ DISTFILES+= mod_digest.c:digest MODULES:=${MODULES}:mod_digest .endif -.if defined(WITH_COMB) -COMB_VERSION= 0.1 -DISTFILES+= mod_comb-${COMB_VERSION}.tar.bz2:comb -EXTRACT_ONLY+= mod_comb-${COMB_VERSION}.tar.bz2 -MODULES:=${MODULES}:mod_comb -PORTDOCScontrib+=mod_comb.html -PORTDOCSreadme+=README.mod_comb -.endif - .if defined(WITH_TDS) -DISTFILES+= mod_sql_tds-4.5.tar.bz2:sql_tds -EXTRACT_ONLY+= mod_sql_tds-4.5.tar.bz2 +DISTFILES+= mod_sql_tds-4.6.tar.bz2:sql_tds +EXTRACT_ONLY+= mod_sql_tds-4.6.tar.bz2 MODULES:=${MODULES}:mod_sql_tds MODULES:=mod_sql${MODULES} PLIST_FILES+= include/proftpd/mod_sql.h @@ -256,20 +248,6 @@ LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds .endif -.if defined(WITH_CODECONV) -USE_ICONV= YES -MODULES:=${MODULES}:mod_codeconv -INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include -CONFIGURE_ARGS+= --disable-sendfile -PROFTPD_LIBS+= -liconv -L${LOCALBASE}/lib -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mod-codeconv -.endif - -.if defined(WITH_RUSSIANCHAR) -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-netio.c -.endif - - # mod_ifsession should be the last item in the modules list .if !defined(WITHOUT_IFSESSION) MODULES:=${MODULES}:mod_ifsession @@ -294,19 +272,13 @@ 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 + @${CP} ${WRKDIR}/mod_clamav-0.10/mod_clamav.* ${WRKSRC}/contrib .endif .if defined(WITH_DIGEST) @${CP} ${DISTDIR}/${DIST_SUBDIR}/mod_digest.c ${WRKSRC}/modules/ .endif -.if defined(WITH_COMB) - @${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/mod_comb.c ${WRKSRC}/contrib/ - @${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/README ${WRKSRC}/README.mod_comb - @${MV} ${WRKDIR}/mod_comb-${COMB_VERSION}/mod_comb.html ${WRKSRC}/doc/contrib/ -.endif - .if defined(WITH_TDS) - @${MV} ${WRKDIR}/mod_sql_tds.c ${WRKSRC}/contrib/ + @${MV} ${WRKDIR}/mod_sql_tds-4.6/mod_sql_tds.c ${WRKSRC}/contrib/ .endif post-patch: @@ -318,7 +290,7 @@ post-patch: ${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}" |