89939 – Repocopy requst: databases/myodbc -> databases/mysql-connector-odbc

Bug 89939 - Repocopy requst: databases/myodbc -> databases/mysql-connector-odbc

Summary: Repocopy requst: databases/myodbc -> databases/mysql-connector-odbc

Status:	Closed FIXED

Alias:	None

Product:	Ports & Packages
Classification:	Unclassified
Component:	Individual Port(s) (show other bugs)
Version:	Latest
Hardware:	Any Any

Importance:	Normal Affects Only Me
Assignee:	Marcus Alves Grando

URL:
Keywords:

Depends on:
Blocks:

Reported:	2005-12-04 14:10 UTC by sergey
Modified:	2006-01-17 20:52 UTC (History)
CC List:	1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description sergey 2005-12-04 14:10:04 UTC

	myodbc changed  name to "MySQL Connector/ODBC", so myodbc port 
	should be renamed/moved to mysql-connector-odbc

Comment 1 Edwin Groothuis freebsd_committer

2005-12-04 14:13:00 UTC

Class Changed
From-To: change-request->maintainer-update

Fix category (submitter is maintainer)

Comment 2 Marcus Alves Grando freebsd_committer

2005-12-04 18:33:14 UTC

State Changed
From-To: open->repocopy

Repocopy request databases/myodbc -> databases/mysql-connector-odbc

Comment 3 Marcus Alves Grando freebsd_committer

2005-12-04 18:33:14 UTC

Responsible Changed
From-To: freebsd-ports-bugs->portmgr

Repocopy request databases/myodbc -> databases/mysql-connector-odbc

Comment 4 Joe Marcus Clarke freebsd_committer

2005-12-07 05:58:37 UTC

State Changed
From-To: repocopy->open

Repocopy completed.

Comment 5 Joe Marcus Clarke freebsd_committer

2005-12-07 05:58:37 UTC

Responsible Changed
From-To: portmgr->mnag

Repocopy completed.

Comment 6 Sam Lawrance freebsd_committer

2005-12-08 11:33:55 UTC

State Changed
From-To: open->repocopy

Initial repocopy was incorrect 

was: databases/myodbc -> databases/myodbc-connector-odbc 
should be: databases/myodbc -> databases/mysql-connector-odbc

Comment 7 Sam Lawrance freebsd_committer

2005-12-08 11:33:55 UTC

Responsible Changed
From-To: mnag->portmgr

Initial repocopy was incorrect 

was: databases/myodbc -> databases/myodbc-connector-odbc 
should be: databases/myodbc -> databases/mysql-connector-odbc

Comment 8 Joe Marcus Clarke freebsd_committer

2005-12-08 18:09:04 UTC

State Changed
From-To: repocopy->open

Repocopy fixed.

Comment 9 Joe Marcus Clarke freebsd_committer

2005-12-08 18:09:04 UTC

Responsible Changed
From-To: portmgr->mnag

Repocopy fixed.

Comment 10 Marcus Alves Grando freebsd_committer

2005-12-09 15:30:29 UTC

Dear maintainer,

Repocopy are complete. Please provide patchs to update both ports.

http://www.freebsd.org/cgi/query-pr.cgi?pr=89939

Thanks

-- 
Marcus Alves Grando
marcus(at)corp.grupos.com.br  |  Grupos Internet S/A
   mnag(at)FreeBSD.org         |  FreeBSD.org

Comment 11 Marcus Alves Grando freebsd_committer

2005-12-09 15:31:51 UTC

State Changed
From-To: open->feedback

Repocopy done. Pleasy provide patches.

Comment 12 sergey 2005-12-10 20:19:35 UTC

Update databases/mysql++ to latest version - 2.0.7
		
New port files:
	files/patch-makemake.sh
	files/patch-examples::Makefile.base
	
databases/mysql++1 should by leaved "as is".

--- patch-mysql++ begins here ---
diff -ruN mysql++.orig/Makefile mysql++/Makefile
--- mysql++.orig/Makefile	Wed Nov 16 06:00:29 2005
+++ mysql++/Makefile	Sat Dec 10 17:26:00 2005
@@ -6,17 +6,22 @@
 #
 
 PORTNAME=	mysql++
-PORTVERSION=	1.7.40
+PORTVERSION=	2.0.7
 CATEGORIES=	databases devel
 MASTER_SITES=	http://tangentsoft.net/mysql++/releases/
