Attachment #105849 for bug #146388

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




#

PORTNAME=	unixODBC
PORTVERSION=	2.3.0
PORTREVISION=	2
CATEGORIES=	databases
MASTER_SITES=	http://www.unixodbc.org/

MAINTAINER=	jupengfei@gmail.com
COMMENT=	ODBC library suite for Unix

CONFLICTS=	firebird-client-* libiodbc-[0-9]* virtuoso-*


PORTDOCS=	*

.if defined(WITH_GUI)
USE_QT_VER=	3
QT_NONSTANDARD=	yes
CONFIGURE_ENV=	MOC="${MOC}" \
		QTINC="${QT_PREFIX}/include" \
		QTLIB="${QT_PREFIX}/lib" \
		USER_INCLUDES="${QTCPPFLAGS}" \
		USER_LDFLAGS="${QTCFGLIBS}" \
		QTMAX=030400
CONFIGURE_ARGS+=--enable-gui
PLIST_SUB=	GUI:=""
.else
CONFIGURE_ARGS+=--disable-gui
PLIST_SUB=	GUI:="@comment "
.endif

post-patch:
	@${REINPLACE_CMD} 's,$$LIBS $$THREADLIB,$$LIBS,;s,$$CFLAGS -pthread,$$CFLAGS,' \
		${WRKSRC}/configure

Lines 1-3 Link Here

(-)unixODBC/distinfo (-3 / +3 lines)
1	MD5 (unixODBC-2.2.14.tar.gz) = f47c2efb28618ecf5f33319140a7acd0	1	MD5 (unixODBC-2.3.0.tar.gz) = f2ad22cbdffe836c58987ed2332c2e99
2	SHA256 (unixODBC-2.2.14.tar.gz) = fea02f2f687f55d4056728a602846fafd0e12d99110986633fb80e1bf0e94da5	2	SHA256 (unixODBC-2.3.0.tar.gz) = 15a7a855a2951a6af7137379bfcdccc15626b869c4804a1d1536cd37e9f3872c
3	SIZE (unixODBC-2.2.14.tar.gz) = 2189755	3	SIZE (unixODBC-2.3.0.tar.gz) = 1804749




--- Makefile.in.orig	Sun Jun 24 15:44:33 2007
+++ Makefile.in	Sun Jun 24 15:45:04 2007
@@ -876,8 +876,8 @@
 
 
 install-data-am:
-	-touch $(DESTDIR)${sysconfdir}/odbcinst.ini
-	-touch $(DESTDIR)${sysconfdir}/odbc.ini
+	-touch $(DESTDIR)${sysconfdir}/odbcinst.ini.sample
+	-touch $(DESTDIR)${sysconfdir}/odbc.ini.sample
 	-mkdir -p $(DESTDIR)${sysconfdir}/ODBCDataSources
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.




--- exe/odbc-config.c.orig	2008/05/20 13:43:47	1.7
+++ exe/odbc-config.c	2008/11/27 13:44:43	1.8
@@ -66,12 +66,12 @@
     printf( "#ifndef HAVE_LONG_LONG\n #define HAVE_LONG_LONG\n#endif\n" );
 #endif
 
-#ifdef ODBCINT64
-    printf( "#ifndef ODBCINT64\n #define ODBCINT64\n#endif\n" );
+#ifdef ODBCINT64_TYPE
+    printf( "#ifndef ODBCINT64\n #define ODBCINT64 %s\n#endif\n", ODBCINT64_TYPE );
 #endif
 
-#ifdef UODBCINT64
-    printf( "#ifndef UODBCINT64\n #define UODBCINT64\n#endif\n" );
+#ifdef UODBCINT64_TYPE
+    printf( "#ifndef UODBCINT64\n #define UODBCINT64 %s\n#endif\n", UODBCINT64_TYPE );
 #endif
 
 #ifdef DISABLE_INI_CACHING




--- include/sqltypes.h.orig	2008/10/31 16:22:18	1.26
+++ include/sqltypes.h	2008/11/27 13:44:43	1.27
@@ -49,7 +49,7 @@
  */
 
 #ifndef SIZEOF_LONG_INT
-#include <unixodbc_conf.h>
+#include "unixodbc_conf.h"
 #endif
 
 #ifndef SIZEOF_LONG_INT
