Newer MySQL isn't installed in lib/mysql, adjust.

4 files changed, 7 insertions, 25 deletions

diff --git a/databases/tcl-fbsql/Makefile b/databases/tcl-fbsql/Makefile
index 43bb71a3680..2c32de5e948 100644
--- a/databases/tcl-fbsql/Makefile
+++ b/databases/tcl-fbsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/03/02 20:33:25 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/03/28 21:16:41 joerg Exp $
 
 DISTNAME=		fbsql.c
 PKGNAME=		tcl-fbsql-1.06
@@ -16,6 +16,9 @@ USE_LIBTOOL=		YES
 DIST_SUBDIR=		${PKGNAME_NOREV}
 INSTALLATION_DIRS=	lib/tcl
 
+MAKE_ENV+=	MYSQLLIBDIR=${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_LIBDIRS.mysql-client}
+MAKE_ENV+=	MYSQLINCDIR=${BUILDLINK_PREFIX.mysql-client}/${BUILDLINK_INCDIRS.mysql-client}
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
diff --git a/databases/tcl-fbsql/distinfo b/databases/tcl-fbsql/distinfo
index bc956b76051..64c6cdad57e 100644
--- a/databases/tcl-fbsql/distinfo
+++ b/databases/tcl-fbsql/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2012/08/19 07:01:09 marino Exp $
+$NetBSD: distinfo,v 1.7 2013/03/28 21:16:41 joerg Exp $
 
 SHA1 (tcl-fbsql-1.06/fbsql.c) = c67315d94c80b808246b0a4075b1bcc0b3663a4f
 RMD160 (tcl-fbsql-1.06/fbsql.c) = 63519af1fa293f5f75d6150efceff70ba6effde9
 Size (tcl-fbsql-1.06/fbsql.c) = 22965 bytes
-SHA1 (patch-Makefile) = 689988f2a07bea3ad9bf8c59fdf56673d84e1fc8
diff --git a/databases/tcl-fbsql/files/Makefile b/databases/tcl-fbsql/files/Makefile
index 989ed63316d..b0e1babf1d9 100644
--- a/databases/tcl-fbsql/files/Makefile
+++ b/databases/tcl-fbsql/files/Makefile
@@ -1,11 +1,6 @@
-MYSQLLIBDIR = ${PREFIX}/lib/mysql
-MYSQLINCDIR = ${PREFIX}/include/mysql
+CFLAGS += -Wall -I${PREFIX}/include/tcl -I$(MYSQLINCDIR)
 
-PIC = -fPIC
-INCLUDES = -I${PREFIX}/include/tcl -I$(MYSQLINCDIR)
-CFLAGS += -Wall $(PIC) $(INCLUDES)
-
-LDFLAGS =  -lz $(MYSQLLIBDIR)/libmysqlclient.la -L$(PREFIX)/lib -ltcl
+LDFLAGS = -Wl,-rpath,$(MYSQLLIBDIR) -L$(MYSQLLIBDIR) -lmysqlclient -L$(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -ltcl -lz
 
 all:	fbsql.la
 
diff --git a/databases/tcl-fbsql/patches/patch-Makefile b/databases/tcl-fbsql/patches/patch-Makefile
deleted file mode 100644
index c3a5ce1a49e..00000000000
--- a/databases/tcl-fbsql/patches/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2012/08/19 07:01:09 marino Exp $
-
-LDFLAGS is overriding pkgsrc, so add rpath to ${PREFIX}/lib to find libtclXX.so
-
---- Makefile.orig	2012-08-18 13:33:02.582480000 +0000
-+++ Makefile
-@@ -5,7 +5,7 @@ PIC = -fPIC
- INCLUDES = -I${PREFIX}/include/tcl -I$(MYSQLINCDIR)
- CFLAGS += -Wall $(PIC) $(INCLUDES)
- 
--LDFLAGS =  -lz $(MYSQLLIBDIR)/libmysqlclient.la -L$(PREFIX)/lib -ltcl
-+LDFLAGS =  -lz $(MYSQLLIBDIR)/libmysqlclient.la -L$(PREFIX)/lib -R${PREFIX}/lib -ltcl
- 
- all:	fbsql.la
-