diff options
-rw-r--r-- | databases/myodbc/Makefile | 7 | ||||
-rw-r--r-- | databases/myodbc/PLIST | 7 | ||||
-rw-r--r-- | databases/myodbc/distinfo | 12 | ||||
-rw-r--r-- | databases/myodbc/patches/patch-aa | 13 | ||||
-rw-r--r-- | databases/myodbc/patches/patch-ab | 13 | ||||
-rw-r--r-- | databases/myodbc/patches/patch-ac | 13 | ||||
-rw-r--r-- | databases/myodbc/patches/patch-ad | 13 |
7 files changed, 66 insertions, 12 deletions
diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile index add23d7320f..2671aa3399e 100644 --- a/databases/myodbc/Makefile +++ b/databases/myodbc/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.21 2010/01/29 17:23:39 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2010/05/03 05:03:10 jnemeth Exp $ # -DISTNAME= mysql-connector-odbc-3.51.26r1127 +DISTNAME= mysql-connector-odbc-5.1.6 PKGNAME= ${DISTNAME:S/mysql-connector-odbc/myodbc/} -PKGREVISION= 2 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_MYSQL:=Connector-ODBC/3.51/} +MASTER_SITES= ${MASTER_SITE_MYSQL:=Connector-ODBC/5.1/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mysql.com/ diff --git a/databases/myodbc/PLIST b/databases/myodbc/PLIST index 2f53da7f6a6..11d6ed7be3c 100644 --- a/databases/myodbc/PLIST +++ b/databases/myodbc/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:43:18 joerg Exp $ -bin/myodbc3m -lib/libmyodbc3.la +@comment $NetBSD: PLIST,v 1.7 2010/05/03 05:03:11 jnemeth Exp $ +bin/myodbc-installer ${PLIST.gui}lib/libmyodbc3S.la -lib/libmyodbc3_r.la +lib/libmyodbc5.la share/doc/mysql-connector-odbc/ChangeLog share/doc/mysql-connector-odbc/INSTALL share/doc/mysql-connector-odbc/LICENSE.exceptions diff --git a/databases/myodbc/distinfo b/databases/myodbc/distinfo index e355f884ca7..705287f8066 100644 --- a/databases/myodbc/distinfo +++ b/databases/myodbc/distinfo @@ -1,5 +1,9 @@ -$NetBSD: distinfo,v 1.6 2008/11/11 20:29:27 bouyer Exp $ +$NetBSD: distinfo,v 1.7 2010/05/03 05:03:11 jnemeth Exp $ -SHA1 (mysql-connector-odbc-3.51.26r1127.tar.gz) = 1800c13cb3394210b3b543e63284e125c8f6986f -RMD160 (mysql-connector-odbc-3.51.26r1127.tar.gz) = fec50270c8de0a6fe6324decedfd9d6705ffa807 -Size (mysql-connector-odbc-3.51.26r1127.tar.gz) = 954125 bytes +SHA1 (mysql-connector-odbc-5.1.6.tar.gz) = c02e1c671fae60f7f7389dd2f963b07c3113ab35 +RMD160 (mysql-connector-odbc-5.1.6.tar.gz) = 90eeefbfb0153a32dd7f0be5c2685fcf13036543 +Size (mysql-connector-odbc-5.1.6.tar.gz) = 1041247 bytes +SHA1 (patch-aa) = 008d85389f444ca2f60fee1c67651e0a00d13e4f +SHA1 (patch-ab) = 972d39b8eabea7af4e31791d5993dc4a5c24dc2e +SHA1 (patch-ac) = f7920f3a3321b09c93cfbf2959d52455e1ed7436 +SHA1 (patch-ad) = 05ee2c4c11c009bc7c4c758ef0168a43b6ad0185 diff --git a/databases/myodbc/patches/patch-aa b/databases/myodbc/patches/patch-aa new file mode 100644 index 00000000000..6cadbeaa3a7 --- /dev/null +++ b/databases/myodbc/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.3 2010/05/03 05:03:11 jnemeth Exp $ + +--- Makefile.in.orig 2009-11-05 21:35:16.000000000 +0000 ++++ Makefile.in +@@ -366,7 +366,7 @@ distclean-libtool: + -rm -f libtool config.lt + install-readmeDATA: $(readme_DATA) + @$(NORMAL_INSTALL) +- test -z "$(readmedir)" || $(MKDIR_P) "$(DESTDIR)$(readmedir)" ++ test -z "$(DESTDIR)$(readmedir)" || $(MKDIR_P) "$(DESTDIR)$(readmedir)" + @list='$(readme_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ diff --git a/databases/myodbc/patches/patch-ab b/databases/myodbc/patches/patch-ab new file mode 100644 index 00000000000..f40ad520236 --- /dev/null +++ b/databases/myodbc/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.3 2010/05/03 05:03:11 jnemeth Exp $ + +--- driver/Makefile.in.orig 2009-11-05 21:35:15.000000000 +0000 ++++ driver/Makefile.in +@@ -358,7 +358,7 @@ distclean-hdr: + -rm -f myconf.h stamp-h1 + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" ++ test -z "$(DESTDIR)$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ diff --git a/databases/myodbc/patches/patch-ac b/databases/myodbc/patches/patch-ac new file mode 100644 index 00000000000..4eeed8fa8b3 --- /dev/null +++ b/databases/myodbc/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2010/05/03 05:03:11 jnemeth Exp $ + +--- installer/Makefile.in.orig 2009-11-05 21:35:15.000000000 +0000 ++++ installer/Makefile.in +@@ -288,7 +288,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" ++ test -z "$(DESTDIR)$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ diff --git a/databases/myodbc/patches/patch-ad b/databases/myodbc/patches/patch-ad new file mode 100644 index 00000000000..bb626a74094 --- /dev/null +++ b/databases/myodbc/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2010/05/03 05:03:11 jnemeth Exp $ + +--- setup/Makefile.in.orig 2009-11-05 21:35:15.000000000 +0000 ++++ setup/Makefile.in +@@ -397,7 +397,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" ++ test -z "$(DESTDIR)$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ |