Unbreak after gnutls update.

Regen patches while here.
This commit is contained in:
ajacoutot 2009-10-11 16:33:36 +00:00
parent 68e5171bd3
commit b193ce8eb4
8 changed files with 41 additions and 27 deletions

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.6 2009/08/01 14:11:19 sthen Exp $
--- Makefile.in.orig Wed May 7 23:59:24 2008
+++ Makefile.in Thu Oct 30 14:17:32 2008
@@ -687,13 +687,6 @@ uninstall-info: uninstall-info-recursive
$OpenBSD: patch-Makefile_in,v 1.7 2009/10/11 16:33:36 ajacoutot Exp $
--- Makefile.in.orig Sun Oct 11 18:21:53 2009
+++ Makefile.in Sun Oct 11 18:21:53 2009
@@ -688,13 +688,6 @@ uninstall-info: uninstall-info-recursive
install-data-local:

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure,v 1.5 2009/10/11 16:33:36 ajacoutot Exp $
--- configure.orig Sun Oct 11 18:27:25 2009
+++ configure Sun Oct 11 18:28:01 2009
@@ -22997,8 +22997,8 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_GNUTLS 1
_ACEOF
- CPPFLAGS="$CPPFLAGS `libgnutls-config --cflags`"
- NETWORK_LIBS="$NETWORK_LIBS `libgnutls-config --libs`"
+ CPPFLAGS="$CPPFLAGS `pkg-config gnutls --cflags`"
+ NETWORK_LIBS="$NETWORK_LIBS `pkg-config gnutls --libs`"
else
echo "$as_me:$LINENO: checking if openssl is wanted" >&5
echo $ECHO_N "checking if openssl is wanted... $ECHO_C" >&6

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-odbc_unittests_Makefile_in,v 1.4 2009/08/01 14:11:19 sthen Exp $
--- src/odbc/unittests/Makefile.in.orig Wed May 7 23:59:20 2008
+++ src/odbc/unittests/Makefile.in Thu Oct 30 14:17:32 2008
@@ -1006,7 +1006,7 @@ check-am: all-am
$OpenBSD: patch-odbc_unittests_Makefile_in,v 1.5 2009/10/11 16:33:36 ajacoutot Exp $
--- src/odbc/unittests/Makefile.in.orig Sun Oct 11 18:21:53 2009
+++ src/odbc/unittests/Makefile.in Sun Oct 11 18:21:53 2009
@@ -1015,7 +1015,7 @@ check-am: all-am
check: check-am
all-am: Makefile
installdirs:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_ctlib_unittests_Makefile_in,v 1.4 2009/08/01 14:11:19 sthen Exp $
--- src/ctlib/unittests/Makefile.in.orig Wed May 7 23:59:18 2008
+++ src/ctlib/unittests/Makefile.in Thu Oct 30 14:17:32 2008
@@ -735,7 +735,7 @@ check-am: all-am
$OpenBSD: patch-src_ctlib_unittests_Makefile_in,v 1.5 2009/10/11 16:33:36 ajacoutot Exp $
--- src/ctlib/unittests/Makefile.in.orig Sun Oct 11 18:21:53 2009
+++ src/ctlib/unittests/Makefile.in Sun Oct 11 18:21:53 2009
@@ -736,7 +736,7 @@ check-am: all-am
check: check-am
all-am: Makefile
installdirs:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dblib_unittests_Makefile_in,v 1.4 2009/08/01 14:11:19 sthen Exp $
--- src/dblib/unittests/Makefile.in.orig Wed May 7 23:59:19 2008
+++ src/dblib/unittests/Makefile.in Thu Oct 30 14:17:32 2008
@@ -784,7 +784,7 @@ check-am: all-am
$OpenBSD: patch-src_dblib_unittests_Makefile_in,v 1.5 2009/10/11 16:33:36 ajacoutot Exp $
--- src/dblib/unittests/Makefile.in.orig Sun Oct 11 18:21:53 2009
+++ src/dblib/unittests/Makefile.in Sun Oct 11 18:21:53 2009
@@ -785,7 +785,7 @@ check-am: all-am
check: check-am
all-am: Makefile
installdirs:

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_odbc_connectparams_c,v 1.1 2009/08/01 14:11:19 sthen Exp $
--- src/odbc/connectparams.c.orig Sun Jul 1 11:10:52 2007
+++ src/odbc/connectparams.c Thu Oct 30 14:17:32 2008
$OpenBSD: patch-src_odbc_connectparams_c,v 1.2 2009/10/11 16:33:36 ajacoutot Exp $
--- src/odbc/connectparams.c.orig Sun Jul 1 12:10:52 2007
+++ src/odbc/connectparams.c Sun Oct 11 18:21:53 2009
@@ -46,7 +46,7 @@ TDS_RCSID(var, "$Id: connectparams.c,v 1.72 2007/07/01
* by build scripts.
*/

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_pool_Makefile_in,v 1.3 2009/08/01 14:11:20 sthen Exp $
--- src/pool/Makefile.in.orig Wed May 7 23:59:21 2008
+++ src/pool/Makefile.in Thu Oct 30 14:17:32 2008
@@ -529,10 +529,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
$OpenBSD: patch-src_pool_Makefile_in,v 1.4 2009/10/11 16:33:36 ajacoutot Exp $
--- src/pool/Makefile.in.orig Sun Oct 11 18:21:53 2009
+++ src/pool/Makefile.in Sun Oct 11 18:21:53 2009
@@ -530,10 +530,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
install-data-local:

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_tds_unittests_Makefile_in,v 1.4 2009/08/01 14:11:20 sthen Exp $
--- src/tds/unittests/Makefile.in.orig Thu May 8 00:59:22 2008
+++ src/tds/unittests/Makefile.in Thu Oct 30 17:51:01 2008
$OpenBSD: patch-src_tds_unittests_Makefile_in,v 1.5 2009/10/11 16:33:36 ajacoutot Exp $
--- src/tds/unittests/Makefile.in.orig Sun Oct 11 18:21:53 2009
+++ src/tds/unittests/Makefile.in Sun Oct 11 18:21:53 2009
@@ -198,7 +198,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBICONV = @LIBICONV@
@ -10,7 +10,7 @@ $OpenBSD: patch-src_tds_unittests_Makefile_in,v 1.4 2009/08/01 14:11:20 sthen Ex
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
@@ -623,7 +623,7 @@ check-am: all-am
@@ -624,7 +624,7 @@ check-am: all-am
check: check-am
all-am: Makefile
installdirs: