From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Feb 13 08:50:19 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 5638716A4CE for ; Fri, 13 Feb 2004 08:50:19 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A24743D1D for ; Fri, 13 Feb 2004 08:50:19 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i1DGoJbv076157 for ; Fri, 13 Feb 2004 08:50:19 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i1DGoJ3r076154; Fri, 13 Feb 2004 08:50:19 -0800 (PST) (envelope-from gnats) Date: Fri, 13 Feb 2004 08:50:19 -0800 (PST) Message-Id: <200402131650.i1DGoJ3r076154@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Vivek Khera Subject: Re: 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 Reply-To: Vivek Khera List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Feb 2004 16:50:19 -0000 The following reply was made to PR ports/62652; it has been noted by GNATS. From: Vivek Khera To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: Re: ports/62652: [patch] Teach mail/postfix to USE_MYSQL and let user choose what wersion he wants Date: Fri, 13 Feb 2004 11:47:27 -0500 (EST) This is the patch I prefer. Please commit this one to ports/mail/postfix. It also removes the OpenLDAP 1.2 option, since that port is broken. Thanks. diff -Pru postfix/scripts/configure.postfix postfix.new/scripts/configure.postfix --- postfix/scripts/configure.postfix Tue Feb 3 12:16:16 2004 +++ postfix.new/scripts/configure.postfix Fri Feb 13 11:35:37 2004 @@ -29,11 +29,10 @@ 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 (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ PgSQL "PostgreSQL v7.4 map lookups" "$status_PgSQL" \ PgSQL73 "PostgreSQL v7.3 map lookups" "$status_PgSQL73" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ -OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ @@ -80,6 +79,7 @@ echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then + echo "USE_MYSQL=YES" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi @@ -93,6 +93,7 @@ echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then + echo "USE_MYSQL=YES" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi @@ -150,7 +151,7 @@ DB41_SELECTED="YES" ;; MySQL) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" + echo "USE_MYSQL=YES" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" @@ -184,12 +185,6 @@ echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" - ;; - OpenLDAP12) - echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" - echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" - echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"