Attachment #72226 for bug #105029

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

Lines 6-13 Link Here

(-)databases/unixODBC/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= unixODBC	8	PORTNAME= unixODBC
9	PORTVERSION= 2.2.11	9	PORTVERSION= 2.2.12
10	PORTREVISION= 1
11	CATEGORIES= databases	10	CATEGORIES= databases
12	MASTER_SITES= http://www.unixodbc.org/	11	MASTER_SITES= http://www.unixodbc.org/
13		12
Lines 18-24 Link Here
18		17
19	USE_GNOME= gnomehack gnometarget	18	USE_GNOME= gnomehack gnometarget
20	USE_ICONV= yes	19	USE_ICONV= yes
21	GNU_CONFIGURE= yes	20	USE_AUTOTOOLS= libtool:15
22	CONFIGURE_ARGS= --enable-static --enable-shared \	21	CONFIGURE_ARGS= --enable-static --enable-shared \
23	--with-libiconv-prefix=${LOCALBASE}	22	--with-libiconv-prefix=${LOCALBASE}
24	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes

Lines 1-3 Link Here

(-)databases/unixODBC/distinfo (-3 / +3 lines)
1	MD5 (unixODBC-2.2.11.tar.gz) = 9ae806396844e38244cf65ad26ba0f23	1	MD5 (unixODBC-2.2.12.tar.gz) = 9a116aad4059c31d231b626ffdf1869a
2	SHA256 (unixODBC-2.2.11.tar.gz) = 7990bc1652c083ccd2b7915a14e4a3bb1901c5bf988be20001dfcb3dfb58ed88	2	SHA256 (unixODBC-2.2.12.tar.gz) = d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40
3	SIZE (unixODBC-2.2.11.tar.gz) = 2406740	3	SIZE (unixODBC-2.2.12.tar.gz) = 2798077

Lines 1-11 Link Here

(-)databases/unixODBC/files/patch-DataManager::Makefile.in (-11 lines)
1	--- DataManager/Makefile.in.orig Tue Sep 28 17:48:15 2004
2	+++ DataManager/Makefile.in Sun Oct 31 02:04:31 2004
3	@@ -200,7 +200,7 @@
4
5	@QT_TRUE@bin_PROGRAMS = DataManager
6
7	-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@
8	+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@
9
10	@QT_TRUE@DataManager_LDADD = @X_LDFLAGS@ \
11	@QT_TRUE@ @QT_LDFLAGS@ \

Lines 1-11 Link Here

(-)databases/unixODBC/files/patch-DataManagerII::Makefile.in (-11 lines)
1	--- DataManagerII/Makefile.in.orig Sun Oct 31 02:06:57 2004
2	+++ DataManagerII/Makefile.in Sun Oct 31 02:06:57 2004
3	@@ -200,7 +200,7 @@
4
5	@QT_TRUE@bin_PROGRAMS = DataManagerII
6
7	-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@
8	+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@
9
10	@QT_TRUE@DataManagerII_LDADD = @X_LDFLAGS@ \
11	@QT_TRUE@ @QT_LDFLAGS@ \




--- Drivers/MiniSQL/Makefile.in.orig	Tue Sep 28 17:48:19 2004
+++ Drivers/MiniSQL/Makefile.in	Sun Oct 31 02:09:32 2004
@@ -197,13 +197,13 @@
 qt_libraries = @qt_libraries@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
-@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
+#@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
 
 @MSQL_TRUE@INCLUDES = -I@top_srcdir@/include -I. -I@msql_headers@ -I${INCLTDL}
 
 
 # PAH - Redundant?
-# DEFS = -DUNIXODBC @DEFS@ -DDRIVER_NAME=\"odbcminisql\"
+DEFS = -DUNIXODBC @DEFS@ -DDRIVER_NAME=\"odbcminisql\"
 @MSQL_TRUE@libodbcmini_la_SOURCES = \
 @MSQL_TRUE@	SQLAllocConnect.c \
 @MSQL_TRUE@	SQLAllocEnv.c \
