From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Feb 10 09:30:26 2004 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 A7CA916A568 for ; Tue, 10 Feb 2004 09:30:25 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB9F543D64 for ; Tue, 10 Feb 2004 09:30:14 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i1AHUEbv003419 for ; Tue, 10 Feb 2004 09:30:14 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i1AHUE2k003417; Tue, 10 Feb 2004 09:30:14 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 10 Feb 2004 09:30:14 -0800 (PST) Resent-Message-Id: <200402101730.i1AHUE2k003417@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, "Ion-Mihai Tetcu" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 003D616A4CE for ; Tue, 10 Feb 2004 09:22:56 -0800 (PST) Received: from rdsnet.ro (smtp.rdsnet.ro [62.231.74.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32E4243D1D for ; Tue, 10 Feb 2004 09:22:56 -0800 (PST) (envelope-from itetcu@apropo.ro) Received: (qmail 8925 invoked from network); 10 Feb 2004 17:22:55 -0000 Received: from unknown (HELO it.buh.cameradicommercio.ro) (81.196.25.19) by mail.rdsnet.ro with SMTP; 10 Feb 2004 17:22:55 -0000 Received: from it.buh.cameradicommercio.ro (localhost.buh.cameradicommercio.ro [127.0.0.1]) by it.buh.cameradicommercio.ro (Postfix) with ESMTP id B8BB9A6; Tue, 10 Feb 2004 19:24:37 +0200 (EET) Message-Id: <1076433877.0@it.buh.cameradicommercio.ro> Date: Tue, 10 Feb 2004 19:24:37 +0200 From: "Ion-Mihai Tetcu" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.3.2 cc: khera@kciLink.com Subject: ports/62652: [patch] Teach mail/postfix to USE_MYSQL and let user choose what wersion he wants X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Feb 2004 17:30:26 -0000 >Number: 62652 >Category: ports >Synopsis: [patch] Teach mail/postfix to USE_MYSQL and let user choose what wersion he wants >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Feb 10 09:30:14 PST 2004 >Closed-Date: >Last-Modified: >Originator: Ion-Mihai Tetcu >Release: FreeBSD 5.2-CURRENT i386 >Organization: Tecnik'93 >Environment: FreeBSD it.buh.cameradicommercio.ro 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Mon Jan 26 14:24:42 EET 2004 itetcu@it.buh.cameradicommercio.ro:/usr/obj/usr/src/sys/ULE1 i386 >Description: Changes postfix configure script to use the new mysql ports infrastructure; also the user can choose what client version he wants (like the port already provides for postgreeql) or may use the installed/default version. >How-To-Repeat: Use the patch. >Fix: --- configure.postfix.diff begins here --- --- /usr/ports/mail/postfix/scripts/configure.postfix.old Mon Feb 2 12:17:37 2004 +++ /usr/ports/mail/postfix/scripts/configure.postfix Tue Feb 10 19:01:22 2004 @@ -29,7 +29,11 @@ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ -MySQL "MySQL map lookups" "$status_MySQL" \ +MySQL "MySQL map lookups with installed libmysql, defaults to MYSQ_LIB_VER=12 (MYSQL4.0)" "$status_MySQL3" \ +MySQL323 "MySQL v3.23 map lookups (MYSQLIBVER=10)" "$status_MySQL3" \ +MySQL40 "MySQL v4.0 map lookups (MYSQLIBVER=12)" "$status_MySQL40" \ +MySQL41 "MySQL v4.1 map lookups (MYSQLIBVER=14)" "$status_MySQL41" \ +MySQL50 "MySQL v5.0 map lookups (for now also MYSQLIBVER=14)" "$status_MySQL50" \ PgSQL "PostgreSQL v7.4 map lookups" "$status_PgSQL" \ PgSQL73 "PostgreSQL v7.3 map lookups" "$status_PgSQL73" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ @@ -82,6 +86,7 @@ if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + WANT_MYSQL=YES fi fi SUB_SASL="" @@ -95,6 +100,7 @@ if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + WANT_MYSQL=YES fi fi SUB_SASL="" @@ -149,12 +155,35 @@ echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; - MySQL) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" - echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" - echo "MYSQL_SUFFIX= +mysql" - ;; + MySQL) + echo "USE_MYSQL=YES" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + echo "MYSQL_SUFFIX= +mysql" + ;; + MySQL323) + echo "USE_MYSQL=YES" + echo "WANT_MYSQL_VER=323" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + echo "MYSQL_SUFFIX= +mysql" + ;; + MySQL40) + echo "USE_MYSQL=YES" + echo "WANT_MYSQL_VER=40" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + echo "MYSQL_SUFFIX= +mysql" + ;; + MySQL41) + echo "USE_MYSQL=YES" + echo "WANT_MYSQL_VER=41" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + echo "MYSQL_SUFFIX= +mysql" + ;; + MySQL50) + echo "USE_MYSQL=YES" + echo "WANT_MYSQL_VER=50" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + echo "MYSQL_SUFFIX= +mysql" + ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" --- configure.postfix.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: