Attachment 13732 Details for Bug 25995 – file.diff

[patch] file.diff

file.diff (text/plain), 4.08 KB, created by tkato on 2001-03-22 15:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2001-03-22 15:10:01 UTC

Size: 4.08 KB

patch

obsolete

>diff -urN /usr/ports/databases/unixODBC/Makefile databases/unixODBC/Makefile
>--- /usr/ports/databases/unixODBC/Makefile	Tue Feb 13 22:16:45 2001
>+++ databases/unixODBC/Makefile	Thu Mar 22 02:52:06 2001
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	unixODBC
>-PORTVERSION=	2.0.4
>+PORTVERSION=	2.0.5
> CATEGORIES=	databases
> MASTER_SITES=	http://www.unixodbc.org/
> 
>diff -urN /usr/ports/databases/unixODBC/distinfo databases/unixODBC/distinfo
>--- /usr/ports/databases/unixODBC/distinfo	Tue Feb 13 22:16:46 2001
>+++ databases/unixODBC/distinfo	Thu Mar 22 05:33:10 2001
>@@ -1 +1 @@
>-MD5 (unixODBC-2.0.4.tar.gz) = b79c866a961cea7325d467b79885aca0
>+MD5 (unixODBC-2.0.5.tar.gz) = fb587aed6ce2aacf6868ba1a45f272eb
>diff -urN /usr/ports/databases/unixODBC/files/patch-ac databases/unixODBC/files/patch-ac
>--- /usr/ports/databases/unixODBC/files/patch-ac	Thu Jan 25 19:07:16 2001
>+++ databases/unixODBC/files/patch-ac	Thu Mar 22 07:09:36 2001
>@@ -1,32 +1,24 @@
>---- 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)
>+--- configure.in.orig	Wed Mar 21 22:15:36 2001
>++++ configure.in	Thu Mar 22 07:09:08 2001
>+@@ -143,12 +143,13 @@
>+     ])
>  
>--AC_CHECK_LIB(c, strcasecmp, [AC_DEFINE(HAVE_STRCASECMP, 1)])
>--AC_CHECK_LIB(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)])
>+     if test "x$gotthread" = "xno"; then
>+-      AC_CHECK_LIBPT(pthread, 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
>+           dnl Check if the compiler will build with -pthread as a option
>+           AC_CHECK_COMP_OPT(pthread)
>++          AC_DEFINE(_THREAD_SAFE,1)
>+         else
>+           dnl Check if the compiler will build with -mt as a option
>+           AC_CHECK_COMP_OPT(mt)
>+@@ -156,16 +157,16 @@
>+       ])
>+     fi
>  
>- LIBADD_DL=
>- AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL, 1) LIBADD_DL="-ldl"],
>-@@ -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_LIBPT(c_r, pthread_mutex_lock,
>-     [
>-       AC_DEFINE(HAVE_LIBPTHREAD,1)
>-       if test "x$ac_cv_prog_gcc"="xyes"; then
>-         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(localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R, 1)] )
>    fi
>diff -urN /usr/ports/databases/unixODBC/pkg-plist databases/unixODBC/pkg-plist
>--- /usr/ports/databases/unixODBC/pkg-plist	Thu Jan 25 19:07:18 2001
>+++ databases/unixODBC/pkg-plist	Thu Mar 22 20:23:48 2001
>@@ -4,7 +4,6 @@
> bin/dltest
> bin/isql
> bin/odbcinst
>-bin/sqi
> etc/odbc.ini
> etc/odbcinst.ini
> include/odbcinst.h
>@@ -50,6 +49,7 @@
> lib/libodbcpsql.a
> lib/libodbcpsql.so
> lib/libodbcpsql.so.1
>+lib/libodbcpsql.so.2
> lib/libodbcpsqlS.a
> lib/libodbcpsqlS.so
> lib/libodbcpsqlS.so.1
>@@ -62,6 +62,9 @@
> lib/liboraodbcS.a
> lib/liboraodbcS.so
> lib/liboraodbcS.so.1
>+lib/libsapdbS.a
>+lib/libsapdbS.so
>+lib/libsapdbS.so.1
> lib/libtdsS.a
> lib/libtdsS.so
> lib/libtdsS.so.1
>@@ -117,15 +120,7 @@
> %%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

Actions: View | Diff

Attachments on bug 25995: 13732