+PKGNAMESUFFIX=	-mysql${MYSQL_VER}
 
 MAINTAINER=	sergey@network-asp.biz
 COMMENT=	Complex C++ API for MySQL
 
+BUILD_DEPENDS=  /usr/local/bin/bash:${PORTSDIR}/shells/bash2
+
 USE_MYSQL=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --includedir=${PREFIX}/include/mysql++
-CONFIGURE_ARGS+=	--disable-examples
+
+CONFIGURE_ARGS=	--with-mysql=${LOCALBASE}
+CONFIGURE_ARGS+=--disable-examples
+
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
@@ -25,7 +30,6 @@
 USE_GCC=	3.4
 .endif
 
-PKGNAMESUFFIX=	-mysql${MYSQL_VER}
 COMMENT+=	${MYSQL_VER}
 
 post-install:
@@ -39,8 +43,9 @@
 	@${INSTALL_DATA} ${WRKSRC}/examples/*.h ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/examples/Makefile.simple ${EXAMPLESDIR}/Makefile.temp
-	@${SED} -e "s|/usr/include/mysql++|${PREFIX}/include/mysql++|" < ${EXAMPLESDIR}/Makefile.temp | \
+	@${SED} -e "s|-I../lib|-I${PREFIX}/include/mysql++|" < ${EXAMPLESDIR}/Makefile.temp | \
 	${SED} -e "s|/usr/include/mysql|${LOCALBASE}/include/mysql|" | \
+	${SED} -e "s|CXX=g++||" | \
 	${SED} -e "s|-lmysqlpp|-L${PREFIX}/lib -L${LOCALBASE}/lib/mysql -lmysqlpp|" > ${EXAMPLESDIR}/Makefile
 	@${RM} -f ${EXAMPLESDIR}/Makefile.temp
 .endif
diff -ruN mysql++.orig/distinfo mysql++/distinfo
--- mysql++.orig/distinfo	Thu Jun  2 19:15:56 2005
+++ mysql++/distinfo	Sat Dec 10 17:26:00 2005
@@ -1,2 +1,3 @@
-MD5 (mysql++-1.7.40.tar.gz) = 163893856a9e5dbacffcb5ca6ad47c37
-SIZE (mysql++-1.7.40.tar.gz) = 1819351
+MD5 (mysql++-2.0.7.tar.gz) = e2ea3debacf936b0406012c895412ca4
+SHA256 (mysql++-2.0.7.tar.gz) = 35f3a775da8b736b23d8afeb73ed5af6b1be5f108c57a12f836ac3861118dd12
+SIZE (mysql++-2.0.7.tar.gz) = 1970290
diff -ruN mysql++.orig/files/patch-examples::Makefile.base mysql++/files/patch-examples::Makefile.base
--- mysql++.orig/files/patch-examples::Makefile.base	Thu Jan  1 03:00:00 1970
+++ mysql++/files/patch-examples::Makefile.base	Sat Dec 10 16:08:00 2005
@@ -0,0 +1,92 @@
+--- examples/Makefile.base.orig	Wed Nov  2 21:03:09 2005
++++ examples/Makefile.base	Sat Dec 10 16:08:30 2005
+@@ -22,15 +22,6 @@
+ 
+ # --- No user-serviceable parts below :)
+ 
+-define mk-objlist
+-	$(foreach O,$1,\
+-		$(if $(findstring $(BIN_DIR)/,$(O)),$(O),$(BIN_DIR)/$(O)))
+-endef
+-
+-ifndef BIN_DIR
+-	BIN_DIR=.
+-endif
+-
+ BINARIES=resetdb$(EXE) simple1$(EXE) simple2$(EXE) simple3$(EXE) \
+ 		usequery$(EXE) fieldinf1$(EXE) dbinfo$(EXE) cgi_image$(EXE) \
+ 		load_file$(EXE) updel$(EXE) multiquery$(EXE) custom1$(EXE) \
+@@ -67,56 +58,55 @@
+ 
+ 
+ resetdb$(EXE): $(RESETDB_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(RESETDB_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ simple1$(EXE): $(SIMPLE1_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ simple2$(EXE): $(SIMPLE2_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE2_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ simple3$(EXE): $(SIMPLE3_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(SIMPLE3_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ usequery$(EXE): $(USEQUERY_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(USEQUERY_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom1$(EXE): $(CUSTOM1_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom2$(EXE): $(CUSTOM2_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM2_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom3$(EXE): $(CUSTOM3_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM3_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom4$(EXE): $(CUSTOM4_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM4_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom5$(EXE): $(CUSTOM5_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM5_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ custom6$(EXE): $(CUSTOM6_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CUSTOM6_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ fieldinf1$(EXE): $(FIELDINF1_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(FIELDINF1_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ dbinfo$(EXE): $(DBINFO_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(DBINFO_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ cgi_image$(EXE): $(CGI_IMAGE_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(CGI_IMAGE_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ load_file$(EXE): $(LOAD_FILE_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(LOAD_FILE_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ updel$(EXE): $(UPDEL_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(UPDEL_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ multiquery$(EXE): $(MULTIQUERY_OBJS)
+-	$(LD) $(LDFLAGS) $(LDSTARTUP) $(call mk-objlist,$^) $(LDEXEFLAG)$@ $(LIBS)
+-
++	$(LD) $(LDFLAGS) $(LDSTARTUP) $(MULTIQUERY_OBJS) $(LDEXEFLAG)$@ $(LIBS)
+ 
+ resetdb.$(OBJ): resetdb.cpp util.h
+ simple1.$(OBJ): simple1.cpp util.h
diff -ruN mysql++.orig/files/patch-makemake.sh mysql++/files/patch-makemake.sh
--- mysql++.orig/files/patch-makemake.sh	Thu Jan  1 03:00:00 1970
+++ mysql++/files/patch-makemake.sh	Sat Dec 10 15:19:00 2005
@@ -0,0 +1,8 @@
+--- makemake.sh.orig	Wed Nov  2 21:03:09 2005
++++ makemake.sh	Sat Dec 10 15:07:58 2005
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/local/bin/bash
+ 
+ # Display usage message
+ function usage() {
diff -ruN mysql++.orig/pkg-plist mysql++/pkg-plist
--- mysql++.orig/pkg-plist	Fri Jun  3 16:56:27 2005
+++ mysql++/pkg-plist	Sat Dec 10 15:29:00 2005
@@ -11,19 +11,19 @@
 include/mysql++/field_names.h
 include/mysql++/field_types.h
 include/mysql++/fields.h
+include/mysql++/lockable.h
 include/mysql++/manip.h
+include/mysql++/myset.h
 include/mysql++/mysql++.h
-include/mysql++/mysql++.hh
+include/mysql++/noexceptions.h
 include/mysql++/null.h
 include/mysql++/platform.h
+include/mysql++/qparms.h
 include/mysql++/query.h
 include/mysql++/resiter.h
 include/mysql++/result.h
 include/mysql++/row.h
-include/mysql++/myset.h
-include/mysql++/sql_query.h
 include/mysql++/sql_string.h
-include/mysql++/sqlplus.hh
 include/mysql++/stream2string.h
 include/mysql++/string_util.h
 include/mysql++/tiny_int.h
@@ -31,24 +31,66 @@
 include/mysql++/vallist.h
 lib/libmysqlpp.a
 lib/libmysqlpp.so
-lib/libmysqlpp.so.4
+lib/libmysqlpp.so.2
 %%PORTDOCS%%%%DOCSDIR%%/mysqlpp-refman.pdf
 %%PORTDOCS%%%%DOCSDIR%%/mysqlpp-userman.pdf
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/_header.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadConversion-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadConversion.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadConversion__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadConversion__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadFieldName-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadFieldName.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadFieldName__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadFieldName__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadNullConversion-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadNullConversion.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadNullConversion__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadNullConversion__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadOption-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadOption.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadOption__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadOption__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadParamCount-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadParamCount.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadParamCount__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadParamCount__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadQuery-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadQuery.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadQuery__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BadQuery__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BasicLock-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BasicLock.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BasicLock__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1BasicLock__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ColData__Tmpl-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ColData__Tmpl.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ColData__Tmpl__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Connection-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Connection.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ConnectionFailed-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ConnectionFailed.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ConnectionFailed__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ConnectionFailed__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Connection__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Connection__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1DBSelectionFailed-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1DBSelectionFailed.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1DBSelectionFailed__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1DBSelectionFailed__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResultSets-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResultSets.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResultSets__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResultSets__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResults-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResults.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResults__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1EndOfResults__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Exception-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Exception.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Exception__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Exception__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1FieldNames-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1FieldNames.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1FieldTypes-members.html
@@ -57,6 +99,17 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Fields.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Fields__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Fields__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lock-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lock.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1LockFailed-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1LockFailed.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1LockFailed__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1LockFailed__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lock__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lockable-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lockable.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lockable__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Lockable__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmp-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmp.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmpCStr-members.html
@@ -65,9 +118,19 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmpCStr__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmp__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1MysqlCmp__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1NoExceptions-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1NoExceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1NoExceptions__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Null-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Null.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Null__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ObjectNotInitialized-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ObjectNotInitialized.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ObjectNotInitialized__coll__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1ObjectNotInitialized__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1OptionalExceptions-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1OptionalExceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1OptionalExceptions__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Query-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Query.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Query__coll__graph.png
@@ -85,20 +148,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Result__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Row-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Row.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1RowTemplate-members.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1RowTemplate.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1RowTemplate__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Row__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Row__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQuery-members.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQuery.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQueryNEParms-members.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQueryNEParms.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQueryParms-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQueryParms.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQueryParms__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQuery__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLQuery__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLString-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1SQLString.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1Set-members.html
@@ -111,6 +165,9 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1mysql__type__info-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1mysql__type__info.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1null__type.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1scoped__var__set-members.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1scoped__var__set.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1scoped__var__set__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1subscript__iterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1subscript__iterator.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/classmysqlpp_1_1subscript__iterator__coll__graph.png
@@ -165,7 +222,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/files.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/graph_legend.dot
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/graph_legend.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/graph_legend.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/hierarchy.html
@@ -203,16 +259,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__36.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__37.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__38.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__39.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__4.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__40.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__41.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__5.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__6.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__7.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__8.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherit__graph__9.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/inherits.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/lockable_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/lockable_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/lockable_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/manip_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/manip_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/manip_8h__dep__incl.png
@@ -224,11 +280,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/mysql++_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/mysql++_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/mysql++_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/mysql++_8hh-source.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/mysql++_8hh.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/namespacemembers.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/namespacemysqlpp.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/namespaces.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/noexceptions_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/noexceptions_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/noexceptions_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/null_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/null_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/null_8h__dep__incl.png
@@ -236,10 +293,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/platform_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/platform_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/platform_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/qparms_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/qparms_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/qparms_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/qparms_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/query_8h__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/refman/html/refman.css
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/resiter_8h__dep__incl.png
@@ -252,16 +314,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/row_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/row_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/row_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__query_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__query_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__query_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__query_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/sql__string_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sqlplus_8hh-source.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/sqlplus_8hh.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/stream2string_8h__dep__incl.png
@@ -303,16 +359,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1equal__list__ba-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1equal__list__ba.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1equal__list__ba__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__date-members.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__date.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__date__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__date__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__dt__base.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__dt__base__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__time-members.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__time.html
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__time__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1mysql__time__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1value__list__b-members.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1value__list__b.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/structmysqlpp_1_1value__list__b__coll__graph.png
@@ -330,13 +376,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/vallist_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/vallist_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/refman/html/vallist_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s02.html
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s03.html
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s04.html
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s05.html
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s06.html
-%%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s07.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/breakages.html
 %%PORTDOCS%%%%DOCSDIR%%/userman/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/licenses.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/ssqls.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/tquery.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/unicode.html
+%%PORTDOCS%%%%DOCSDIR%%/userman/html/userman.css
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.cpp
@@ -345,18 +393,23 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom3.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom4.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/custom5.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom6.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load_file.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/multiquery.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple2.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple3.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/updel.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/usequery.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/util.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/util.h
 @dirrm include/mysql++
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/refman/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/refman
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/userman/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/userman
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/refman/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/refman
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
--- patch-mysql++ ends here ---

Comment 13 sergey 2005-12-11 09:20:32 UTC

Sorry for previous patch.

Update databases/mysql-connector-odbc to version 3.51.12

New port files:
	files/patch-configure
	files/patch-driver::connect.c
	files/patch-driver::myodbc3.h
	files/patch-myodbcinst::myodbcinst.c
	files/patch-util::MYODBCUtil.h
	
After update databases/myodbc should be removed.

--- patch-mysql-connector-odbc begins here ---
diff -ruN mysql-connector-odbc.orig/Makefile mysql-connector-odbc/Makefile
--- mysql-connector-odbc.orig/Makefile	Tue Nov 15 08:48:21 2005
+++ mysql-connector-odbc/Makefile	Sat Dec 10 21:42:31 2005
@@ -5,20 +5,24 @@
 # $FreeBSD: ports/databases/mysql-connector-odbc/Makefile,v 1.17 2005/11/15 06:48:21 ade Exp $
 #
 
-PORTNAME=	myodbc
-PORTVERSION=	3.51.11
+PORTNAME=	mysql-connector-odbc
+PORTVERSION=	3.51.12
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=MyODBC3
-DISTNAME=	MyODBC-${PORTVERSION}
+PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
 
 MAINTAINER=	sergey@network-asp.biz
 COMMENT=	ODBC driver for MySQL
 
 USE_MYSQL=		yes
+BROKEN_WITH_MYSQL=	323
+
 USE_GMAKE=		yes
-USE_AUTOTOOLS=	libtool:13
+USE_AUTOTOOLS=		libtool:15
 INSTALLS_SHLIB=		yes
+CFLAGS+=		-L${LOCALBASE}/lib
+LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-mysql-path=${LOCALBASE} --without-samples \
 			--disable-gui --enable-test=no
 
@@ -27,7 +31,7 @@
 # MyODBC needs an ODBC driver manager to be installed, and it supports both
 # iODBC and unixODBC.  The following variable may be set at built-time to
 # either "iodbc" or "unixodbc", with the former being the default:
-DRIVER_MANAGER?=	iodbc
+DRIVER_MANAGER?=	unixodbc
 
 CONFIGURE_ARGS+=
 .if ${DRIVER_MANAGER} == "unixodbc"
@@ -43,14 +47,9 @@
 			--with-odbc-ini=${LOCALBASE}/etc/libiodbc/odbc.ini
 .endif
 
-PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
-COMMENT+=	${MYSQL_VER} / ${DRIVER_MANAGER}
+LIB_DEPENDS+=		ltdl.4:${PORTSDIR}/devel/libltdl15
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386" && ${OSVERSION} >= 503000
-BROKEN=		"Does not compile on FreeBSD >=5.x on !i386"
-.endif
+COMMENT+=	${MYSQL_VER} / ${DRIVER_MANAGER}
 
 # Allow a new value of ODBCVER to be set at build-time
 .if defined(ODBCVER)
@@ -74,4 +73,4 @@
 	[ -f ${PREFIX}/lib/libmyodbc3.so.0 ] || ${LN} -s ${PREFIX}/lib/libmyodbc3.so ${PREFIX}/lib/libmyodbc3.so.0
 	[ -f ${PREFIX}/lib/libmyodbc3_r.so.0 ] || ${LN} -s ${PREFIX}/lib/libmyodbc3_r.so ${PREFIX}/lib/libmyodbc3_r.so.0
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN mysql-connector-odbc.orig/distinfo mysql-connector-odbc/distinfo
--- mysql-connector-odbc.orig/distinfo	Sat Mar  5 09:04:19 2005
+++ mysql-connector-odbc/distinfo	Sat Dec 10 18:18:00 2005
@@ -1,2 +1,3 @@
-MD5 (MyODBC-3.51.11.tar.gz) = fb295a2a07dab09caf608f2227b531ef
-SIZE (MyODBC-3.51.11.tar.gz) = 971989
+MD5 (mysql-connector-odbc-3.51.12.tar.gz) = a484f590464fb823a8f821b2f1fd7fef
+SHA256 (mysql-connector-odbc-3.51.12.tar.gz) = 7a9c19bd4ee140e7afe77fdcaecee53b4ce4bbbeb35a158c9548aa7ab9482c74
+SIZE (mysql-connector-odbc-3.51.12.tar.gz) = 979942
diff -ruN mysql-connector-odbc.orig/files/myodbc-iodbc-patch mysql-connector-odbc/files/myodbc-iodbc-patch
--- mysql-connector-odbc.orig/files/myodbc-iodbc-patch	Sat Mar  5 09:04:20 2005
+++ mysql-connector-odbc/files/myodbc-iodbc-patch	Sat Oct 29 23:20:00 2005
@@ -1,11 +1,11 @@
---- driver/results.c.orig	Sun Feb 27 00:59:11 2005
-+++ driver/results.c	Sun Feb 27 00:59:19 2005
-@@ -544,7 +544,7 @@
- 		SQLPOINTER  CharacterAttributePtr,
- 		SQLSMALLINT BufferLength,
- 		SQLSMALLINT *StringLengthPtr,
--		SQLPOINTER  NumericAttributePtr)
-+		SQLLEN * NumericAttributePtr)
+--- driver/results.c.orig	Sun Oct  9 22:33:40 2005
++++ driver/results.c	Thu Oct 27 16:30:17 2005
+@@ -558,7 +558,7 @@
+                                    SQLPOINTER  CharacterAttributePtr,
+                                    SQLSMALLINT BufferLength,
+                                    SQLSMALLINT *StringLengthPtr,
+-                                   SQLPOINTER  NumericAttributePtr )
++                                   SQLLEN *NumericAttributePtr )
+ #endif
  {
-   return get_col_attr(StatementHandle, ColumnNumber,
- 		      FieldIdentifier, CharacterAttributePtr,
+     return get_col_attr( StatementHandle, 
diff -ruN mysql-connector-odbc.orig/files/patch-configure mysql-connector-odbc/files/patch-configure
--- mysql-connector-odbc.orig/files/patch-configure	Thu Jan  1 03:00:00 1970
+++ mysql-connector-odbc/files/patch-configure	Sat Oct 29 23:20:00 2005
@@ -0,0 +1,19 @@
+--- configure.orig	Sat Oct 29 20:43:26 2005
++++ configure	Sat Oct 29 21:00:14 2005
+@@ -1650,11 +1650,11 @@
+ 
+ # The aliases save the names the user supplied, while $host etc.
+ # will get canonicalized.
+-test -n "$target_alias" &&
+-  test "$program_prefix$program_suffix$program_transform_name" = \
+-    NONENONEs,x,x, &&
+-  program_prefix=${target_alias}-
+-am__api_version="1.9"
++# test -n "$target_alias" &&
++#   test "$program_prefix$program_suffix$program_transform_name" = \
++#     NONENONEs,x,x, &&
++#   program_prefix=${target_alias}-
++# am__api_version="1.9"
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
diff -ruN mysql-connector-odbc.orig/files/patch-driver::connect.c mysql-connector-odbc/files/patch-driver::connect.c
--- mysql-connector-odbc.orig/files/patch-driver::connect.c	Thu Jan  1 03:00:00 1970
+++ mysql-connector-odbc/files/patch-driver::connect.c	Sat Oct 29 23:20:00 2005
@@ -0,0 +1,14 @@
+--- driver/connect.c.orig	Sun Oct  9 22:33:40 2005
++++ driver/connect.c	Thu Oct 27 16:44:37 2005
+@@ -141,8 +141,10 @@
+     client_flag |=  CLIENT_COMPRESS;
+   if (option_flag & FLAG_IGNORE_SPACE)
+     client_flag |=  CLIENT_IGNORE_SPACE;
+-    
++
++#ifdef CLIENT_MULTI_RESULTS
+   client_flag |= CLIENT_MULTI_RESULTS;
++#endif
+ #ifdef __WIN__
+   if (option_flag & FLAG_NAMED_PIPE)
+     mysql_options(mysql,MYSQL_OPT_NAMED_PIPE,NullS);
diff -ruN mysql-connector-odbc.orig/files/patch-driver::myodbc3.h mysql-connector-odbc/files/patch-driver::myodbc3.h
--- mysql-connector-odbc.orig/files/patch-driver::myodbc3.h	Thu Jan  1 03:00:00 1970
+++ mysql-connector-odbc/files/patch-driver::myodbc3.h	Sat Oct 29 23:20:00 2005
@@ -0,0 +1,15 @@
+--- driver/myodbc3.h.orig	Sun Oct  9 22:33:40 2005
++++ driver/myodbc3.h	Thu Oct 27 16:16:05 2005
+@@ -101,7 +101,12 @@
+ #include <ltdl.h>
+ #include <sql.h>
+ #include <sqlext.h>
++
++# if defined(HAVE_IODBCINST_H)
++#include <iodbcinst.h>
++#elif defined(HAVE_ODBCINST_H)
+ #include <odbcinst.h>
++# endif
+ 
+ #ifndef SYSTEM_ODBC_INI
+ #define BOTH_ODBC_INI ODBC_BOTH_DSN
diff -ruN mysql-connector-odbc.orig/files/patch-myodbcinst::myodbcinst.c mysql-connector-odbc/files/patch-myodbcinst::myodbcinst.c
--- mysql-connector-odbc.orig/files/patch-myodbcinst::myodbcinst.c	Thu Jan  1 03:00:00 1970
+++ mysql-connector-odbc/files/patch-myodbcinst::myodbcinst.c	Sat Oct 29 23:20:00 2005
@@ -0,0 +1,14 @@
+--- myodbcinst/myodbcinst.c.orig	Mon Oct 10 05:49:47 2005
++++ myodbcinst/myodbcinst.c	Thu Oct 27 16:33:29 2005
+@@ -56,7 +56,11 @@
+     #include <ltdl.h>
+ #endif
+ 
++# if defined(HAVE_IODBCINST_H)
++#include <iodbcinst.h>
++#elif defined(HAVE_ODBCINST_H)
+ #include <odbcinst.h>
++# endif
+ 
+ #include "../util/MYODBCUtil.h"
+ 
diff -ruN mysql-connector-odbc.orig/files/patch-strndup mysql-connector-odbc/files/patch-strndup
--- mysql-connector-odbc.orig/files/patch-strndup	Sat Mar  5 09:04:20 2005
+++ mysql-connector-odbc/files/patch-strndup	Sat Oct 29 23:20:00 2005
@@ -1,11 +1,11 @@
---- util/MYODBCUtilReadDataSourceStr.c.orig	Wed Feb  2 05:01:28 2005
-+++ util/MYODBCUtilReadDataSourceStr.c	Sat Mar  5 02:05:08 2005
+--- util/MYODBCUtilReadDataSourceStr.c.orig	Sun Oct  9 22:33:40 2005
++++ util/MYODBCUtilReadDataSourceStr.c	Thu Oct 27 16:35:43 2005
 @@ -20,7 +20,7 @@
  
  #include "MYODBCUtil.h"
  
--#if defined(__APPLE__) || defined(WIN32) || defined(__SPARC__)
-+#if defined(__APPLE__) || defined(WIN32) || defined(__SPARC__) || defined(__FreeBSD__)
+-#if defined(__APPLE__) || defined(WIN32) || defined(__sparc)
++#if defined(__APPLE__) || defined(WIN32) || defined(__sparc) || defined(__FreeBSD__)
  char *strndup( const char *s, size_t n )
  {
      size_t nAvail;
diff -ruN mysql-connector-odbc.orig/files/patch-util::MYODBCUtil.h mysql-connector-odbc/files/patch-util::MYODBCUtil.h
--- mysql-connector-odbc.orig/files/patch-util::MYODBCUtil.h	Thu Jan  1 03:00:00 1970
+++ mysql-connector-odbc/files/patch-util::MYODBCUtil.h	Thu Oct 27 16:14:00 2005
@@ -0,0 +1,14 @@
+--- util/MYODBCUtil.h.orig	Sun Oct  9 22:33:40 2005
++++ util/MYODBCUtil.h	Thu Oct 27 16:13:47 2005
+@@ -40,7 +40,11 @@
+ #include <sqlext.h>
+ #endif
+ 
++# if defined(HAVE_IODBCINST_H)
++#include <iodbcinst.h>
++#elif defined(HAVE_ODBCINST_H)
+ #include <odbcinst.h>
++# endif
+ 
+ /* 
+     Handle case on OSX where we want to use GetPrivateProfileString (because it 
diff -ruN mysql-connector-odbc.orig/pkg-plist mysql-connector-odbc/pkg-plist
--- mysql-connector-odbc.orig/pkg-plist	Sat Mar  5 09:04:19 2005
+++ mysql-connector-odbc/pkg-plist	Sat Oct 29 23:19:00 2005
@@ -1,10 +1,10 @@
-lib/libmyodbc3-3.51.11.so
+bin/myodbc3m
+bin/myodbc3i
+lib/libmyodbc3-3.51.12.so
 lib/libmyodbc3.a
-lib/libmyodbc3.la
 lib/libmyodbc3.so
 lib/libmyodbc3.so.0
-lib/libmyodbc3_r-3.51.11.so
+lib/libmyodbc3_r-3.51.12.so
 lib/libmyodbc3_r.a
-lib/libmyodbc3_r.la
 lib/libmyodbc3_r.so
 lib/libmyodbc3_r.so.0
--- patch-mysql-connector-odbc ends here ---

Comment 14 Marcus Alves Grando freebsd_committer

2006-01-17 20:52:23 UTC

State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!