Attachment 30532 Details for Bug 51361 – file.diff

[patch] file.diff

file.diff (text/plain), 5.58 KB, created by tkato on 2003-04-24 17:40:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-04-24 17:40:08 UTC

Size: 5.58 KB

patch

obsolete

>diff -urN /usr/ports/databases/unixODBC/Makefile databases/unixODBC/Makefile
>--- /usr/ports/databases/unixODBC/Makefile	Sat Apr 12 22:38:56 2003
>+++ databases/unixODBC/Makefile	Tue Apr 22 05:31:47 2003
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	unixODBC
>-PORTVERSION=	2.2.4
>+PORTVERSION=	2.2.5
> CATEGORIES=	databases
> MASTER_SITES=	http://www.unixodbc.org/
> 
>diff -urN /usr/ports/databases/unixODBC/distinfo databases/unixODBC/distinfo
>--- /usr/ports/databases/unixODBC/distinfo	Sun Jan 26 10:15:31 2003
>+++ databases/unixODBC/distinfo	Tue Apr 22 05:47:53 2003
>@@ -1 +1 @@
>-MD5 (unixODBC-2.2.4.tar.gz) = 9377765695c2ff196c97de22d4fbfc1a
>+MD5 (unixODBC-2.2.5.tar.gz) = 3d65cc539bf406fb8a49749f600ce6e5
>diff -urN /usr/ports/databases/unixODBC/files/patch-DataManager::classISQL.h databases/unixODBC/files/patch-DataManager::classISQL.h
>--- /usr/ports/databases/unixODBC/files/patch-DataManager::classISQL.h	Sun Feb 16 07:14:58 2003
>+++ databases/unixODBC/files/patch-DataManager::classISQL.h	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- DataManager/classISQL.h.orig	Thu Dec 13 04:55:58 2001
>-+++ DataManager/classISQL.h	Sat Feb 15 03:22:44 2003
>-@@ -17,7 +17,7 @@
>- #include <qcombo.h>
>- #include <qslider.h>
>- #include <qtabbar.h>
>--#include <qmlined.h>
>-+#include <qtextedit.h>
>- #include <qfile.h>
>- #include <qfiledialog.h>
>- #include <qtextstream.h>
>diff -urN /usr/ports/databases/unixODBC/files/patch-ODBCConfig::Makefile.in databases/unixODBC/files/patch-ODBCConfig::Makefile.in
>--- /usr/ports/databases/unixODBC/files/patch-ODBCConfig::Makefile.in	Fri Jan  3 15:41:24 2003
>+++ databases/unixODBC/files/patch-ODBCConfig::Makefile.in	Tue Apr 22 08:04:08 2003
>@@ -1,11 +1,11 @@
>---- ODBCConfig/Makefile.in.orig	Fri Aug 23 21:15:14 2002
>-+++ ODBCConfig/Makefile.in	Tue Oct  1 06:47:26 2002
>-@@ -188,7 +188,7 @@
>+--- ODBCConfig/Makefile.in.orig	Thu Feb 27 02:42:19 2003
>++++ ODBCConfig/Makefile.in	Tue Apr 22 06:22:54 2003
>+@@ -176,7 +176,7 @@
>  
>  @QT_TRUE@bin_PROGRAMS = ODBCConfig
>  
>--@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
>-+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
>+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ \
>++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@ \
>+ @QT_TRUE@    -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
>  
>- @QT_TRUE@ODBCConfig_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../extras/libodbcextraslc.la 	../DriverManager/libodbc.la 
>  
>diff -urN /usr/ports/databases/unixODBC/files/patch-odbcinstQ::Makefile.in databases/unixODBC/files/patch-odbcinstQ::Makefile.in
>--- /usr/ports/databases/unixODBC/files/patch-odbcinstQ::Makefile.in	Fri Jan  3 15:41:24 2003
>+++ databases/unixODBC/files/patch-odbcinstQ::Makefile.in	Tue Apr 22 08:04:30 2003
>@@ -1,11 +1,11 @@
>---- odbcinstQ/Makefile.in.orig	Fri Aug 23 21:14:25 2002
>-+++ odbcinstQ/Makefile.in	Tue Oct  1 06:45:53 2002
>-@@ -191,7 +191,7 @@
>+--- odbcinstQ/Makefile.in.orig	Thu Feb 27 02:40:20 2003
>++++ odbcinstQ/Makefile.in	Tue Apr 22 06:21:33 2003
>+@@ -182,7 +182,7 @@
>  
>- @QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la
>+ @QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la 
>  
>--@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
>-+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
>+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ \
>++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@ \
>+ @QT_TRUE@    -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
>  
>- @QT_TRUE@libodbcinstQ_la_LIBADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../extras/libodbcextraslc.la 	../DriverManager/libodbc.la 
>  
>diff -urN /usr/ports/databases/unixODBC/files/patch-yac.y databases/unixODBC/files/patch-yac.y
>--- /usr/ports/databases/unixODBC/files/patch-yac.y	Wed Dec 11 02:34:48 2002
>+++ databases/unixODBC/files/patch-yac.y	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- sqp/yac.y.orig	Tue Dec 10 18:24:32 2002
>-+++ sqp/yac.y	Tue Dec 10 18:24:55 2002
>-@@ -214,7 +214,7 @@
>- y_escape:
>- 		/* optional */				{ $$ = NULL; }
>- 	|	ESCAPE STRING				{ $$ = $2;   }
>--
>-+	;
>- y_comparisons:
>- 		y_comparisons OR y_comparisons		{ $$ = sqpStoreCond( sqpor,   $1,   $3,   NULL ); }
>- 	|	y_comparisons AND y_comparisons		{ $$ = sqpStoreCond( sqpand,  $1,   $3,   NULL ); }
>diff -urN /usr/ports/databases/unixODBC/pkg-plist databases/unixODBC/pkg-plist
>--- /usr/ports/databases/unixODBC/pkg-plist	Tue Sep 10 20:07:34 2002
>+++ databases/unixODBC/pkg-plist	Tue Apr 22 06:18:25 2003
>@@ -112,7 +112,6 @@
> %%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
>@@ -134,8 +133,6 @@
> %%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/unixODBC.gif
> %%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 51361: 30532