Attachment #30532 for bug #51361

View | Details | Raw Unified | Return to bug 51361
Collapse All | Expand All

Lines 6-12 Link Here

(-)databases/unixODBC/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= unixODBC	8	PORTNAME= unixODBC
9	PORTVERSION= 2.2.4	9	PORTVERSION= 2.2.5
10	CATEGORIES= databases	10	CATEGORIES= databases
11	MASTER_SITES= http://www.unixodbc.org/	11	MASTER_SITES= http://www.unixodbc.org/
12		12

Line 1 Link Here

(-)databases/unixODBC/distinfo (-1 / +1 lines)
1	MD5 (unixODBC-2.2.4.tar.gz) = 9377765695c2ff196c97de22d4fbfc1a	1	MD5 (unixODBC-2.2.5.tar.gz) = 3d65cc539bf406fb8a49749f600ce6e5

Lines 1-11 Link Here

(-)databases/unixODBC/files/patch-DataManager::classISQL.h (-11 lines)
1	--- DataManager/classISQL.h.orig Thu Dec 13 04:55:58 2001
2	+++ DataManager/classISQL.h Sat Feb 15 03:22:44 2003
3	@@ -17,7 +17,7 @@
4	#include <qcombo.h>
5	#include <qslider.h>
6	#include <qtabbar.h>
7	-#include <qmlined.h>
8	+#include <qtextedit.h>
9	#include <qfile.h>
10	#include <qfiledialog.h>
11	#include <qtextstream.h>




--- 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@ \
+@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 
 




--- 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@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 
 

Lines 1-11 Link Here

(-)databases/unixODBC/files/patch-yac.y (-11 lines)
1	--- sqp/yac.y.orig Tue Dec 10 18:24:32 2002
2	+++ sqp/yac.y Tue Dec 10 18:24:55 2002
3	@@ -214,7 +214,7 @@
4	y_escape:
5	/* optional */ { $$ = NULL; }
6	\| ESCAPE STRING { $$ = $2; }
7	-
8	+ ;
9	y_comparisons:
10	y_comparisons OR y_comparisons { $$ = sqpStoreCond( sqpor, $1, $3, NULL ); }
11	\| y_comparisons AND y_comparisons { $$ = sqpStoreCond( sqpand, $1, $3, NULL ); }

Return to bug 51361

Lines 1-11 Link Here

(-)databases/unixODBC/files/patch-ODBCConfig::Makefile.in (-6 / +6 lines)
1	--- ODBCConfig/Makefile.in.orig Fri Aug 23 21:15:14 2002	1	--- ODBCConfig/Makefile.in.orig Thu Feb 27 02:42:19 2003
2	+++ ODBCConfig/Makefile.in Tue Oct 1 06:47:26 2002	2	+++ ODBCConfig/Makefile.in Tue Apr 22 06:22:54 2003
3	@@ -188,7 +188,7 @@	3	@@ -176,7 +176,7 @@
4		4
5	@QT_TRUE@bin_PROGRAMS = ODBCConfig	5	@QT_TRUE@bin_PROGRAMS = ODBCConfig
6		6
7	-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)	7	-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ \
8	+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)	8	+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ \
		9	@QT_TRUE@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
9		10
10	@QT_TRUE@ODBCConfig_LDADD = @X_LDFLAGS@ @QT_LDFLAGS@ @USER_LDFLAGS@ @LIB_QT@ ../odbcinst/libodbcinst.la ../extras/libodbcextraslc.la ../DriverManager/libodbc.la
11		11

Lines 1-11 Link Here

(-)databases/unixODBC/files/patch-odbcinstQ::Makefile.in (-7 / +7 lines)
1	--- odbcinstQ/Makefile.in.orig Fri Aug 23 21:14:25 2002	1	--- odbcinstQ/Makefile.in.orig Thu Feb 27 02:40:20 2003
2	+++ odbcinstQ/Makefile.in Tue Oct 1 06:45:53 2002	2	+++ odbcinstQ/Makefile.in Tue Apr 22 06:21:33 2003
3	@@ -191,7 +191,7 @@	3	@@ -182,7 +182,7 @@
4		4
5	@QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la	5	@QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la
6		6
7	-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)	7	-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ \
8	+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)	8	+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ \
		9	@QT_TRUE@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
9		10
10	@QT_TRUE@libodbcinstQ_la_LIBADD = @X_LDFLAGS@ @QT_LDFLAGS@ @USER_LDFLAGS@ @LIB_QT@ ../odbcinst/libodbcinst.la ../extras/libodbcextraslc.la ../DriverManager/libodbc.la
11		11

Lines 112-118 Link Here

(-)databases/unixODBC/pkg-plist (-3 lines)
112	%%PORTDOCS%%share/doc/unixODBC/UserManual/StarOfficeDataGrid.gif	112	%%PORTDOCS%%share/doc/unixODBC/UserManual/StarOfficeDataGrid.gif
113	%%PORTDOCS%%share/doc/unixODBC/UserManual/index.html	113	%%PORTDOCS%%share/doc/unixODBC/UserManual/index.html
114	%%PORTDOCS%%share/doc/unixODBC/UserManual/unixODBC.gif	114	%%PORTDOCS%%share/doc/unixODBC/UserManual/unixODBC.gif
115	%%PORTDOCS%%share/doc/unixODBC/index.html
116	%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.gif	115	%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.gif
117	%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.html	116	%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.html
118	%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.vsd	117	%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.vsd
Lines 134-141 Link Here
134	%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure9.html	133	%%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure9.html
135	%%PORTDOCS%%share/doc/unixODBC/lst/back.gif	134	%%PORTDOCS%%share/doc/unixODBC/lst/back.gif
136	%%PORTDOCS%%share/doc/unixODBC/lst/next.gif	135	%%PORTDOCS%%share/doc/unixODBC/lst/next.gif
137	%%PORTDOCS%%share/doc/unixODBC/smallbook.gif
138	%%PORTDOCS%%share/doc/unixODBC/unixODBC.gif
139	%%PORTDOCS%%@dirrm share/doc/unixODBC/lst	136	%%PORTDOCS%%@dirrm share/doc/unixODBC/lst
140	%%PORTDOCS%%@dirrm share/doc/unixODBC/UserManual	137	%%PORTDOCS%%@dirrm share/doc/unixODBC/UserManual
141	%%PORTDOCS%%@dirrm share/doc/unixODBC/ProgrammerManual/Tutorial	138	%%PORTDOCS%%@dirrm share/doc/unixODBC/ProgrammerManual/Tutorial