From e86374509c71548e96f4c4a480332f72522ceef3 Mon Sep 17 00:00:00 2001
From: beech <beech@FreeBSD.org>
Date: Wed, 18 Jul 2007 21:09:14 +0000
Subject: - Remove mod_codeconv - Patch reviewed upstream. Not compatible with
 1.3.1rc3. Duplicates and   conflicts with utf8 functionality

PR:		ports/114502
Approved by:	sat (mentor)
---
 ftp/proftpd/Makefile | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'ftp/proftpd/Makefile')

diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index a08177abc960..a3db00749387 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proftpd
 DISTVERSION=	1.3.1rc3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -70,8 +70,7 @@ OPTIONS=	IPV6 "Use IPv6" off \
 		QUOTATAB_RADIUS "include mod_quotatab_radius" off \
 		BAN "include mod_ban (Requires CTRLS)" off \
 		NLS "Use nls (builds mod_lang)" off \
-		CYRFIX "Use patch for fix cyrillic encoding" off \
-		CODECONV "Use charset conversion (mod_codeconv)" off
+		CYRFIX "Use patch for fix cyrillic encoding" off
 
 MODULES?=
 LIBDIRS?=
@@ -211,15 +210,6 @@ MODULES:=${MODULES}:mod_quotatab_sql
 .endif
 .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
-
 # mod_ifsession should be the last item in the modules list
 .if !defined(WITHOUT_IFSESSION)
 MODULES:=${MODULES}:mod_ifsession
-- 
cgit