Tue May 27 13:24:43 2014 UTC ()
Fix libiconv support. Fixes sqlrelay-odbc build.


(fhajny)
diff -r1.1 -r1.2 pkgsrc/databases/sqlrelay/Makefile.common
diff -r1.9 -r1.10 pkgsrc/databases/sqlrelay/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/sqlrelay/patches/patch-ad
diff -r1.1 -r1.2 pkgsrc/databases/sqlrelay/patches/patch-configure
cvs diff -r1.1 -r1.2 pkgsrc/databases/sqlrelay/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/sqlrelay/Makefile.common 2014/05/22 12:50:48 1.1
+++ pkgsrc/databases/sqlrelay/Makefile.common 2014/05/27 13:24:43 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.1 2014/05/22 12:50:48 fhajny Exp $ 1# $NetBSD: Makefile.common,v 1.2 2014/05/27 13:24:43 fhajny Exp $
2# used by databases/p5-sqlrelay/Makefile 2# used by databases/p5-sqlrelay/Makefile
3# used by databases/php-sqlrelay/Makefile 3# used by databases/php-sqlrelay/Makefile
4# used by databases/py-sqlrelay/Makefile 4# used by databases/py-sqlrelay/Makefile
5# used by databases/ruby-sqlrelay/Makefile 5# used by databases/ruby-sqlrelay/Makefile
6# used by databases/sqlrelay-freetds/Makefile 6# used by databases/sqlrelay-freetds/Makefile
7# used by databases/sqlrelay-mysql/Makefile 7# used by databases/sqlrelay-mysql/Makefile
8# used by databases/sqlrelay-odbc/Makefile 8# used by databases/sqlrelay-odbc/Makefile
9# used by databases/sqlrelay-pgsql/Makefile 9# used by databases/sqlrelay-pgsql/Makefile
10# used by databases/sqlrelay-sqlite/Makefile 10# used by databases/sqlrelay-sqlite/Makefile
11# used by databases/sqlrelay/Makefile 11# used by databases/sqlrelay/Makefile
12 12
13DISTNAME= sqlrelay-0.55 13DISTNAME= sqlrelay-0.55
14CATEGORIES= databases 14CATEGORIES= databases
@@ -28,19 +28,20 @@ BUILD_DEFS+= VARBASE @@ -28,19 +28,20 @@ BUILD_DEFS+= VARBASE
28MAKE_JOBS_SAFE= no 28MAKE_JOBS_SAFE= no
29 29
30DESCR_SRC= ${.CURDIR}/../../databases/sqlrelay/DESCR 30DESCR_SRC= ${.CURDIR}/../../databases/sqlrelay/DESCR
31DISTINFO_FILE= ${.CURDIR}/../../databases/sqlrelay/distinfo 31DISTINFO_FILE= ${.CURDIR}/../../databases/sqlrelay/distinfo
32PATCHDIR= ${.CURDIR}/../../databases/sqlrelay/patches 32PATCHDIR= ${.CURDIR}/../../databases/sqlrelay/patches
33 33
34CONFIGURE_ARGS+= --localstatedir=${VARBASE} 34CONFIGURE_ARGS+= --localstatedir=${VARBASE}
35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
36CONFIGURE_ARGS+= --with-rudiments-prefix=${BUILDLINK_PREFIX.rudiments} 36CONFIGURE_ARGS+= --with-rudiments-prefix=${BUILDLINK_PREFIX.rudiments}
37 37
38PKG_SYSCONFSUBDIR= sqlrelay 38PKG_SYSCONFSUBDIR= sqlrelay
39EGDIR= ${PREFIX}/share/examples/sqlrelay 39EGDIR= ${PREFIX}/share/examples/sqlrelay
40 40
 41.include "../../converters/libiconv/buildlink3.mk"
