From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 30 04:30:11 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 C81B937B401 for ; Wed, 30 Jul 2003 04:30:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3B9043FCB for ; Wed, 30 Jul 2003 04:30: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 h6UBUAUp005718 for ; Wed, 30 Jul 2003 04:30: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 h6UBUAnW005717; Wed, 30 Jul 2003 04:30:10 -0700 (PDT) Resent-Date: Wed, 30 Jul 2003 04:30:10 -0700 (PDT) Resent-Message-Id: <200307301130.h6UBUAnW005717@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 608FA37B401 for ; Wed, 30 Jul 2003 04:29:55 -0700 (PDT) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7A1743FCB for ; Wed, 30 Jul 2003 04:29:53 -0700 (PDT) (envelope-from sheepkiller@cultdeadsheep.org) Received: (qmail 42896 invoked from network); 30 Jul 2003 11:29:52 -0000 Received: from unknown (HELO ?HOSTNAME?) (192.168.0.12) by goofy.cultdeadsheep.org with SMTP; 30 Jul 2003 11:29:52 -0000 Received: by _HOSTNAME_ (sSMTP sendmail emulation); Wed, 30 Jul 2003 13:29:57 +0200 Message-Id: <20030730112953.B7A1743FCB@mx1.FreeBSD.org> Date: Wed, 30 Jul 2003 13:29:57 +0200 From: "Clement Laforet" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Clement Laforet Subject: ports/55044: [update] mail/perdition: update mysql hack to "lastest revision". 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: Wed, 30 Jul 2003 11:30:12 -0000 >Number: 55044 >Category: ports >Synopsis: [update] mail/perdition: update mysql hack to "lastest revision". >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jul 30 04:30:10 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.1-CURRENT i386 >Organization: cotds.org >Environment: System: FreeBSD chuck.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Jul 14 03:00:24 CEST 2003 clement@chuck.cultdeadsheep.org:/usr/obj/usr/src/sys/CHUCK i386 >Description: Add simplisitic MySQL auto detection hack to perdition. >How-To-Repeat: N/A. >Fix: --- perdition.diff begins here --- diff -Nru perdition.orig/Makefile perdition/Makefile --- perdition.orig/Makefile Wed Jul 30 11:14:31 2003 +++ perdition/Makefile Wed Jul 30 11:17:46 2003 @@ -7,6 +7,7 @@ PORTNAME= perdition PORTVERSION= 1.11 +PORTREVISION= 1 CATEGORIES= mail net security MASTER_SITES= http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/ @@ -34,14 +35,6 @@ INSTALLS_SHLIB= yes -# Dirty hack :) -MYSQL323_LIBVER=10 -MYSQL40_LIBVER= 12 -MYSQL41_LIBVER= 14 - -MYSQL_VER?= 323 -LDAP_VER?= 21 - # Available knobs: # WITHOUT_SSL: Disable OpenSSL support # WITHOUT_POSIX_REGEX: Disable native regex support @@ -49,10 +42,35 @@ # WITH_NIS: Enable NIS database backend # WITH_GDBM: Enable gdbm database backend # WITH_MYSQL: Enable MySQL database backend +# WITH_MYSQL_VER: +# - 323 use MySQL 3.23.x +# - 40 use MySQL 4.0.x +# - 41 use MySQL 4.1.x # WITH_PGSQL: Enable PostgreSQL database backend # WITH_OPENLDAP: Enable OpenLDAP database backend # WITH_ODBC: Enable ODBC database backend +LDAP_VER?= 21 + +# MySQL deps hack (revision 2) +MYSQL323_LIBVER=10 +MYSQL40_LIBVER= 12 +MYSQL41_LIBVER= 14 + +.include + +.if defined(WITH_MYSQL_VER) +MYSQL_VER= ${WITH_MYSQL_VER} +.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL_323_LIBVER}) +MYSQL_VER= 323 +.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL40_LIBVER}) +MYSQL_VER= 40 +.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL41_LIBVER}) +MYSQL_VER= 41 +.else +MYSQL_VER= 40 +.endif + .if !defined(WITHOUT_SSL) CONFIGURE_ARGS+= --enable-ssl USE_OPENSSL= yes @@ -146,4 +164,4 @@ @${ECHO_MSG} "/********************************************************/" @${ECHO_MSG} "" -.include +.include --- perdition.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: