4 files changed, 83 insertions, 81 deletions

diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 5cf446c4e4ba..215be11f0448 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	unixODBC
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.unixodbc.org/
 
diff --git a/databases/unixODBC/files/patch-ab b/databases/unixODBC/files/patch-ab
index 818469b4cfe7..0d7e217afabe 100644
--- a/databases/unixODBC/files/patch-ab
+++ b/databases/unixODBC/files/patch-ab
@@ -1,5 +1,5 @@
---- aclocal.m4~	Sat Jan 20 23:50:41 2001
-+++ aclocal.m4	Sat Jan 20 23:51:55 2001
+--- aclocal.m4.orig	Mon Jan 15 05:45:19 2001
++++ aclocal.m4	Wed Jan 24 00:32:54 2001
 @@ -518,7 +518,7 @@
  
  CXXFLAGS="$CXXFLAGS -I$qt_includes"
@@ -32,7 +32,7 @@
  AC_DEFUN(KDE_CHECK_LIBPTHREAD,
  [
 -AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"], LIBPTHREAD= )
-+AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-pthread"], LIBPTHREAD= )
++AC_CHECK_LIB(c_r, pthread_create, [LIBPTHREAD="-pthread"], LIBPTHREAD= )
  AC_SUBST(LIBPTHREAD)
  ])
  
diff --git a/databases/unixODBC/files/patch-ac b/databases/unixODBC/files/patch-ac
index 392e550c898b..8248f33b564b 100644
--- a/databases/unixODBC/files/patch-ac
+++ b/databases/unixODBC/files/patch-ac
@@ -1,34 +1,34 @@
---- configure.in~	Sat Jan 20 23:52:26 2001
-+++ configure.in	Sat Jan 20 23:56:35 2001
+--- configure.in.orig	Mon Jan 15 05:44:57 2001
++++ configure.in	Wed Jan 24 00:40:51 2001
 @@ -110,8 +110,8 @@
  ])
  AC_SUBST(READLINE)
  
 -AC_CHECK_LIB(c, strcasecmp, [AC_DEFINE(HAVE_STRCASECMP, 1)])
 -AC_CHECK_LIB(c, strncasecmp, [AC_DEFINE(HAVE_STRNCASECMP, 1)])
-+AC_CHECK_FUNC(c, strcasecmp, [AC_DEFINE(HAVE_STRCASECMP, 1)])
-+AC_CHECK_FUNC(c, strncasecmp, [AC_DEFINE(HAVE_STRNCASECMP, 1)])
++AC_CHECK_FUNC(strcasecmp, [AC_DEFINE(HAVE_STRCASECMP, 1)])
++AC_CHECK_FUNC(strncasecmp, [AC_DEFINE(HAVE_STRNCASECMP, 1)])
  
  LIBADD_DL=
  AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1) LIBADD_DL="-ldl"],
-@@ -134,25 +134,26 @@
+@@ -134,25 +134,27 @@
      AC_DEFINE(HAVE_LIBPTH,1)
    else
      AC_CHECK_LIBPT(pthread, pthread_mutex_lock )
 -    AC_CHECK_LIBPT(pthread, pthread_mutex_lock, 
-+    AC_CHECK_FUNC(c_r, pthread_mutex_lock,
++    AC_CHECK_LIBPT(c_r, pthread_mutex_lock,
      [
        AC_DEFINE(HAVE_LIBPTHREAD,1)
        if test "x$ac_cv_prog_gcc"="xyes"; then
--        CFLAGS="$CFLAGS -pthread"
-+        LIBS="$LIBS -pthread"
+         CFLAGS="$CFLAGS -pthread"
++        CXXFLAGS="$CXXFLAGS -pthread"
 +        AC_DEFINE(_THREAD_SAFE,1)
        fi
      ] )
  
      AC_CHECK_LIB(thread, mutex_lock )
 -    AC_CHECK_LIB(c, localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)] )
-+    AC_CHECK_FUNC(c, localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)] )
++    AC_CHECK_FUNC(localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)] )
    fi
  fi
  
@@ -38,11 +38,11 @@
 -  AC_CHECK_LIB( c, shmget,[],[stats=false] )
 -  AC_CHECK_LIB( c, semop,[],[stats=false] )
 -  AC_CHECK_LIB( c, snprintf, [AC_DEFINE(HAVE_SNPRINTF)],[stats=false] )
-+  AC_CHECK_FUNC( c, ftok,[],[stats=false] )
-+  AC_CHECK_FUNC( c, semget,[],[stats=false] )
-+  AC_CHECK_FUNC( c, shmget,[],[stats=false] )
-+  AC_CHECK_FUNC( c, semop,[],[stats=false] )
-+  AC_CHECK_FUNC( c, snprintf, [AC_DEFINE(HAVE_SNPRINTF)],[stats=false] )
++  AC_CHECK_FUNC(ftok,[],[stats=false] )
++  AC_CHECK_FUNC(semget,[],[stats=false] )
++  AC_CHECK_FUNC(shmget,[],[stats=false] )
++  AC_CHECK_FUNC(semop,[],[stats=false] )
++  AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF)],[stats=false] )
  fi
  
  if test "x$stats" = "xtrue"; then
diff --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist
index afacc995fd7d..2ff5cfccbc6a 100644
--- a/databases/unixODBC/pkg-plist
+++ b/databases/unixODBC/pkg-plist
@@ -4,6 +4,7 @@
 bin/dltest
 bin/isql
 bin/odbcinst
+bin/sqi
 etc/odbc.ini
 etc/odbcinst.ini
 include/odbcinst.h
@@ -67,67 +68,67 @@ lib/libtdsS.so.1
 lib/libtemplate.a
 lib/libtemplate.so
 lib/libtemplate.so.1
