[pkgsrc/trunk]: pkgsrc/mail/gld Fix build both for mysql and pgsql backends.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba9a1a5f1c92
branches:  trunk
changeset: 509071:ba9a1a5f1c92
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Mar 02 20:49:39 2006 +0000

description:
Fix build both for mysql and pgsql backends.
Addresses second part of PR 32969 by Greg Oster.

diffstat:

 mail/gld/distinfo         |  4 ++--
 mail/gld/options.mk       |  6 +++++-
 mail/gld/patches/patch-aa |  4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r e694015e462e -r ba9a1a5f1c92 mail/gld/distinfo
--- a/mail/gld/distinfo Thu Mar 02 20:48:56 2006 +0000
+++ b/mail/gld/distinfo Thu Mar 02 20:49:39 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2005/04/21 11:46:13 xtraeme Exp $
+$NetBSD: distinfo,v 1.11 2006/03/02 20:49:39 wiz Exp $
 
 SHA1 (gld-1.5.2.tgz) = db6dd26df7645b62beec8cd5731359bb37f0258e
 RMD160 (gld-1.5.2.tgz) = 9e8b7f986eab14b001834d774e3624b8fd58cd48
 Size (gld-1.5.2.tgz) = 39135 bytes
-SHA1 (patch-aa) = 71bc915a5096a3d93cd7b5313f135b68312ec19a
+SHA1 (patch-aa) = 3fca941c005bc37aa5275e9d0193c51f315b4212
 SHA1 (patch-ab) = 629b99be25d536ceb646d47f079455a4b092fe24
 SHA1 (patch-ac) = 8d484c0d6a5cbc88f2c4c66143e6aa9a91131bf1
 SHA1 (patch-ad) = 1083bdc0040696a5ac014204c1a4a8e35fdeda53
diff -r e694015e462e -r ba9a1a5f1c92 mail/gld/options.mk
--- a/mail/gld/options.mk       Thu Mar 02 20:48:56 2006 +0000
+++ b/mail/gld/options.mk       Thu Mar 02 20:49:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2006/03/02 20:41:30 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2006/03/02 20:49:39 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gld
 PKG_OPTIONS_REQUIRED_GROUPS=   database
@@ -10,9 +10,13 @@
 .if !empty(PKG_OPTIONS:Mmysql)
 .  include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_PREFIX.mysql-client}
+LIBS+=                 -L${BUILDLINK_PREFIX.mysql-client}/lib \
+                       -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib -lmysqlclient
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-pgsql=${BUILDLINK_PREFIX.postgresql-libs}
+LIBS+=                 -L${BUILDLINK_PREFIX.mysql-client}/lib \
+                       -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib -lpq
 .endif
diff -r e694015e462e -r ba9a1a5f1c92 mail/gld/patches/patch-aa
--- a/mail/gld/patches/patch-aa Thu Mar 02 20:48:56 2006 +0000
+++ b/mail/gld/patches/patch-aa Thu Mar 02 20:49:39 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2005/04/13 17:14:01 salo Exp $
+$NetBSD: patch-aa,v 1.6 2006/03/02 20:49:39 wiz Exp $
 
 --- Makefile.in.orig   2004-10-12 14:41:49.000000000 +0200
 +++ Makefile.in        2005-04-13 19:10:29.000000000 +0200
@@ -9,7 +9,7 @@
 -      @CC@ -O2 @DEFS@ -Wall server.o sql.o sockets.o cnf.o greylist.o @LIBS@ @SQL_LIBS@ -o gld
 -      strip gld
 +      @CC@ -O2 @DEFS@ -Wall server.o sql.o sockets.o cnf.o greylist.o \
-+          $(LDFLAGS) -lmysqlclient -o gld
++          $(LDFLAGS) @SQL_LIBS@ -o gld
  
  sockets.o: sockets.c sockets.h
        @CC@ -O2 @DEFS@ -Wall -c sockets.c