From owner-freebsd-ports@FreeBSD.ORG  Wed Oct 14 08:13:54 2009
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2B47C1065670
	for <freebsd-ports@FreeBSD.org>; Wed, 14 Oct 2009 08:13:54 +0000 (UTC)
	(envelope-from pczanik@fang.fa.gau.hu)
Received: from b.relay.invitel.net (b.relay.invitel.net [62.77.203.4])
	by mx1.freebsd.org (Postfix) with ESMTP id DC7878FC15
	for <freebsd-ports@FreeBSD.org>; Wed, 14 Oct 2009 08:13:53 +0000 (UTC)
Received: from mail.invitel.hu (mail.invitel.hu [213.163.59.4])
	by b.relay.invitel.net (Invitel Core SMTP Transmitter) with ESMTP id
	A560431AF3A
	for <freebsd-ports@FreeBSD.org>; Wed, 14 Oct 2009 09:55:25 +0200 (CEST)
Received: from [192.168.2.179] ([82.131.203.18])
	by mail.invitel.hu (Invitel Messaging Server)
	with ESMTPA id <0KRH00MBVVCC4ZC0@invitel.hu> for
	freebsd-ports@FreeBSD.org; Wed, 14 Oct 2009 09:55:25 +0200 (CEST)
Date: Wed, 14 Oct 2009 09:55:23 +0200
From: Peter Czanik <pczanik@fang.fa.gau.hu>
To: chris@officialunix.com
Message-id: <4AD583EB.6070306@fang.fa.gau.hu>
MIME-version: 1.0
Content-type: text/plain; charset=ISO-8859-2
Content-transfer-encoding: 7BIT
User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU; rv:1.9.1.4pre)
	Gecko/20090915 SUSE/3.0b4-2.1 Thunderbird/3.0b4
Cc: freebsd-ports@FreeBSD.org
Subject: proftpd problems (ldap, quota, tds) and a patch
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Oct 2009 08:13:54 -0000

Hello,

I ran into a couple of problems with the proftpd port after the latest
update.

Until now I compiled LDAP without the additional quota support. Now,
even if I select only "LDAP" in the config menu, I get:
==> Configuring with mod_ldap:mod_tls:mod_quotatab_ldap
  And compilation fails with ugly errors, unless I also select "quota" in
the config menu.

The other problem is, that TDS is installed, even if it is not selected
in the config menu.

The following fix is tested and works for me, even if not I'm not really
sure, if it is really correct. All the problematic config options seem
to work again as expected.

[root@v16 /usr/ports/ftp/proftpd]# diff -u Makefile.orig Makefile
--- Makefile.orig       2009-10-14 09:06:21.000000000 +0200     +++
Makefile    2009-10-14 09:13:43.000000000 +0200             @@ -217,14
+217,14 @@                                            .if
defined(WITH_QUOTA)
MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file
PLIST_SUB+=    QUOTA=""
-.else
-PLIST_SUB+=    QUOTA="@comment "
 .if defined(WITH_LDAP)
 MODULES:=${MODULES}:mod_quotatab_ldap
 .endif
 .if defined(WITH_PGSQL) || defined(WITH_MYSQL)
 MODULES:=${MODULES}:mod_quotatab_sql
 .endif
+.else
+PLIST_SUB+=    QUOTA="@comment "
 .endif

 .if defined(WITH_CLAMAV)
@@ -252,11 +252,11 @@
 MODULES:=${MODULES}:mod_sql_tds
 MODULES:=mod_sql${MODULES}
 PLIST_SUB+=    TDS=""
-.else
-PLIST_SUB+=    TDS="@comment "
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
 LIB_DEPENDS+=  sybdb.5:${PORTSDIR}/databases/freetds
+.else
+PLIST_SUB+=    TDS="@comment "
 .endif

 # mod_ifsession should be the last item in the modules list

Bye,
CzP