[pkgsrc/pkgsrc-2005Q2]: pkgsrc/databases/mysql-client Pullup ticket 586 - req...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2668f02ba99c
branches:  pkgsrc-2005Q2
changeset: 495875:2668f02ba99c
user:      snj <snj%pkgsrc.org@localhost>
date:      Sat Jul 16 04:34:33 2005 +0000

description:
Pullup ticket 586 - requested by grant beattie
portability fix for mysql-client

Revisions pulled up:
- pkgsrc/databases/mysql-client/Makefile.common 1.44, 1.45

    Module Name:    pkgsrc
    Committed By:   grant
    Date:           Tue Jul  5 08:48:41 UTC 2005

    Modified Files:
            pkgsrc/databases/mysql-client: Makefile.common

    Log Message:
    specify path to openssl in --with-openssl argument.

    noted by Pierre Bourgin on tech-pkg@
----
    Module Name:    pkgsrc
    Committed By:   grant
    Date:           Tue Jul  5 08:49:44 UTC 2005

    Modified Files:
            pkgsrc/databases/mysql-client: Makefile.common

    Log Message:
    use {CFLAGS,CXXFLAGS}.SunOS instead of conditional.

diffstat:

 databases/mysql-client/Makefile.common |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (31 lines):

diff -r 0fbab4825bdc -r 2668f02ba99c databases/mysql-client/Makefile.common
--- a/databases/mysql-client/Makefile.common    Sat Jul 16 04:27:58 2005 +0000
+++ b/databases/mysql-client/Makefile.common    Sat Jul 16 04:34:33 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2005/05/22 20:07:46 jlam Exp $
+# $NetBSD: Makefile.common,v 1.43.2.1 2005/07/16 04:34:33 snj Exp $
 
 DISTNAME=              mysql-4.0.24
 CATEGORIES=            databases
@@ -48,7 +48,7 @@
 CONFIGURE_ARGS+=       --without-debug
 CONFIGURE_ARGS+=       --without-bench
 CONFIGURE_ARGS+=       --with-low-memory
-CONFIGURE_ARGS+=        --with-openssl
+CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=       --with-vio
 
 CONFIGURE_ARGS+=       --with-charset=${MYSQL_CHARSET}
@@ -66,10 +66,8 @@
 
 # force HAVE_CURSES_H on Solaris since the configure script is broken
 # and does not properly detect this, breaking the build later on.
-.if ${OPSYS} == "SunOS"
-CFLAGS+=               -DHAVE_CURSES_H
-CXXFLAGS+=             -DHAVE_CURSES_H
-.endif
+CFLAGS.SunOS+=         -DHAVE_CURSES_H
+CXXFLAGS.SunOS+=       -DHAVE_CURSES_H
 
 .include "../../mk/pthread.buildlink3.mk"