Attachment 105851 Details for Bug 146388 – newpatch.txt

newpatch.txt

newpatch.txt (text/plain; charset=US-ASCII), 8.33 KB, created by Ju Pengfei on 2010-05-11 15:29:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ju Pengfei

Created: 2010-05-11 15:29:12 UTC

Size: 8.33 KB

patch

obsolete

>diff -ruN unixODBC.bak/Makefile unixODBC/Makefile
>--- unixODBC.bak/Makefile	2010-05-11 22:24:46.000000000 +0800
>+++ unixODBC/Makefile	2010-05-11 22:23:45.000000000 +0800
>@@ -6,12 +6,11 @@
> #
> 
> PORTNAME=	unixODBC
>-PORTVERSION=	2.2.14
>-PORTREVISION=	2
>+PORTVERSION=	2.3.0
> CATEGORIES=	databases
> MASTER_SITES=	http://www.unixodbc.org/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	jupengfei@gmail.com
> COMMENT=	ODBC library suite for Unix
> 
> CONFLICTS=	firebird-client-* libiodbc-[0-9]* virtuoso-*
>@@ -24,22 +23,6 @@
> 
> 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
>@@ -57,10 +40,5 @@
> 	${FIND} ${DOCSDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
> .endif
> .endif
>-.for conffile in odbc.ini odbcinst.ini
>-	@if [ ! -f ${PREFIX}/etc/${conffile} ]; then \
>-		${CP} -p ${PREFIX}/etc/${conffile}.sample ${PREFIX}/etc/${conffile} ; \
>-	fi
>-.endfor
> 
> .include <bsd.port.mk>
>diff -ruN unixODBC.bak/distinfo unixODBC/distinfo
>--- unixODBC.bak/distinfo	2010-05-11 22:24:46.000000000 +0800
>+++ unixODBC/distinfo	2010-05-11 11:17:51.000000000 +0800
>@@ -1,3 +1,3 @@
>-MD5 (unixODBC-2.2.14.tar.gz) = f47c2efb28618ecf5f33319140a7acd0
>-SHA256 (unixODBC-2.2.14.tar.gz) = fea02f2f687f55d4056728a602846fafd0e12d99110986633fb80e1bf0e94da5
>-SIZE (unixODBC-2.2.14.tar.gz) = 2189755
>+MD5 (unixODBC-2.3.0.tar.gz) = f2ad22cbdffe836c58987ed2332c2e99
>+SHA256 (unixODBC-2.3.0.tar.gz) = 15a7a855a2951a6af7137379bfcdccc15626b869c4804a1d1536cd37e9f3872c
>+SIZE (unixODBC-2.3.0.tar.gz) = 1804749
>diff -ruN unixODBC.bak/files/patch-Makefile.in unixODBC/files/patch-Makefile.in
>--- unixODBC.bak/files/patch-Makefile.in	2010-05-11 22:24:46.000000000 +0800
>+++ unixODBC/files/patch-Makefile.in	1970-01-01 08:00:00.000000000 +0800
>@@ -1,13 +0,0 @@
>---- 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.
>diff -ruN unixODBC.bak/files/patch-exe-odbc-config.c unixODBC/files/patch-exe-odbc-config.c
>--- unixODBC.bak/files/patch-exe-odbc-config.c	2010-05-11 22:24:46.000000000 +0800
>+++ unixODBC/files/patch-exe-odbc-config.c	1970-01-01 08:00:00.000000000 +0800
>@@ -1,19 +0,0 @@
>---- 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
>diff -ruN unixODBC.bak/files/patch-include-sqltypes.h unixODBC/files/patch-include-sqltypes.h
>--- unixODBC.bak/files/patch-include-sqltypes.h	2010-05-11 22:24:46.000000000 +0800
>+++ unixODBC/files/patch-include-sqltypes.h	1970-01-01 08:00:00.000000000 +0800
>@@ -1,35 +0,0 @@
>---- 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
>diff -ruN unixODBC.bak/pkg-descr unixODBC/pkg-descr
>--- unixODBC.bak/pkg-descr	2010-05-11 22:24:46.000000000 +0800
>+++ unixODBC/pkg-descr	2010-05-11 11:17:51.000000000 +0800
>@@ -3,8 +3,7 @@
> What is the unixODBC Project? 
> 
> The unixODBC Project goals are to develop and promote unixODBC to be the
>-definitive standard for ODBC on the Linux platform. This is to include
>-GUI support for KDE. 
>+definitive standard for ODBC on the Linux platform.
> 
> What is ODBC? 
> 
>diff -ruN unixODBC.bak/pkg-plist unixODBC/pkg-plist
>--- unixODBC.bak/pkg-plist	2010-05-11 22:24:46.000000000 +0800
>+++ unixODBC/pkg-plist	2010-05-11 22:12:34.000000000 +0800
>@@ -1,116 +1,26 @@
>-%%GUI:%%bin/DataManager
>-%%GUI:%%bin/DataManagerII
>-%%GUI:%%bin/ODBCConfig
>-bin/dltest
> bin/isql
>+bin/dltest
>+bin/odbcinst
> bin/iusql
> bin/odbc_config
>-bin/odbcinst
>-%%GUI:%%bin/odbctest
>-@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
>-lib/libboundparam.a
>-lib/libboundparam.la
>-lib/libboundparam.so
>-lib/libboundparam.so.1
>-lib/libesoobS.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
>+include/uodbc_extras.h
>+include/unixodbc_conf.h
>+lib/libodbcinst.so.1
>+lib/libodbcinst.la
>+lib/libodbcinst.a
> lib/libodbc.so.1
>-lib/libodbccr.a
>-lib/libodbccr.la
>-lib/libodbccr.so
>+lib/libodbc.la
>+lib/libodbc.a
> lib/libodbccr.so.1
>-lib/libodbcdrvcfg1S.a
>-lib/libodbcdrvcfg1S.la
>-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
>+lib/libodbccr.la
>+lib/libodbccr.a
>+@unexec test -s %D/etc/odbc.ini || rm -f %D/etc/odbc.ini
>+@unexec test -s %D/etc/odbcinst.ini || rm -f %D/etc/odbcinst.ini
> @dirrmtry etc/ODBCDataSources

Actions: View

Attachments on bug 146388: 105849 | 105850 | 105851