Attachment #130346 for bug #174242

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




#

PORTNAME=	pyodbc
PORTVERSION=	3.0.6
PORTREVISION=	2
CATEGORIES=	databases python
MASTER_SITES=	GOOGLE_CODE
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py build)

do-install:
	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
	@(cd ${WRKSRC}; ${SETENV} PYTHONPATH=${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} setup.py install --prefix=${PREFIX})
DOCSDIR=		${PREFIX}/share/doc/py-odbc

DOCS=			docs.html index.html license.html styles.css tutorial.html

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for f in ${DOCS}
	@${INSTALL_DATA} ${WRKSRC}/web/${f} ${DOCSDIR}
.endfor
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)py-odbc/distinfo (-2 / +2 lines)
1	SHA256 (pyodbc-2.1.5.zip) = 0e47fbe829e2295ea43c00ddcb268c274dc37a8a5a7963fb6f64080203278793	1	SHA256 (pyodbc-3.0.6.zip) = e5a7f12deddf4b258bed904b5a071dd43c40c78de8e24c9228f8174e69f5366d
2	SIZE (pyodbc-2.1.5.zip) = 147862	2	SIZE (pyodbc-3.0.6.zip) = 85518




--- setup.py.orig	2012-06-24 17:49:34.000000000 -0600
+++ setup.py	2012-12-06 11:47:02.121782861 -0600
@@ -156,6 +156,15 @@
         # What is the proper way to detect iODBC, MyODBC, unixODBC, etc.?
         settings['libraries'].append('odbc')
 
+        if sys.platform.startswith('freebsd'):
+            settings['library_dirs'] = ['/usr/local/lib/']
+            settings['include_dirs'] = ['/usr/local/include/']
+            freebsd_prefix = '/usr/local'
+            if 'PREFIX' in os.environ:
+                freebsd_prefix = os.environ['PREFIX']
+            if 'PYTHONPREFIX_SITELIBDIR' in os.environ:
+                sys.path.append('/'.join(freebsd_prefix, os.environ['PYTHONPREFIX_SITELIBDIR']))
+
     return settings
 
+        extra_compile_args = ['-Wno-write-strings', include, lib]
+        extra_link_args = [ lib ]
 
         # What is the proper way to detect iODBC, MyODBC, unixODBC, etc.?
         libraries.append('odbc')



Line 0 Link Here

(-)py-odbc/files/patch-src_pyodbc.h (+12 lines)
	1	--- src/pyodbc.h.orig 2012-01-13 13:10:48.000000000 -0600
	2	+++ src/pyodbc.h 2012-12-06 10:21:36.527165345 -0600
	3	@@ -76,7 +76,9 @@
	4	#include <stdarg.h>
	5
	6	#if defined(__SUNPRO_CC) \|\| defined(__SUNPRO_C) \|\| (defined(__GNUC__) && !defined(__MINGW32__))
	7	+#ifndef __FreeBSD__
	8	#include <alloca.h>
	9	+#endif
	10	#define CDECL cdecl
	11	#define min(X,Y) ((X) < (Y) ? (X) : (Y))
	12	#define max(X,Y) ((X) > (Y) ? (X) : (Y))

Lines 1-7 Link Here

(-)py-odbc/pkg-plist (-7 / +3 lines)
1	%%PYTHON_SITELIBDIR%%/pyodbc.so	1	%%PYTHON_SITELIBDIR%%/pyodbc-3.0.6-py2.7-freebsd-8.1-RELEASE-amd64.egg
2	%%PORTDOCS%%%%DOCSDIR%%/docs.html	2	@dirrm lib/python2.7/site-packages
3	%%PORTDOCS%%%%DOCSDIR%%/index.html	3	@dirrm lib/python2.7
4	%%PORTDOCS%%%%DOCSDIR%%/license.html
5	%%PORTDOCS%%%%DOCSDIR%%/styles.css
6	%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
7	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 174242

Lines 18-25 Link Here

(-)py-odbc/Makefile (-15 / +3 lines)
18	#	18	#
19		19
20	PORTNAME= pyodbc	20	PORTNAME= pyodbc
21	PORTVERSION= 2.1.5	21	PORTVERSION= 3.0.6
22	PORTREVISION= 2
23	CATEGORIES= databases python	22	CATEGORIES= databases python
24	MASTER_SITES= GOOGLE_CODE	23	MASTER_SITES= GOOGLE_CODE
25	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	24	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 50-67 Link Here
50	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py build)	49	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py build)
51		50
52	do-install:	51	do-install:
53	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py install)	52	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
54		53	@(cd ${WRKSRC}; ${SETENV} PYTHONPATH=${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} setup.py install --prefix=${PREFIX})
55	DOCSDIR= ${PREFIX}/share/doc/py-odbc
56
57	DOCS= docs.html index.html license.html styles.css tutorial.html
58
59	post-install:
60	.if !defined(NOPORTDOCS)
61	@${MKDIR} ${DOCSDIR}
62	.for f in ${DOCS}
63	@${INSTALL_DATA} ${WRKSRC}/web/${f} ${DOCSDIR}
64	.endfor
65	.endif
66		54
67	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Lines 1-22 Link Here

(-)py-odbc/files/patch-setup-libs (-19 / +15 lines)
1	--- setup.py.orig 2009-04-15 14:10:36.000000000 -0600	1	--- setup.py.orig 2012-06-24 17:49:34.000000000 -0600
2	+++ setup.py 2009-06-24 09:15:04.203757061 -0600	2	+++ setup.py 2012-12-06 11:47:02.121782861 -0600
3	@@ -54,8 +54,16 @@	3	@@ -156,6 +156,15 @@
4	else:	4	# What is the proper way to detect iODBC, MyODBC, unixODBC, etc.?
5	# Other posix-like: Linux, Solaris, etc.	5	settings['libraries'].append('odbc')
6		6
7	+ try:	7	+ if sys.platform.startswith('freebsd'):
8	+ include = '-I'+os.environ['PREFIX']+'/include'	8	+ settings['library_dirs'] = ['/usr/local/lib/']
9	+ lib = '-L'+os.environ['PREFIX']+'/lib'	9	+ settings['include_dirs'] = ['/usr/local/include/']
10	+ except:	10	+ freebsd_prefix = '/usr/local'
11	+ include = '-I/usr/local/include'	11	+ if 'PREFIX' in os.environ:
12	+ lib = '-L/usr/local/lib'	12	+ freebsd_prefix = os.environ['PREFIX']
		13	+ if 'PYTHONPREFIX_SITELIBDIR' in os.environ:
		14	+ sys.path.append('/'.join(freebsd_prefix, os.environ['PYTHONPREFIX_SITELIBDIR']))
13	+	15	+
14	# Python functions take a lot of 'char ' that really should be const. gcc complains about this a lot*	16	return settings
15	- extra_compile_args = ['-Wno-write-strings']	17
16	+ extra_compile_args = ['-Wno-write-strings', include, lib]
17	+ extra_link_args = [ lib ]
18		18
19	# What is the proper way to detect iODBC, MyODBC, unixODBC, etc.?
20	libraries.append('odbc')
21
22