Import of pkgsrc-2013Q2

databases/py-PgSQL/patches/patch-aa

@@ -0,0 +1,48 @@
+$NetBSD: patch-aa,v 1.2 2004/08/05 22:20:11 recht Exp $
+
+--- libpqmodule.c.orig	2004-08-03 20:20:48.000000000 +0200
++++ libpqmodule.c	2004-08-03 20:20:56.000000000 +0200
+@@ -364,7 +364,6 @@
+     }
+ 
+     sout[j++] = (forArray ? '"' : '\'');
+-    sout[j] = (char)0;
+ 
+     result = Py_BuildValue("s#", sout, j);
+     PyMem_Free(sout);
+@@ -411,8 +410,6 @@
+ 	}
+     }
+ 
+-    sout[j] = (char)0;
+-
+     result = Py_BuildValue("s#", sout, j);
+     PyMem_Free(sout);
+ 
+@@ -791,7 +788,7 @@
+         return PgInt8_FromString(s, (char **)NULL, 10);
+     }
+ 
+-    PyErr_SetString(PyExc_TypeError, "a string or numeric is requireed");
++    PyErr_SetString(PyExc_TypeError, "a string or numeric is required");
+     return (PyObject *)NULL;
+ }
+ #endif
+@@ -855,7 +852,7 @@
+         return PgInt2_FromString(s, (char **)NULL, 10);
+     }
+ 
+-    PyErr_SetString(PyExc_TypeError, "a string or numeric is requireed");
++    PyErr_SetString(PyExc_TypeError, "a string or numeric is required");
+     return (PyObject *)NULL;
+ }
+ 
+@@ -907,7 +904,7 @@
+         return libPQbool_FromString(self, args);
+     }
+ 
+-    PyErr_SetString(PyExc_TypeError, "a string or numeric is requireed");
++    PyErr_SetString(PyExc_TypeError, "a string or numeric is required");
+     return (PyObject *)NULL;
+ }
+ 

databases/py-PgSQL/patches/patch-ab

@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2004/01/17 13:16:06 recht Exp $
+
+--- setup.py.orig	2004-01-17 14:10:14.000000000 +0100
++++ setup.py	2004-01-17 14:11:27.000000000 +0100
+@@ -82,7 +82,7 @@
+ 
+ def main():
+     # Set this to 1 if you need to use your own settings
+-    USE_CUSTOM = 0
++    USE_CUSTOM = 1
+ 
+     # Default settings, may be overriden for specific platforms
+     pypgsql_rt_dirs = None
+@@ -98,8 +98,9 @@
+ 	"port/strtok.c"]
+ 
+     if USE_CUSTOM:
+-	include_dirs = YOUR_LIST_HERE
+-	library_dirs = YOUR_LIST_HERE
++	LOCALBASE = os.environ.get('LOCALBASE', '/usr/pkg')
++	include_dirs = ['%s/include/pgsql' % LOCALBASE]
++	library_dirs = ['%s/lib' % LOCALBASE]
+     elif sys.platform == "linux2":
+ 	include_dirs = ["/usr/include", "/usr/include/postgresql",
+ 	    "/usr/include/pgsql"]