@@ -439,7 +439,7 @@
 @MSQL_TRUE@	sqlFreeConnect.lo sqlFreeEnv.lo sqlFreeStmt.lo
 libodbcmini_la_OBJECTS = $(am_libodbcmini_la_OBJECTS)
 
-DEFS = @DEFS@
+#DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@

Lines 1-11 Link Here

(-)databases/unixODBC/files/patch-ODBCConfig::Makefile.in (-11 lines)
1	--- ODBCConfig/Makefile.in.orig Tue Sep 28 17:48:25 2004
2	+++ ODBCConfig/Makefile.in Sun Oct 31 02:09:58 2004
3	@@ -200,7 +200,7 @@
4
5	@QT_TRUE@bin_PROGRAMS = ODBCConfig
6
7	-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ \
8	+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ \
9	@QT_TRUE@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
10
11

Lines 1-11 Link Here

(-)databases/unixODBC/files/patch-odbcinstQ::Makefile.in (-11 lines)
1	--- odbcinstQ/Makefile.in.orig Tue Sep 28 17:48:35 2004
2	+++ odbcinstQ/Makefile.in Sun Oct 31 02:10:20 2004
3	@@ -206,7 +206,7 @@
4
5	@QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la
6
7	-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ \
8	+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ \
9	@QT_TRUE@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
10
11

Lines 1-11 Link Here

(-)databases/unixODBC/files/patch-odbctest::Makefile.in (-11 lines)
1	--- odbctest/Makefile.in.orig Tue Sep 28 17:48:35 2004
2	+++ odbctest/Makefile.in Sun Oct 31 02:10:44 2004
3	@@ -200,7 +200,7 @@
4
5	@QT_TRUE@bin_PROGRAMS = odbctest
6
7	-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
8	+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@ @QT_INCLUDES@ @USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
9
10	@QT_TRUE@odbctest_LDADD = @X_LDFLAGS@ \
11	@QT_TRUE@ @QT_LDFLAGS@ \

Lines 16-21 Link Here

(-)databases/unixODBC/pkg-plist (+1 lines)
16	include/sqlext.h	16	include/sqlext.h
17	include/sqltypes.h	17	include/sqltypes.h
18	include/sqlucode.h	18	include/sqlucode.h
		19	include/uodbc_extras.h
19	include/uodbc_stats.h	20	include/uodbc_stats.h
20	lib/libboundparam.a	21	lib/libboundparam.a
21	lib/libboundparam.la	22	lib/libboundparam.la

Return to bug 105029

Lines 1-27 Link Here

(-)databases/unixODBC/files/patch-Drivers-MiniSQL-Makefile.in (-27 lines)
1	--- Drivers/MiniSQL/Makefile.in.orig Tue Sep 28 17:48:19 2004
2	+++ Drivers/MiniSQL/Makefile.in Sun Oct 31 02:09:32 2004
3	@@ -197,13 +197,13 @@
4	qt_libraries = @qt_libraries@
5	x_includes = @x_includes@
6	x_libraries = @x_libraries@
7	-@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
8	+#@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
9
10	@MSQL_TRUE@INCLUDES = -I@top_srcdir@/include -I. -I@msql_headers@ -I${INCLTDL}
11
12
13	# PAH - Redundant?
14	-# DEFS = -DUNIXODBC @DEFS@ -DDRIVER_NAME=\"odbcminisql\"
15	+DEFS = -DUNIXODBC @DEFS@ -DDRIVER_NAME=\"odbcminisql\"
16	@MSQL_TRUE@libodbcmini_la_SOURCES = \
17	@MSQL_TRUE@ SQLAllocConnect.c \
18	@MSQL_TRUE@ SQLAllocEnv.c \
19	@@ -439,7 +439,7 @@
20	@MSQL_TRUE@ sqlFreeConnect.lo sqlFreeEnv.lo sqlFreeStmt.lo
21	libodbcmini_la_OBJECTS = $(am_libodbcmini_la_OBJECTS)
22
23	-DEFS = @DEFS@
24	+#DEFS = @DEFS@
25	DEFAULT_INCLUDES = -I. -I$(srcdir)
26	CPPFLAGS = @CPPFLAGS@
27	LDFLAGS = @LDFLAGS@