@@ -371,10 +371,14 @@
 # if (SIZEOF_LONG_INT == 8)
 #   define ODBCINT64	    long
 #   define UODBCINT64	unsigned long
+#   define ODBCINT64_TYPE	    "long"
+#   define UODBCINT64_TYPE	"unsigned long"
 # else
 #  ifdef HAVE_LONG_LONG
 #   define ODBCINT64	    long long
 #   define UODBCINT64	unsigned long long
+#   define ODBCINT64_TYPE	    "long long"
+#   define UODBCINT64_TYPE	"unsigned long long"
 #  else
 /*
  * may fail in some cases, but what else can we do ?
@@ -391,6 +395,8 @@
 };
 #   define ODBCINT64	    struct __bigint_struct
 #   define UODBCINT64	struct __bigint_struct_u
+#   define ODBCINT64_TYPE	    "struct __bigint_struct"
+#   define UODBCINT64_TYPE	"struct __bigint_struct_u"
 #  endif
 # endif
 #endif

Lines 3-10 Link Here

(-)unixODBC/pkg-descr (-2 / +1 lines)
3	What is the unixODBC Project?	3	What is the unixODBC Project?
4		4
5	The unixODBC Project goals are to develop and promote unixODBC to be the	5	The unixODBC Project goals are to develop and promote unixODBC to be the
6	definitive standard for ODBC on the Linux platform. This is to include	6	definitive standard for ODBC on the Linux platform.
7	GUI support for KDE.
8		7
9	What is ODBC?	8	What is ODBC?
10		9




%%GUI:%%bin/DataManager
%%GUI:%%bin/DataManagerII
%%GUI:%%bin/ODBCConfig
bin/dltest
bin/isql
bin/dltest
bin/odbcinst
bin/iusql
bin/odbc_config
etc/odbcinst.ini
etc/odbc.ini
@unexec if cmp -s %D/etc/odbc.ini %D/etc/odbc.ini.sample; then  rm -f %D/etc/odbc.ini; fi
etc/odbc.ini.sample
@exec [ -f %D/etc/odbc.ini ] || cp %D/etc/odbc.ini.sample %D/etc/odbc.ini
@unexec if cmp -s %D/etc/odbcinst.ini %D/etc/odbcinst.ini.sample; then rm -f %D/etc/odbcinst.ini; fi
etc/odbcinst.ini.sample
@exec [ -f %D/etc/odbcinst.ini ] || cp %D/etc/odbcinst.ini.sample %D/etc/odbcinst.ini
include/autotest.h
include/odbcinst.h
include/odbcinstext.h
include/sql.h
include/sqlext.h
include/sqltypes.h
include/sqlucode.h
include/unixodbc_conf.h
include/uodbc_extras.h
include/uodbc_stats.h
include/uodbc_extras.h
include/unixodbc_conf.h
lib/libodbcinst.so.1
lib/libodbcinst.la
lib/libodbcinst.a
lib/libesoobS.la
lib/libesoobS.so
lib/libesoobS.so.1
lib/libgtrtst.a
lib/libgtrtst.la
lib/libgtrtst.so
lib/libgtrtst.so.1
lib/libmimerS.a
lib/libmimerS.la
lib/libmimerS.so
lib/libmimerS.so.1
lib/libnn.a
lib/libnn.la
lib/libnn.so
lib/libnn.so.1
lib/libodbc.a
lib/libodbc.la
lib/libodbc.so
lib/libodbc.so.1
lib/libodbc.la
lib/libodbc.a
lib/libodbccr.so
lib/libodbccr.so.1
lib/libodbccr.la
lib/libodbccr.a
lib/libodbcdrvcfg1S.so
lib/libodbcdrvcfg1S.so.1
lib/libodbcdrvcfg2S.a
lib/libodbcdrvcfg2S.la
lib/libodbcdrvcfg2S.so
lib/libodbcdrvcfg2S.so.1
lib/libodbcinst.a
lib/libodbcinst.la
lib/libodbcinst.so
lib/libodbcinst.so.1
%%GUI:%%lib/libodbcinstQ.a
%%GUI:%%lib/libodbcinstQ.la
%%GUI:%%lib/libodbcinstQ.so
%%GUI:%%lib/libodbcinstQ.so.1
lib/libodbcminiS.a
lib/libodbcminiS.la
lib/libodbcminiS.so
lib/libodbcminiS.so.1
lib/libodbcmyS.a
lib/libodbcmyS.la
lib/libodbcmyS.so
lib/libodbcmyS.so.1
lib/libodbcnnS.a
lib/libodbcnnS.la
lib/libodbcnnS.so
lib/libodbcnnS.so.1
lib/libodbcpsql.a
lib/libodbcpsql.la
lib/libodbcpsql.so
lib/libodbcpsql.so.1
lib/libodbcpsql.so.2
lib/libodbcpsqlS.a
lib/libodbcpsqlS.la
lib/libodbcpsqlS.so
lib/libodbcpsqlS.so.1
lib/libodbctxtS.a
lib/libodbctxtS.la
lib/libodbctxtS.so
lib/libodbctxtS.so.1
lib/liboplodbcS.a
lib/liboplodbcS.la
lib/liboplodbcS.so
lib/liboplodbcS.so.1
lib/liboraodbcS.a
lib/liboraodbcS.la
lib/liboraodbcS.so
lib/liboraodbcS.so.1
lib/libsapdbS.a
lib/libsapdbS.la
lib/libsapdbS.so
lib/libsapdbS.so.1
lib/libtdsS.a
lib/libtdsS.la
lib/libtdsS.so
lib/libtdsS.so.1
lib/libtemplate.a
lib/libtemplate.la
lib/libtemplate.so
lib/libtemplate.so.1
@exec mkdir -p %D/etc/ODBCDataSources 2>/dev/null || true
@dirrmtry etc/ODBCDataSources

Return to bug 146388

Lines 6-17 Link Here

(-)unixODBC/Makefile (-18 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= unixODBC	8	PORTNAME= unixODBC
9	PORTVERSION= 2.2.14	9	PORTVERSION= 2.3.0
10	PORTREVISION= 2	10	PORTREVISION= 2
11	CATEGORIES= databases	11	CATEGORIES= databases
12	MASTER_SITES= http://www.unixodbc.org/	12	MASTER_SITES= http://www.unixodbc.org/
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= jupengfei@gmail.com
15	COMMENT= ODBC library suite for Unix	15	COMMENT= ODBC library suite for Unix
16		16
17	CONFLICTS= firebird-client-* libiodbc-[0-9]* virtuoso-*	17	CONFLICTS= firebird-client-* libiodbc-[0-9]* virtuoso-*
Lines 24-45 Link Here
24		24
25	PORTDOCS= *	25	PORTDOCS= *
26		26
27	.if defined(WITH_GUI)
28	USE_QT_VER= 3
29	QT_NONSTANDARD= yes
30	CONFIGURE_ENV= MOC="${MOC}" \
31	QTINC="${QT_PREFIX}/include" \
32	QTLIB="${QT_PREFIX}/lib" \
33	USER_INCLUDES="${QTCPPFLAGS}" \
34	USER_LDFLAGS="${QTCFGLIBS}" \
35	QTMAX=030400
36	CONFIGURE_ARGS+=--enable-gui
37	PLIST_SUB= GUI:=""
38	.else
39	CONFIGURE_ARGS+=--disable-gui
40	PLIST_SUB= GUI:="@comment "
41	.endif
42
43	post-patch:	27	post-patch:
44	@${REINPLACE_CMD} 's,$$LIBS $$THREADLIB,$$LIBS,;s,$$CFLAGS -pthread,$$CFLAGS,' \	28	@${REINPLACE_CMD} 's,$$LIBS $$THREADLIB,$$LIBS,;s,$$CFLAGS -pthread,$$CFLAGS,' \
45	${WRKSRC}/configure	29	${WRKSRC}/configure

Lines 1-13 Link Here

(-)unixODBC/files/patch-Makefile.in (-13 lines)
1	--- Makefile.in.orig Sun Jun 24 15:44:33 2007
2	+++ Makefile.in Sun Jun 24 15:45:04 2007
3	@@ -876,8 +876,8 @@
4
5
6	install-data-am:
7	- -touch $(DESTDIR)${sysconfdir}/odbcinst.ini
8	- -touch $(DESTDIR)${sysconfdir}/odbc.ini
9	+ -touch $(DESTDIR)${sysconfdir}/odbcinst.ini.sample
10	+ -touch $(DESTDIR)${sysconfdir}/odbc.ini.sample
11	-mkdir -p $(DESTDIR)${sysconfdir}/ODBCDataSources
12	# Tell versions [3.59,3.63) of GNU make to not export all variables.
13	# Otherwise a system limit (for SysV at least) may be exceeded.

Lines 1-19 Link Here

(-)unixODBC/files/patch-exe-odbc-config.c (-19 lines)
1	--- exe/odbc-config.c.orig 2008/05/20 13:43:47 1.7
2	+++ exe/odbc-config.c 2008/11/27 13:44:43 1.8
3	@@ -66,12 +66,12 @@
4	printf( "#ifndef HAVE_LONG_LONG\n #define HAVE_LONG_LONG\n#endif\n" );
5	#endif
6
7	-#ifdef ODBCINT64
8	- printf( "#ifndef ODBCINT64\n #define ODBCINT64\n#endif\n" );
9	+#ifdef ODBCINT64_TYPE
10	+ printf( "#ifndef ODBCINT64\n #define ODBCINT64 %s\n#endif\n", ODBCINT64_TYPE );
11	#endif
12
13	-#ifdef UODBCINT64
14	- printf( "#ifndef UODBCINT64\n #define UODBCINT64\n#endif\n" );
15	+#ifdef UODBCINT64_TYPE
16	+ printf( "#ifndef UODBCINT64\n #define UODBCINT64 %s\n#endif\n", UODBCINT64_TYPE );
17	#endif
18
19	#ifdef DISABLE_INI_CACHING

Lines 1-35 Link Here

(-)unixODBC/files/patch-include-sqltypes.h (-35 lines)
1	--- include/sqltypes.h.orig 2008/10/31 16:22:18 1.26
2	+++ include/sqltypes.h 2008/11/27 13:44:43 1.27
3	@@ -49,7 +49,7 @@
4	*/
5
6	#ifndef SIZEOF_LONG_INT
7	-#include <unixodbc_conf.h>
8	+#include "unixodbc_conf.h"
9	#endif
10
11	#ifndef SIZEOF_LONG_INT
12	@@ -371,10 +371,14 @@
13	# if (SIZEOF_LONG_INT == 8)
14	# define ODBCINT64 long
15	# define UODBCINT64 unsigned long
16	+# define ODBCINT64_TYPE "long"
17	+# define UODBCINT64_TYPE "unsigned long"
18	# else
19	# ifdef HAVE_LONG_LONG
20	# define ODBCINT64 long long
21	# define UODBCINT64 unsigned long long
22	+# define ODBCINT64_TYPE "long long"
23	+# define UODBCINT64_TYPE "unsigned long long"
24	# else
25	/*
26	* may fail in some cases, but what else can we do ?
27	@@ -391,6 +395,8 @@
28	};
29	# define ODBCINT64 struct __bigint_struct
30	# define UODBCINT64 struct __bigint_struct_u
31	+# define ODBCINT64_TYPE "struct __bigint_struct"
32	+# define UODBCINT64_TYPE "struct __bigint_struct_u"
33	# endif
34	# endif
35	#endif

Lines 1-116 Link Here

(-)unixODBC/pkg-plist (-104 / +13 lines)
1	%%GUI:%%bin/DataManager
2	%%GUI:%%bin/DataManagerII
3	%%GUI:%%bin/ODBCConfig
4	bin/dltest
5	bin/isql	1	bin/isql
		2	bin/dltest
		3	bin/odbcinst
6	bin/iusql	4	bin/iusql
7	bin/odbc_config	5	bin/odbc_config
8	bin/odbcinst	6	etc/odbcinst.ini
9	%%GUI:%%bin/odbctest	7	etc/odbc.ini
10	@unexec if cmp -s %D/etc/odbc.ini %D/etc/odbc.ini.sample; then rm -f %D/etc/odbc.ini; fi
11	etc/odbc.ini.sample
12	@exec [ -f %D/etc/odbc.ini ] \|\| cp %D/etc/odbc.ini.sample %D/etc/odbc.ini
13	@unexec if cmp -s %D/etc/odbcinst.ini %D/etc/odbcinst.ini.sample; then rm -f %D/etc/odbcinst.ini; fi
14	etc/odbcinst.ini.sample
15	@exec [ -f %D/etc/odbcinst.ini ] \|\| cp %D/etc/odbcinst.ini.sample %D/etc/odbcinst.ini
16	include/autotest.h
17	include/odbcinst.h	8	include/odbcinst.h
18	include/odbcinstext.h	9	include/odbcinstext.h
19	include/sql.h	10	include/sql.h
20	include/sqlext.h	11	include/sqlext.h
21	include/sqltypes.h	12	include/sqltypes.h
22	include/sqlucode.h	13	include/sqlucode.h
23	include/unixodbc_conf.h
24	include/uodbc_extras.h
25	include/uodbc_stats.h	14	include/uodbc_stats.h
26	lib/libboundparam.a	15	include/uodbc_extras.h
27	lib/libboundparam.la	16	include/unixodbc_conf.h
28	lib/libboundparam.so	17	lib/libodbcinst.so.1
29	lib/libboundparam.so.1	18	lib/libodbcinst.la
30	lib/libesoobS.a	19	lib/libodbcinst.a
31	lib/libesoobS.la
32	lib/libesoobS.so
33	lib/libesoobS.so.1
34	lib/libgtrtst.a
35	lib/libgtrtst.la
36	lib/libgtrtst.so
37	lib/libgtrtst.so.1
38	lib/libmimerS.a
39	lib/libmimerS.la
40	lib/libmimerS.so
41	lib/libmimerS.so.1
42	lib/libnn.a
43	lib/libnn.la
44	lib/libnn.so
45	lib/libnn.so.1
46	lib/libodbc.a
47	lib/libodbc.la
48	lib/libodbc.so
49	lib/libodbc.so.1	20	lib/libodbc.so.1
50	lib/libodbccr.a	21	lib/libodbc.la
51	lib/libodbccr.la	22	lib/libodbc.a
52	lib/libodbccr.so
53	lib/libodbccr.so.1	23	lib/libodbccr.so.1
54	lib/libodbcdrvcfg1S.a	24	lib/libodbccr.la
55	lib/libodbcdrvcfg1S.la	25	lib/libodbccr.a
56	lib/libodbcdrvcfg1S.so
57	lib/libodbcdrvcfg1S.so.1
58	lib/libodbcdrvcfg2S.a
59	lib/libodbcdrvcfg2S.la
60	lib/libodbcdrvcfg2S.so
61	lib/libodbcdrvcfg2S.so.1
62	lib/libodbcinst.a
63	lib/libodbcinst.la
64	lib/libodbcinst.so
65	lib/libodbcinst.so.1
66	%%GUI:%%lib/libodbcinstQ.a
67	%%GUI:%%lib/libodbcinstQ.la
68	%%GUI:%%lib/libodbcinstQ.so
69	%%GUI:%%lib/libodbcinstQ.so.1
70	lib/libodbcminiS.a
71	lib/libodbcminiS.la
72	lib/libodbcminiS.so
73	lib/libodbcminiS.so.1
74	lib/libodbcmyS.a
75	lib/libodbcmyS.la
76	lib/libodbcmyS.so
77	lib/libodbcmyS.so.1
78	lib/libodbcnnS.a
79	lib/libodbcnnS.la
80	lib/libodbcnnS.so
81	lib/libodbcnnS.so.1
82	lib/libodbcpsql.a
83	lib/libodbcpsql.la
84	lib/libodbcpsql.so
85	lib/libodbcpsql.so.1
86	lib/libodbcpsql.so.2
87	lib/libodbcpsqlS.a
88	lib/libodbcpsqlS.la
89	lib/libodbcpsqlS.so
90	lib/libodbcpsqlS.so.1
91	lib/libodbctxtS.a
92	lib/libodbctxtS.la
93	lib/libodbctxtS.so
94	lib/libodbctxtS.so.1
95	lib/liboplodbcS.a
96	lib/liboplodbcS.la
97	lib/liboplodbcS.so
98	lib/liboplodbcS.so.1
99	lib/liboraodbcS.a
100	lib/liboraodbcS.la
101	lib/liboraodbcS.so
102	lib/liboraodbcS.so.1
103	lib/libsapdbS.a
104	lib/libsapdbS.la
105	lib/libsapdbS.so
106	lib/libsapdbS.so.1
107	lib/libtdsS.a
108	lib/libtdsS.la
109	lib/libtdsS.so
110	lib/libtdsS.so.1
111	lib/libtemplate.a
112	lib/libtemplate.la
113	lib/libtemplate.so
114	lib/libtemplate.so.1
115	@exec mkdir -p %D/etc/ODBCDataSources 2>/dev/null \|\| true
116	@dirrmtry etc/ODBCDataSources