summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2002-01-19 16:13:00 +0000
committerdrochner <drochner@pkgsrc.org>2002-01-19 16:13:00 +0000
commit7833915345119edfd38966043ebd10205ac62a55 (patch)
tree3e11e636329a403e1cb644468cada9347f4ee768 /databases
parent29955baed09e78f50ffdc5572afc39b214f6ef82 (diff)
downloadpkgsrc-7833915345119edfd38966043ebd10205ac62a55.tar.gz
use buildlink files for Python and mxDareTime,
install docs into version dependant subdir to avoid conflicts
Diffstat (limited to 'databases')
-rw-r--r--databases/py-postgresql/Makefile26
-rw-r--r--databases/py-postgresql/PLIST16
2 files changed, 17 insertions, 25 deletions
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index 1b5b146c7d7..b795d0a569d 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,39 +1,29 @@
-# $NetBSD: Makefile,v 1.17 2002/01/15 18:33:26 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2002/01/19 16:13:00 drochner Exp $
.include "../../databases/postgresql/Makefile.common"
.include "../../databases/postgresql/Makefile.ssl"
-PKGNAME= py-postgresql-3.2
+PKGNAME= ${PYPKGPREFIX}-postgresql-3.2
COMMENT= Python interface to PostgreSQL
MAINTAINER= darcy@netbsd.org
-DEPENDS+= python>=2.0:../../lang/python
-DEPENDS+= py20-mxDateTime-[0-9]*:../../time/py-mxDateTime
-
USE_BUILDLINK_ONLY= # defined
BUILDLINK_DEPENDS.postgresql-lib= postgresql-lib>=${PG_BASE_VERS}
-PYTHON= ${LOCALBASE}/bin/python
-
-.if exists(${PYTHON})
-.if !defined(PYTHON_VERSION)
-PYTHON_VERSION!= ${PYTHON} -c "import sys; print sys.version[:3]"
-MAKEFLAGS+= PYTHON_VERSION="${PYTHON_VERSION}"
-.endif
-.endif
+MAKEFLAGS+= PYTHON_VERSION="${PYVERSSUFFIX}"
-PYTHON_LIBDIR= lib/python${PYTHON_VERSION}
-PLIST_SUBST+= PYTHON_LIBDIR=${PYTHON_LIBDIR}
+PLIST_SUBST+= PYTHON_LIBDIR=${PYLIB}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
MAKE_ENV+= INSTALLED_LIBPQ=1
CONFIGURE_ARGS+= --with-python
CONFIGURE_ARGS+= --with-python-compile
-CONFIGURE_ENV+= PYTHON="${PYTHON}"
+CONFIGURE_ENV+= PYTHON="${PYTHONBIN}"
DIRS_TO_BUILD= src/interfaces/python
-DOCDIR= ${PREFIX}/share/doc/py-postgresql
+DOCDIR= ${PREFIX}/share/doc/${PYPKGPREFIX}-postgresql
do-build:
.for DIR in ${DIRS_TO_BUILD}
@@ -54,5 +44,7 @@ post-install:
${INSTALL_DATA} $${file} ${DOCDIR}/tutorial; \
done
+.include "../../lang/python/extension.buildlink.mk"
+.include "../../time/py-mxDateTime/buildlink.mk"
.include "../../databases/postgresql-lib/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-postgresql/PLIST b/databases/py-postgresql/PLIST
index 63d15580a41..edb68c810ff 100644
--- a/databases/py-postgresql/PLIST
+++ b/databases/py-postgresql/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:45 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/19 16:13:01 drochner Exp $
${PYTHON_LIBDIR}/site-packages/_pgmodule.so
${PYTHON_LIBDIR}/pg.py
${PYTHON_LIBDIR}/pg.pyc
@@ -6,10 +6,10 @@ ${PYTHON_LIBDIR}/pg.pyo
${PYTHON_LIBDIR}/pgdb.py
${PYTHON_LIBDIR}/pgdb.pyc
${PYTHON_LIBDIR}/pgdb.pyo
-share/doc/py-postgresql/README
-share/doc/py-postgresql/tutorial/advanced.py
-share/doc/py-postgresql/tutorial/basics.py
-share/doc/py-postgresql/tutorial/func.py
-share/doc/py-postgresql/tutorial/syscat.py
-@dirrm share/doc/py-postgresql/tutorial
-@dirrm share/doc/py-postgresql
+share/doc/${PYPKGPREFIX}-postgresql/README
+share/doc/${PYPKGPREFIX}-postgresql/tutorial/advanced.py
+share/doc/${PYPKGPREFIX}-postgresql/tutorial/basics.py
+share/doc/${PYPKGPREFIX}-postgresql/tutorial/func.py
+share/doc/${PYPKGPREFIX}-postgresql/tutorial/syscat.py
+@dirrm share/doc/${PYPKGPREFIX}-postgresql/tutorial
+@dirrm share/doc/${PYPKGPREFIX}-postgresql