-share/doc/unixODBC/AdministratorManual/index.html
-share/doc/unixODBC/AdministratorManual/odbcinst.html
-share/doc/unixODBC/AdministratorManual/php3.html
-share/doc/unixODBC/AdministratorManual/unixODBC.gif
-share/doc/unixODBC/AdministratorManual/unixODBCsetup.html
-share/doc/unixODBC/ProgrammerManual/Tutorial/close.html
-share/doc/unixODBC/ProgrammerManual/Tutorial/conne.html
-share/doc/unixODBC/ProgrammerManual/Tutorial/dsn.html
-share/doc/unixODBC/ProgrammerManual/Tutorial/gloss.html
-share/doc/unixODBC/ProgrammerManual/Tutorial/index.html
-share/doc/unixODBC/ProgrammerManual/Tutorial/intro.html
-share/doc/unixODBC/ProgrammerManual/Tutorial/navi.html
-share/doc/unixODBC/ProgrammerManual/Tutorial/odbc.css
-share/doc/unixODBC/ProgrammerManual/Tutorial/query.html
-share/doc/unixODBC/ProgrammerManual/Tutorial/resul.html
-share/doc/unixODBC/ProgrammerManual/index.html
-share/doc/unixODBC/ProgrammerManual/unixODBC.gif
-share/doc/unixODBC/UserManual/Figure1.gif
-share/doc/unixODBC/UserManual/Figure2.gif
-share/doc/unixODBC/UserManual/Figure3.gif
-share/doc/unixODBC/UserManual/Figure4.gif
-share/doc/unixODBC/UserManual/Figure6.gif
-share/doc/unixODBC/UserManual/My.sql
-share/doc/unixODBC/UserManual/StarOfficeDataGrid.gif
-share/doc/unixODBC/UserManual/index.html
-share/doc/unixODBC/UserManual/unixODBC.gif
-share/doc/unixODBC/index.html
-share/doc/unixODBC/lst/InternalStructure.gif
-share/doc/unixODBC/lst/InternalStructure.html
-share/doc/unixODBC/lst/InternalStructure.vsd
-share/doc/unixODBC/lst/InternalStructure2.gif
-share/doc/unixODBC/lst/InternalStructure2.html
-share/doc/unixODBC/lst/InternalStructure3.gif
-share/doc/unixODBC/lst/InternalStructure3.html
-share/doc/unixODBC/lst/InternalStructure4.gif
-share/doc/unixODBC/lst/InternalStructure4.html
-share/doc/unixODBC/lst/InternalStructure5.gif
-share/doc/unixODBC/lst/InternalStructure5.html
-share/doc/unixODBC/lst/InternalStructure6.gif
-share/doc/unixODBC/lst/InternalStructure6.html
-share/doc/unixODBC/lst/InternalStructure7.gif
-share/doc/unixODBC/lst/InternalStructure7.html
-share/doc/unixODBC/lst/InternalStructure8.gif
-share/doc/unixODBC/lst/InternalStructure8.html
-share/doc/unixODBC/lst/InternalStructure9.gif
-share/doc/unixODBC/lst/InternalStructure9.html
-share/doc/unixODBC/lst/back.gif
-share/doc/unixODBC/lst/next.gif
-share/doc/unixODBC/smallbook.gif
-share/doc/unixODBC/sqi/InternalStructure.gif
-share/doc/unixODBC/sqi/InternalStructure.html
-share/doc/unixODBC/sqi/InternalStructure.vsd
-share/doc/unixODBC/sqi/InternalStructure2.gif
-share/doc/unixODBC/sqi/InternalStructure2.html
-share/doc/unixODBC/sqi/back.gif
-share/doc/unixODBC/sqi/next.gif
-share/doc/unixODBC/unixODBC.gif
-@dirrm share/doc/unixODBC/sqi
-@dirrm share/doc/unixODBC/lst
-@dirrm share/doc/unixODBC/UserManual
-@dirrm share/doc/unixODBC/ProgrammerManual/Tutorial
-@dirrm share/doc/unixODBC/ProgrammerManual
-@dirrm share/doc/unixODBC/AdministratorManual
-@dirrm share/doc/unixODBC
+%%PORTDOCS%%share/doc/unixODBC/AdministratorManual/index.html
+%%PORTDOCS%%share/doc/unixODBC/AdministratorManual/odbcinst.html
+%%PORTDOCS%%share/doc/unixODBC/AdministratorManual/php3.html
+%%PORTDOCS%%share/doc/unixODBC/AdministratorManual/unixODBC.gif
+%%PORTDOCS%%share/doc/unixODBC/AdministratorManual/unixODBCsetup.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/Tutorial/close.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/Tutorial/conne.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/Tutorial/dsn.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/Tutorial/gloss.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/Tutorial/index.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/Tutorial/intro.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/Tutorial/navi.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/Tutorial/odbc.css
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/Tutorial/query.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/Tutorial/resul.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/index.html
+%%PORTDOCS%%share/doc/unixODBC/ProgrammerManual/unixODBC.gif
+%%PORTDOCS%%share/doc/unixODBC/UserManual/Figure1.gif
+%%PORTDOCS%%share/doc/unixODBC/UserManual/Figure2.gif
+%%PORTDOCS%%share/doc/unixODBC/UserManual/Figure3.gif
+%%PORTDOCS%%share/doc/unixODBC/UserManual/Figure4.gif
+%%PORTDOCS%%share/doc/unixODBC/UserManual/Figure6.gif
+%%PORTDOCS%%share/doc/unixODBC/UserManual/My.sql
+%%PORTDOCS%%share/doc/unixODBC/UserManual/StarOfficeDataGrid.gif
+%%PORTDOCS%%share/doc/unixODBC/UserManual/index.html
+%%PORTDOCS%%share/doc/unixODBC/UserManual/unixODBC.gif
+%%PORTDOCS%%share/doc/unixODBC/index.html
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.gif
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.html
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.vsd
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure2.gif
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure2.html
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure3.gif
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure3.html
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure4.gif
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure4.html
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure5.gif
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure5.html
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure6.gif
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure6.html
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure7.gif
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure7.html
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure8.gif
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure8.html
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure9.gif
+%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure9.html
+%%PORTDOCS%%share/doc/unixODBC/lst/back.gif
+%%PORTDOCS%%share/doc/unixODBC/lst/next.gif
+%%PORTDOCS%%share/doc/unixODBC/smallbook.gif
+%%PORTDOCS%%share/doc/unixODBC/sqi/InternalStructure.gif
+%%PORTDOCS%%share/doc/unixODBC/sqi/InternalStructure.html
+%%PORTDOCS%%share/doc/unixODBC/sqi/InternalStructure.vsd
+%%PORTDOCS%%share/doc/unixODBC/sqi/InternalStructure2.gif
+%%PORTDOCS%%share/doc/unixODBC/sqi/InternalStructure2.html
+%%PORTDOCS%%share/doc/unixODBC/sqi/back.gif
+%%PORTDOCS%%share/doc/unixODBC/sqi/next.gif
+%%PORTDOCS%%share/doc/unixODBC/unixODBC.gif
+%%PORTDOCS%%@dirrm share/doc/unixODBC/sqi
+%%PORTDOCS%%@dirrm share/doc/unixODBC/lst
+%%PORTDOCS%%@dirrm share/doc/unixODBC/UserManual
+%%PORTDOCS%%@dirrm share/doc/unixODBC/ProgrammerManual/Tutorial
+%%PORTDOCS%%@dirrm share/doc/unixODBC/ProgrammerManual
+%%PORTDOCS%%@dirrm share/doc/unixODBC/AdministratorManual
+%%PORTDOCS%%@dirrm share/doc/unixODBC