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

(-)libdbi-drivers/Makefile (-41 / +5 lines)
Lines 2-16 Link Here
2
# $FreeBSD: databases/libdbi-drivers/Makefile 317214 2013-05-03 15:12:02Z bapt $
2
# $FreeBSD: databases/libdbi-drivers/Makefile 317214 2013-05-03 15:12:02Z bapt $
3
3
4
PORTNAME=	libdbi-drivers
4
PORTNAME=	libdbi-drivers
5
DISTVERSION=	0.8.3-1
5
DISTVERSION=	0.9.0
6
PORTREVISION=	5
6
PORTREVISION=	6
7
CATEGORIES=	databases devel
7
CATEGORIES=	databases devel
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.8.3-1
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.9.0
9
9
10
MAINTAINER=	delphij@FreeBSD.org
10
MAINTAINER=	delphij@FreeBSD.org
11
COMMENT=	Drivers for libdbi
11
COMMENT=	Drivers for libdbi
12
12
13
LIB_DEPENDS=	dbi.1:${PORTSDIR}/databases/libdbi
13
LIB_DEPENDS=	dbi.2:${PORTSDIR}/databases/libdbi
14
14
15
USE_GNOME=	lthack
15
USE_GNOME=	lthack
16
USE_AUTOTOOLS=	libtool
16
USE_AUTOTOOLS=	libtool
Lines 19-28 Link Here
19
DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
19
DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
20
20
21
OPTIONS_MULTI=	DRIVER
21
OPTIONS_MULTI=	DRIVER
22
OPTIONS_MULTI_DRIVER=	MYSQL MSQL PGSQL SQLITE2 SQLITE3 FIREBIRD FREETDS
22
OPTIONS_MULTI_DRIVER=	MYSQL PGSQL SQLITE3
23
23
24
OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE3
24
OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE3
25
SQLITE2_DESC=	SQLite 2 Database
26
25
27
.if defined(.PARSEDIR)
26
.if defined(.PARSEDIR)
28
USE_GMAKE=	yes
27
USE_GMAKE=	yes
Lines 38-51 Link Here
38
PLIST_SUB+=	MYSQL="@comment "
37
PLIST_SUB+=	MYSQL="@comment "
39
.endif
38
.endif
40
39
41
.if ${PORT_OPTIONS:MMSQL}
42
LIB_DEPENDS+=	msql.1:${PORTSDIR}/databases/msql
43
CONFIGURE_ARGS+=	--with-msql
44
PLIST_SUB+=	MSQL=""
45
.else
46
PLIST_SUB+=	MSQL="@comment "
47
.endif
48
49
.if ${PORT_OPTIONS:MPGSQL}
40
.if ${PORT_OPTIONS:MPGSQL}
50
USE_PGSQL=	yes
41
USE_PGSQL=	yes
51
CONFIGURE_ARGS+=	--with-pgsql
42
CONFIGURE_ARGS+=	--with-pgsql
Lines 54-67 Link Here
54
PLIST_SUB+=	PGSQL="@comment "
45
PLIST_SUB+=	PGSQL="@comment "
55
.endif
46
.endif
56
47
57
.if ${PORT_OPTIONS:MSQLITE2}
58
LIB_DEPENDS+=	sqlite.2:${PORTSDIR}/databases/sqlite2
59
CONFIGURE_ARGS+=	--with-sqlite
60
PLIST_SUB+=	SQLITE2=""
61
.else
62
PLIST_SUB+=	SQLITE2="@comment "
63
.endif
64
65
.if ${PORT_OPTIONS:MSQLITE3}
48
.if ${PORT_OPTIONS:MSQLITE3}
66
LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
49
LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
67
CONFIGURE_ARGS+=	--with-sqlite3
50
CONFIGURE_ARGS+=	--with-sqlite3
Lines 70-94 Link Here
70
PLIST_SUB+=	SQLITE3="@comment "
53
PLIST_SUB+=	SQLITE3="@comment "
71
.endif
54
.endif
72
55
73
.if ${PORT_OPTIONS:MFIREBIRD}
74
LIB_DEPENDS+=	gds.2:${PORTSDIR}/databases/firebird20-client
75
CONFIGURE_ARGS+=	--with-firebird
76
PLIST_SUB+=	FIREBIRD=""
77
.else
78
PLIST_SUB+=	FIREBIRD="@comment "
79
.endif
80
81
.if ${PORT_OPTIONS:MFREETDS}
82
LIB_DEPENDS+=	tds.5:${PORTSDIR}/databases/freetds
83
CONFIGURE_ARGS+=	--with-freetds
84
PLIST_SUB+=	FREETDS=""
85
.else
86
PLIST_SUB+=	FREETDS="@comment "
87
.endif
88
89
PLIST_SUB+=	INGRES="@comment "
90
PLIST_SUB+=	ORACLE="@comment "
91
92
post-patch:
56
post-patch:
93
	@${REINPLACE_CMD} -e 's|-O20|${CFLAGS}|g' \
57
	@${REINPLACE_CMD} -e 's|-O20|${CFLAGS}|g' \
94
		-e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
58
		-e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
(-)libdbi-drivers/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (libdbi-drivers-0.8.3-1.tar.gz) = 4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72
1
SHA256 (libdbi-drivers-0.9.0.tar.gz) = 43d2eacd573a4faff296fa925dd97fbf2aedbf1ae35c6263478210c61004c854
2
SIZE (libdbi-drivers-0.8.3-1.tar.gz) = 1534420
2
SIZE (libdbi-drivers-0.9.0.tar.gz) = 1829864
(-)libdbi-drivers/files/patch-drivers__freetds__dbd_freetds.c (-66 lines)
Lines 1-66 Link Here
1
--- ./drivers/freetds/dbd_freetds.c.orig	2007-12-31 14:10:44.000000000 -0800
2
+++ ./drivers/freetds/dbd_freetds.c	2009-07-20 01:30:00.373376559 -0700
3
@@ -454,6 +454,7 @@
4
 {
5
     dbi_result_t *res;
6
     char *sql_cmd;
7
+    char *current_db = NULL;
8
 
9
     if (db == NULL || db[0] == '\0') {
10
 	/* Use current database */
11
@@ -461,7 +462,6 @@
12
 	return res;
13
     }
14
 
15
-    char *current_db = NULL;
16
     if (conn->current_db)
17
 	/* Reserved current DB name */
18
 	current_db = strdup(conn->current_db);
19
@@ -509,9 +509,9 @@
20
 {
21
     /* foo's -> 'foo''s' */
22
     size_t len;
23
+    const char *escaped = "\'";
24
 
25
     strcpy(dest, "\'");
26
-    const char *escaped = "\'";
27
 
28
     len = _dbd_freetds_escape_chars(dest + 1, orig, strlen(orig), escaped);
29
 
30
@@ -560,6 +560,8 @@
31
      * everything else will be filled in by DBI */
32
 
33
     unsigned int idx = 0;
34
+    unsigned short type = 0;
35
+    unsigned int attribs = 0;
36
     dbi_result_t *result = NULL;
37
     dbi_row_t *row = NULL;
38
     FREETDSCON *tdscon = (FREETDSCON *) conn->connection;
39
@@ -629,9 +631,6 @@
40
 		    return NULL;
41
 		}
42
 
43
-		unsigned short type = 0;
44
-		unsigned int attribs = 0;
45
-
46
 		_translate_freetds_type(datafmt[idx], &type, &attribs);
47
 		/* Fill fields value in result */
48
 		_dbd_result_add_field(result, idx, datafmt[idx]->name, type, attribs);
49
@@ -885,6 +884,7 @@
50
     dbi_row_t *row = NULL;
51
     unsigned int idx = 0;
52
     void *addr = NULL;
53
+    char **orig;
54
 
55
     FREETDSCON *tdscon = (FREETDSCON *) conn->connection;
56
 
57
@@ -912,8 +912,7 @@
58
 		    dstfmt.format = CS_FMT_UNUSED;
59
 
60
 		    addr = malloc(sizeof(CS_NUMERIC_TYPE));
61
-		    char **orig =
62
-			&(result->rows[result->numrows_matched]->field_values[idx].d_string);
63
+		    orig = &(result->rows[result->numrows_matched]->field_values[idx].d_string);
64
 
65
 		    if (cs_convert(tdscon->ctx, datafmt[idx], *orig, &dstfmt, addr, NULL) !=
66
 			CS_SUCCEED) {
(-)libdbi-drivers/files/patch-drivers__pgsql__dbd_pgsql.c (-10 lines)
Lines 1-10 Link Here
1
--- ./drivers/pgsql/dbd_pgsql.c.orig	2008-01-26 09:39:50.000000000 -0800
2
+++ ./drivers/pgsql/dbd_pgsql.c	2009-07-20 01:30:00.376376795 -0700
3
@@ -75,6 +75,7 @@
4
   "EUC_JP", "EUC-JP",
5
   "EUC_KR", "EUC-KR",
6
   "UNICODE", "UTF-8",
7
+  "UTF8", "UTF-8",
8
   "LATIN1", "ISO-8859-1",
9
   "LATIN2", "ISO-8859-2",
10
   "LATIN3", "ISO-8859-3",
(-)libdbi-drivers/pkg-plist (-76 / +4 lines)
Lines 4-42 Link Here
4
%%PGSQL%%lib/dbd/libdbdpgsql.a
4
%%PGSQL%%lib/dbd/libdbdpgsql.a
5
%%PGSQL%%lib/dbd/libdbdpgsql.la
5
%%PGSQL%%lib/dbd/libdbdpgsql.la
6
%%PGSQL%%lib/dbd/libdbdpgsql.so
6
%%PGSQL%%lib/dbd/libdbdpgsql.so
7
%%SQLITE2%%lib/dbd/libdbdsqlite.a
8
%%SQLITE2%%lib/dbd/libdbdsqlite.la
9
%%SQLITE2%%lib/dbd/libdbdsqlite.so
10
%%SQLITE3%%lib/dbd/libdbdsqlite3.a
7
%%SQLITE3%%lib/dbd/libdbdsqlite3.a
11
%%SQLITE3%%lib/dbd/libdbdsqlite3.la
8
%%SQLITE3%%lib/dbd/libdbdsqlite3.la
12
%%SQLITE3%%lib/dbd/libdbdsqlite3.so
9
%%SQLITE3%%lib/dbd/libdbdsqlite3.so
13
%%FIREBIRD%%lib/dbd/libdbdfirebird.a
14
%%FIREBIRD%%lib/dbd/libdbdfirebird.la
15
%%FIREBIRD%%lib/dbd/libdbdfirebird.so
16
%%FREETDS%%lib/dbd/libdbdfreetds.a
17
%%FREETDS%%lib/dbd/libdbdfreetds.la
18
%%FREETDS%%lib/dbd/libdbdfreetds.so
19
@dirrmtry lib/dbd
10
@dirrmtry lib/dbd
20
%%FIREBIRD%%%%DOCSDIR%%/dbd_firebird.pdf
21
%%INGRES%%%%DOCSDIR%%/dbd_ingres/copying-fdl.html
22
%%INGRES%%%%DOCSDIR%%/dbd_ingres/f25.html
23
%%INGRES%%%%DOCSDIR%%/dbd_ingres/index.html
24
%%INGRES%%%%DOCSDIR%%/dbd_ingres/install-build.html
25
%%INGRES%%%%DOCSDIR%%/dbd_ingres/install-prereq.html
26
%%INGRES%%%%DOCSDIR%%/dbd_ingres/install.html
27
%%INGRES%%%%DOCSDIR%%/dbd_ingres/intro.html
28
%%INGRES%%%%DOCSDIR%%/dbd_ingres/options.html
29
%%INGRES%%%%DOCSDIR%%/dbd_ingres/specific.html
30
%%INGRES%%%%DOCSDIR%%/dbd_ingres/specific.html
31
%%INGRES%%%%DOCSDIR%%/dbd_ingres.pdf
32
%%MSQL%%%%DOCSDIR%%/dbd_msql/c26.html
33
%%MSQL%%%%DOCSDIR%%/dbd_msql/c30.html
34
%%MSQL%%%%DOCSDIR%%/dbd_msql/c81.html
35
%%MSQL%%%%DOCSDIR%%/dbd_msql/f15.html
36
%%MSQL%%%%DOCSDIR%%/dbd_msql/index.html
37
%%MSQL%%%%DOCSDIR%%/dbd_msql/x33.html
38
%%MSQL%%%%DOCSDIR%%/dbd_msql/x47.html
39
%%MSQL%%%%DOCSDIR%%/dbd_msql.pdf
40
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c168.html
11
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c168.html
41
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c173.html
12
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c173.html
42
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c35.html
13
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c35.html
Lines 56-70 Link Here
56
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x56.html
27
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x56.html
57
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x61.html
28
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x61.html
58
%%MYSQL%%%%DOCSDIR%%/dbd_mysql.pdf
29
%%MYSQL%%%%DOCSDIR%%/dbd_mysql.pdf
59
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c26.html
60
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c29.html
61
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c38.html
62
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/c41.html
63
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/f15.html
64
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/index.html
65
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/x32.html
66
%%ORACLE%%%%DOCSDIR%%/dbd_oracle/x35.html
67
%%ORACLE%%%%DOCSDIR%%/dbd_oracle.pdf
68
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/copying-fdl.html
30
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/copying-fdl.html
69
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/f30.html
31
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/f30.html
70
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/index.html
32
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/index.html
Lines 75-127 Link Here
75
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/options.html
37
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/options.html
76
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/specific.html
38
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/specific.html
77
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql.pdf
39
%%PGSQL%%%%DOCSDIR%%/dbd_pgsql.pdf
78
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c100.html
79
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c118.html
80
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c126.html
81
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c26.html
82
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c34.html
83
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c37.html
84
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c45.html
85
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/c92.html
86
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/copying-fdl.html
87
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/f15.html
88
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/f23.html
89
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/index.html
90
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x121.html
91
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x129.html
92
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x197.html
93
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x205.html
94
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x40.html
95
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x48.html
96
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x54.html
97
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite/x62.html
98
%%SQLITE2%%%%DOCSDIR%%/dbd_sqlite.pdf
99
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c102.html
100
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c120.html
101
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c128.html
102
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c26.html
103
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c34.html
40
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c34.html
104
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c39.html
105
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c47.html
41
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c47.html
106
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c94.html
42
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c98.html
43
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c134.html
107
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/copying-fdl.html
44
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/copying-fdl.html
108
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/f15.html
109
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/f23.html
45
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/f23.html
110
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/index.html
46
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/index.html
111
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x123.html
112
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x131.html
113
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x195.html
114
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x203.html
115
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x42.html
116
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x50.html
47
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x50.html
117
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x56.html
118
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x64.html
48
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x64.html
49
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x137.html
50
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x209.html
119
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3.pdf
51
%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3.pdf
120
%%INGRES%%@dirrm %%DOCSDIR%%/dbd_ingres
121
%%MSQL%%@dirrm %%DOCSDIR%%/dbd_msql
122
%%MYSQL%%@dirrm %%DOCSDIR%%/dbd_mysql
52
%%MYSQL%%@dirrm %%DOCSDIR%%/dbd_mysql
123
%%ORACLE%%@dirrm %%DOCSDIR%%/dbd_oracle
124
%%PGSQL%%@dirrm %%DOCSDIR%%/dbd_pgsql
53
%%PGSQL%%@dirrm %%DOCSDIR%%/dbd_pgsql
125
%%SQLITE2%%@dirrm %%DOCSDIR%%/dbd_sqlite
126
%%SQLITE3%%@dirrm %%DOCSDIR%%/dbd_sqlite3
54
%%SQLITE3%%@dirrm %%DOCSDIR%%/dbd_sqlite3
127
@dirrm %%DOCSDIR%%
55
@dirrm %%DOCSDIR%%

Return to bug 178780