41.include "../../devel/pcre/buildlink3.mk" 42.include "../../devel/pcre/buildlink3.mk"
42.include "../../devel/rudiments/buildlink3.mk" 43.include "../../devel/rudiments/buildlink3.mk"
43.include "../../devel/zlib/buildlink3.mk" 44.include "../../devel/zlib/buildlink3.mk"
44.include "../../security/openssl/buildlink3.mk" 45.include "../../security/openssl/buildlink3.mk"
45.include "../../mk/pthread.buildlink3.mk" 46.include "../../mk/pthread.buildlink3.mk"
46.include "../../mk/readline.buildlink3.mk" 47.include "../../mk/readline.buildlink3.mk"
cvs diff -r1.9 -r1.10 pkgsrc/databases/sqlrelay/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/sqlrelay/distinfo 2014/05/27 09:55:03 1.9
+++ pkgsrc/databases/sqlrelay/distinfo 2014/05/27 13:24:43 1.10
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.9 2014/05/27 09:55:03 joerg Exp $ 1$NetBSD: distinfo,v 1.10 2014/05/27 13:24:43 fhajny Exp $
2 2
3SHA1 (sqlrelay-0.55.tar.gz) = ce47d8564e13d03b1eda8ff5d497fb056b5752e2 3SHA1 (sqlrelay-0.55.tar.gz) = ce47d8564e13d03b1eda8ff5d497fb056b5752e2
4RMD160 (sqlrelay-0.55.tar.gz) = 9e727d2307f471ea935b5a8831a53929f0400c98 4RMD160 (sqlrelay-0.55.tar.gz) = 9e727d2307f471ea935b5a8831a53929f0400c98
5Size (sqlrelay-0.55.tar.gz) = 3644680 bytes 5Size (sqlrelay-0.55.tar.gz) = 3644680 bytes
6SHA1 (patch-ad) = c1c95f0938ed9efff7fd21392f7adeed80a86468 6SHA1 (patch-ad) = b822a43854848641feba34a5331082bb95f5d419
7SHA1 (patch-configure) = 4aa35512ac7d5a97f0f511ba2432dc48a1b68159 7SHA1 (patch-configure) = 72175a91d2892d5325ec619f45a5b2f571bcdbf5
8SHA1 (patch-etc_Makefile) = 262968ad43d34d53b4fe65514c1351127660e12c 8SHA1 (patch-etc_Makefile) = 262968ad43d34d53b4fe65514c1351127660e12c
9SHA1 (patch-init_rc.sqlrelay.in) = 6d358d9396339ecee8ef3b7054750100433fb271 9SHA1 (patch-init_rc.sqlrelay.in) = 6d358d9396339ecee8ef3b7054750100433fb271
10SHA1 (patch-src_api_c++_src_sqlrcursor.cpp) = ed1faf27227bc85c006808e9928a42ed9f86cdf2 10SHA1 (patch-src_api_c++_src_sqlrcursor.cpp) = ed1faf27227bc85c006808e9928a42ed9f86cdf2
11SHA1 (patch-src_loggers_custom__sc.cpp) = 79e2b0a54b151e76175f549747e3392accd0b4d9 11SHA1 (patch-src_loggers_custom__sc.cpp) = 79e2b0a54b151e76175f549747e3392accd0b4d9
cvs diff -r1.2 -r1.3 pkgsrc/databases/sqlrelay/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/databases/sqlrelay/patches/Attic/patch-ad 2014/05/22 12:50:48 1.2
+++ pkgsrc/databases/sqlrelay/patches/Attic/patch-ad 2014/05/27 13:24:43 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ad,v 1.2 2014/05/22 12:50:48 fhajny Exp $ 1$NetBSD: patch-ad,v 1.3 2014/05/27 13:24:43 fhajny Exp $
2 2
3We install init scripts ourselves. 3We install init scripts ourselves.
4--- Makefile.orig 2008-10-03 18:08:41.000000000 +0000 4--- Makefile.orig 2013-10-19 12:27:13.000000000 +0000
5+++ Makefile 5+++ Makefile
6@@ -25,7 +25,6 @@ install: 6@@ -17,7 +17,6 @@ install:
7 $(MAKE) -C src install 7 $(MAKE) -C src install
8 $(MAKE) -C bin install 8 $(MAKE) -C bin install
9 $(MAKE) -C etc install 9 $(MAKE) -C etc install
10- $(MAKE) -C init install 10- $(MAKE) -C init install
11 $(MAKE) -C man install 11 $(MAKE) -C man install
12 $(MAKE) -C doc install 12 $(MAKE) -C doc install
13 $(MKINSTALLDIRS) $(libdir)/pkgconfig 13 $(MKINSTALLDIRS) $(libdir)/pkgconfig
cvs diff -r1.1 -r1.2 pkgsrc/databases/sqlrelay/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/databases/sqlrelay/patches/patch-configure 2014/05/22 12:50:48 1.1
+++ pkgsrc/databases/sqlrelay/patches/patch-configure 2014/05/27 13:24:43 1.2
@@ -1,23 +1,32 @@ @@ -1,23 +1,32 @@
1$NetBSD: patch-configure,v 1.1 2014/05/22 12:50:48 fhajny Exp $ 1$NetBSD: patch-configure,v 1.2 2014/05/27 13:24:43 fhajny Exp $
2 2
3Look for history/readline at proper places. 3Look for history/readline at proper places.
4--- configure.orig 2014-05-21 10:24:24.050393065 +0000 4--- configure.orig 2014-03-26 14:50:53.000000000 +0000
5+++ configure 5+++ configure
6@@ -17557,7 +17557,7 @@ fi 6@@ -17557,7 +17557,7 @@ fi
7 $as_echo_n "checking for history... " >&6; } 7 $as_echo_n "checking for history... " >&6; }
8  8
9  9
10-SEARCHPATH=/usr 10-SEARCHPATH=/usr
11+SEARCHPATH=${prefix} 11+SEARCHPATH=${prefix}
12 NAME=history 12 NAME=history
13 HEADER=readline/history.h 13 HEADER=readline/history.h
14 LIBNAME=history 14 LIBNAME=history
15@@ -17893,7 +17893,7 @@ fi 15@@ -17893,7 +17893,7 @@ fi
16 $as_echo_n "checking for readline... " >&6; } 16 $as_echo_n "checking for readline... " >&6; }
17  17
18  18
19-SEARCHPATH=/usr 19-SEARCHPATH=/usr
20+SEARCHPATH=${prefix} 20+SEARCHPATH=${prefix}
21 NAME=readline 21 NAME=readline
22 HEADER=readline/readline.h 22 HEADER=readline/readline.h
23 LIBNAME=readline 23 LIBNAME=readline
 24@@ -18501,7 +18501,7 @@ rm -f core conftest.err conftest.$ac_obj
 25
 26
 27
 28-SEARCHPATH=/usr
 29+SEARCHPATH=${prefix}
 30 NAME=iconv
 31 HEADER=iconv.h
 32 LIBNAME=iconv