From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 31 12:40:14 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B544316A4C0 for ; Sun, 31 Aug 2003 12:40:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2595F44011 for ; Sun, 31 Aug 2003 12:40:10 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h7VJeAUp022794 for ; Sun, 31 Aug 2003 12:40:10 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h7VJe9fa022793; Sun, 31 Aug 2003 12:40:09 -0700 (PDT) Resent-Date: Sun, 31 Aug 2003 12:40:09 -0700 (PDT) Resent-Message-Id: <200308311940.h7VJe9fa022793@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Clement Laforet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48E8216A4BF for ; Sun, 31 Aug 2003 12:38:54 -0700 (PDT) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8816643FF5 for ; Sun, 31 Aug 2003 12:38:50 -0700 (PDT) (envelope-from sheepkiller@cultdeadsheep.org) Received: (qmail 7398 invoked from network); 31 Aug 2003 19:38:48 -0000 Received: from unknown (HELO lucifer.cultdeadsheep.org) (192.168.0.2) by goofy.cultdeadsheep.org with SMTP; 31 Aug 2003 19:38:48 -0000 Received: by lucifer.cultdeadsheep.org (sSMTP sendmail emulation); Sun, 31 Aug 2003 21:37:54 +0200 Message-Id: <20030831193850.8816643FF5@mx1.FreeBSD.org> Date: Sun, 31 Aug 2003 21:37:54 +0200 From: Clement Laforet To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Clement Laforet Subject: ports/56247: [patch] ftp/pureftpd: Utilize USE_MYSQL and USE_OPENLDAP X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Clement Laforet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2003 19:40:14 -0000 >Number: 56247 >Category: ports >Synopsis: [patch] ftp/pureftpd: Utilize USE_MYSQL and USE_OPENLDAP >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Aug 31 12:40:09 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.1-CURRENT i386 >Organization: cotds.org >Environment: System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT#0: Sun Aug 24 15:37:26 CEST 2003 root@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386 >Description: Make pureftpd port utilize USE_MYSQL and USE_OPENLDAP macro. Frank Denis is Cc'ed for notification and/or approval. >How-To-Repeat: N/A. >Fix: --- Makefile-pureftpd.diff begins here --- --- Makefile.orig Sun Aug 31 19:20:58 2003 +++ Makefile Sun Aug 31 19:30:55 2003 @@ -23,20 +23,13 @@ MAINTAINER= j@pureftpd.org COMMENT= A small, easy to set up, fast and very secure FTP server -.if defined(WITH_LDAP) && !defined(WITH_LDAP21) -LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap20-client -.elif defined(WITH_LDAP21) && !defined(WITH_LDAP) -LIB_DEPENDS+= ldap:${PORTSDIR}/net/openldap21-client -.elif defined(WITH_LDAP21) && defined(WITH_LDAP) -BROKEN= "You may only specify WITH_LDAP xor WITH_LDAP21, but not both together" +.if defined(WITH_LDAP) +USE_OPENLDAP= YES .endif -.if defined(WITH_MYSQL) && !defined(WITH_MYSQL4) -LIB_DEPENDS+= mysqlclient:${PORTSDIR}/databases/mysql323-client -.elif defined(WITH_MYSQL4) && !defined(WITH_MYSQL) -LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client -.elif defined(WITH_MYSQL4) && defined(WITH_MYSQL) -BROKEN= "You may only specify WITH_MYSQL xor WITH_MYSQL4, but not both together" +.if defined(WITH_MYSQL) +USE_MYSQL= YES +BROKEN_WITH_MYSQL= 41 .endif .if defined(WITH_PGSQL) @@ -57,16 +50,16 @@ .endif # ldap support requested? -.if defined(WITH_LDAP) || defined(WITH_LDAP21) +.if defined(WITH_LDAP) CONFIGURE_ARGS+= --with-ldap .endif # mysql support requested? -.if defined(WITH_MYSQL) || defined(WITH_MYSQL4) +.if defined(WITH_MYSQL) CONFIGURE_ARGS+= --with-mysql .endif -# mysql support requested? +# postgresql support requested? .if defined(WITH_PGSQL) CONFIGURE_ARGS+= --with-pgsql .endif --- Makefile-pureftpd.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: