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

(-)databases/unixODBC/Makefile (-4 / +3 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	unixODBC
8
PORTNAME=	unixODBC
9
PORTVERSION=	2.2.9
9
PORTVERSION=	2.2.10
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 16-24 Link Here
16
15
17
CONFLICTS=	libiodbc-*
16
CONFLICTS=	libiodbc-*
18
17
19
USE_GNOME=	gnomehack gnometarget lthack
18
USE_GNOME=	gnomehack gnometarget
20
USE_ICONV=	yes
19
USE_ICONV=	yes
21
USE_INC_LIBTOOL_VER=	13
20
USE_LIBTOOL_VER=	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
INSTALLS_SHLIB=	yes
23
INSTALLS_SHLIB=	yes
(-)databases/unixODBC/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (unixODBC-2.2.9.tar.gz) = 94f904febc43e8ae7e17c719908afa8e
1
MD5 (unixODBC-2.2.10.tar.gz) = a2e9d440c70e12c22d2548aa452c43ef
2
SIZE (unixODBC-2.2.9.tar.gz) = 2361066
2
SIZE (unixODBC-2.2.10.tar.gz) = 2405528
(-)databases/unixODBC/files/patch-DataManager::Makefile.in (-7 / +7 lines)
Lines 1-11 Link Here
1
--- DataManager/Makefile.in.orig	Fri Aug 23 21:15:16 2002
1
--- DataManager/Makefile.in.orig	Tue Sep 28 17:48:15 2004
2
+++ DataManager/Makefile.in	Tue Oct  1 06:48:32 2002
2
+++ DataManager/Makefile.in	Sun Oct 31 02:04:31 2004
3
@@ -188,7 +188,7 @@
3
@@ -200,7 +200,7 @@
4
 
4
 
5
 @QT_TRUE@bin_PROGRAMS = DataManager
5
 @QT_TRUE@bin_PROGRAMS = DataManager
6
 
6
 
7
-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
7
-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@
8
+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@
8
+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@
9
 
10
 @QT_TRUE@DataManager_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 
11
 
9
 
10
 @QT_TRUE@DataManager_LDADD = @X_LDFLAGS@ \
11
 @QT_TRUE@	@QT_LDFLAGS@ \
(-)databases/unixODBC/files/patch-DataManagerII::Makefile.in (-7 / +7 lines)
Lines 1-11 Link Here
1
--- DataManagerII/Makefile.in.orig	Fri Aug 23 21:15:18 2002
1
--- DataManagerII/Makefile.in.orig	Sun Oct 31 02:06:57 2004
2
+++ DataManagerII/Makefile.in	Tue Oct  1 06:49:39 2002
2
+++ DataManagerII/Makefile.in	Sun Oct 31 02:06:57 2004
3
@@ -188,7 +188,7 @@
3
@@ -200,7 +200,7 @@
4
 
4
 
5
 @QT_TRUE@bin_PROGRAMS = DataManagerII
5
 @QT_TRUE@bin_PROGRAMS = DataManagerII
6
 
6
 
7
-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
7
-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@
8
+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@
8
+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@
9
 
10
 @QT_TRUE@DataManagerII_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 
11
 
9
 
10
 @QT_TRUE@DataManagerII_LDADD = @X_LDFLAGS@ \
11
 @QT_TRUE@	@QT_LDFLAGS@ \
(-)databases/unixODBC/files/patch-Drivers-MiniSQL-Makefile.in (-5 / +14 lines)
Lines 1-13 Link Here
1
--- Drivers/MiniSQL/Makefile.in.orig	Tue Jun  1 03:53:12 2004
1
--- Drivers/MiniSQL/Makefile.in.orig	Tue Sep 28 17:48:19 2004
2
+++ Drivers/MiniSQL/Makefile.in	Tue Jun  1 03:54:45 2004
2
+++ Drivers/MiniSQL/Makefile.in	Sun Oct 31 02:09:32 2004
3
@@ -173,13 +173,13 @@
3
@@ -197,13 +197,13 @@
4
 target_alias = @target_alias@
4
 qt_libraries = @qt_libraries@
5
 x_includes = @x_includes@
5
 x_includes = @x_includes@
6
 x_libraries = @x_libraries@
6
 x_libraries = @x_libraries@
7
-@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
7
-@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
8
+#@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
8
+#@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
9
 
9
 
10
 @MSQL_TRUE@INCLUDES = -I../../include -I. -I@msql_headers@ -I${INCLTDL}
10
 @MSQL_TRUE@INCLUDES = -I@top_srcdir@/include -I. -I@msql_headers@ -I${INCLTDL}
11
 
11
 
12
 
12
 
13
 # PAH - Redundant?
13
 # PAH - Redundant?
Lines 16-18 Link Here
16
 @MSQL_TRUE@libodbcmini_la_SOURCES = \
16
 @MSQL_TRUE@libodbcmini_la_SOURCES = \
17
 @MSQL_TRUE@	SQLAllocConnect.c \
17
 @MSQL_TRUE@	SQLAllocConnect.c \
18
 @MSQL_TRUE@	SQLAllocEnv.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@
(-)databases/unixODBC/files/patch-ODBCConfig::Makefile.in (-5 / +5 lines)
Lines 1-11 Link Here
1
--- ODBCConfig/Makefile.in.orig	Thu Feb 27 02:42:19 2003
1
--- ODBCConfig/Makefile.in.orig	Tue Sep 28 17:48:25 2004
2
+++ ODBCConfig/Makefile.in	Tue Apr 22 06:22:54 2003
2
+++ ODBCConfig/Makefile.in	Sun Oct 31 02:09:58 2004
3
@@ -176,7 +176,7 @@
3
@@ -200,7 +200,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@ \
7
-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ \
8
+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_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)
9
 @QT_TRUE@    -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
10
 
10
 
11
 
11
 
(-)databases/unixODBC/files/patch-odbcinstQ::Makefile.in (-5 / +5 lines)
Lines 1-11 Link Here
1
--- odbcinstQ/Makefile.in.orig	Thu Feb 27 02:40:20 2003
1
--- odbcinstQ/Makefile.in.orig	Tue Sep 28 17:48:35 2004
2
+++ odbcinstQ/Makefile.in	Tue Apr 22 06:21:33 2003
2
+++ odbcinstQ/Makefile.in	Sun Oct 31 02:10:20 2004
3
@@ -182,7 +182,7 @@
3
@@ -206,7 +206,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@ \
7
-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ \
8
+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_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)
9
 @QT_TRUE@    -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
10
 
10
 
11
 
11
 
(-)databases/unixODBC/files/patch-odbctest::Makefile.in (-7 / +7 lines)
Lines 1-11 Link Here
1
--- odbctest/Makefile.in.orig	Fri Aug 23 21:15:20 2002
1
--- odbctest/Makefile.in.orig	Tue Sep 28 17:48:35 2004
2
+++ odbctest/Makefile.in	Tue Oct  1 06:50:44 2002
2
+++ odbctest/Makefile.in	Sun Oct 31 02:10:44 2004
3
@@ -188,7 +188,7 @@
3
@@ -200,7 +200,7 @@
4
 
4
 
5
 @QT_TRUE@bin_PROGRAMS = odbctest
5
 @QT_TRUE@bin_PROGRAMS = odbctest
6
 
6
 
7
-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
7
-@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
8
+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_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@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 	$(LIBLTDL) $(LIBADD_DL)
11
 
9
 
10
 @QT_TRUE@odbctest_LDADD = @X_LDFLAGS@ \
11
 @QT_TRUE@	@QT_LDFLAGS@ \
(-)databases/unixODBC/pkg-plist (-19 lines)
Lines 17-47 Link Here
17
include/sqltypes.h
17
include/sqltypes.h
18
include/sqlucode.h
18
include/sqlucode.h
19
include/uodbc_stats.h
19
include/uodbc_stats.h
20
lib/libboundparam.a
21
lib/libboundparam.so
20
lib/libboundparam.so
22
lib/libboundparam.so.1
21
lib/libboundparam.so.1
23
lib/libesoobS.a
24
lib/libesoobS.so
22
lib/libesoobS.so
25
lib/libesoobS.so.1
23
lib/libesoobS.so.1
26
lib/libgtrtst.a
24
lib/libgtrtst.a
27
lib/libgtrtst.so
25
lib/libgtrtst.so
28
lib/libgtrtst.so.1
26
lib/libgtrtst.so.1
29
lib/libmimerS.a
30
lib/libmimerS.so
27
lib/libmimerS.so
31
lib/libmimerS.so.1
28
lib/libmimerS.so.1
32
lib/libnn.a
33
lib/libnn.so
29
lib/libnn.so
34
lib/libnn.so.1
30
lib/libnn.so.1
35
lib/libodbc.a
31
lib/libodbc.a
36
lib/libodbc.so
32
lib/libodbc.so
37
lib/libodbc.so.1
33
lib/libodbc.so.1
38
lib/libodbccr.a
39
lib/libodbccr.so
34
lib/libodbccr.so
40
lib/libodbccr.so.1
35
lib/libodbccr.so.1
41
lib/libodbcdrvcfg1S.a
42
lib/libodbcdrvcfg1S.so
36
lib/libodbcdrvcfg1S.so
43
lib/libodbcdrvcfg1S.so.1
37
lib/libodbcdrvcfg1S.so.1
44
lib/libodbcdrvcfg2S.a
45
lib/libodbcdrvcfg2S.so
38
lib/libodbcdrvcfg2S.so
46
lib/libodbcdrvcfg2S.so.1
39
lib/libodbcdrvcfg2S.so.1
47
lib/libodbcextras.a
40
lib/libodbcextras.a
Lines 50-90 Link Here
50
lib/libodbcinst.a
43
lib/libodbcinst.a
51
lib/libodbcinst.so
44
lib/libodbcinst.so
52
lib/libodbcinst.so.1
45
lib/libodbcinst.so.1
53
%%GUI:%%lib/libodbcinstQ.a
54
%%GUI:%%lib/libodbcinstQ.so
46
%%GUI:%%lib/libodbcinstQ.so
55
%%GUI:%%lib/libodbcinstQ.so.1
47
%%GUI:%%lib/libodbcinstQ.so.1
56
lib/libodbcminiS.a
57
lib/libodbcminiS.so
48
lib/libodbcminiS.so
58
lib/libodbcminiS.so.1
49
lib/libodbcminiS.so.1
59
lib/libodbcmyS.a
60
lib/libodbcmyS.so
50
lib/libodbcmyS.so
61
lib/libodbcmyS.so.1
51
lib/libodbcmyS.so.1
62
lib/libodbcnnS.a
63
lib/libodbcnnS.so
52
lib/libodbcnnS.so
64
lib/libodbcnnS.so.1
53
lib/libodbcnnS.so.1
65
lib/libodbcpsql.a
66
lib/libodbcpsql.so
54
lib/libodbcpsql.so
67
lib/libodbcpsql.so.1
55
lib/libodbcpsql.so.1
68
lib/libodbcpsql.so.2
56
lib/libodbcpsql.so.2
69
lib/libodbcpsqlS.a
70
lib/libodbcpsqlS.so
57
lib/libodbcpsqlS.so
71
lib/libodbcpsqlS.so.1
58
lib/libodbcpsqlS.so.1
72
lib/libodbctxt.a
73
lib/libodbctxt.so
59
lib/libodbctxt.so
74
lib/libodbctxt.so.1
60
lib/libodbctxt.so.1
75
lib/libodbctxtS.a
76
lib/libodbctxtS.so
61
lib/libodbctxtS.so
77
lib/libodbctxtS.so.1
62
lib/libodbctxtS.so.1
78
lib/liboplodbcS.a
79
lib/liboplodbcS.so
63
lib/liboplodbcS.so
80
lib/liboplodbcS.so.1
64
lib/liboplodbcS.so.1
81
lib/liboraodbcS.a
82
lib/liboraodbcS.so
65
lib/liboraodbcS.so
83
lib/liboraodbcS.so.1
66
lib/liboraodbcS.so.1
84
lib/libsapdbS.a
85
lib/libsapdbS.so
67
lib/libsapdbS.so
86
lib/libsapdbS.so.1
68
lib/libsapdbS.so.1
87
lib/libtdsS.a
88
lib/libtdsS.so
69
lib/libtdsS.so
89
lib/libtdsS.so.1
70
lib/libtdsS.so.1
90
lib/libtemplate.a
71
lib/libtemplate.a

Return to bug 73347