pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases Fixed pkglint warnings.
details: https://anonhg.NetBSD.org/pkgsrc/rev/d08704f1b4fc
branches: trunk
changeset: 514682:d08704f1b4fc
user: rillig <rillig%pkgsrc.org@localhost>
date: Fri Jun 16 10:58:23 2006 +0000
description:
Fixed pkglint warnings.
diffstat:
databases/py-ZODB/buildlink3.mk | 7 +++----
databases/py-bsddb3/buildlink3.mk | 16 ++++++++--------
databases/py-gdbm/Makefile | 11 ++++++-----
databases/py-ldap/buildlink3.mk | 7 +++----
databases/py-metakit/buildlink3.mk | 9 ++++-----
databases/py-postgresql/Makefile | 28 ++++++++++++++++------------
databases/py-psycopg/buildlink3.mk | 5 +++--
databases/py-sybase/Makefile | 11 ++++++-----
8 files changed, 49 insertions(+), 45 deletions(-)
diffs (242 lines):
diff -r 51f0e496fedd -r d08704f1b4fc databases/py-ZODB/buildlink3.mk
--- a/databases/py-ZODB/buildlink3.mk Fri Jun 16 10:58:08 2006 +0000
+++ b/databases/py-ZODB/buildlink3.mk Fri Jun 16 10:58:23 2006 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/06/16 10:58:23 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_ZODB_BUILDLINK3_MK:= ${PY_ZODB_BUILDLINK3_MK}+
-.include "../../lang/python/pyversion.mk"
-
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= pyZODB
.endif
@@ -13,8 +11,9 @@
BUILDLINK_PACKAGES+= pyZODB
.if !empty(PY_ZODB_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.pyZODB+= ${PYPKGPREFIX}-ZODB>=3.2nb1
-BUILDLINK_ABI_DEPENDS.pyZODB?= ${PYPKGPREFIX}-ZODB>=3.2.1nb2
+BUILDLINK_ABI_DEPENDS.pyZODB+= ${PYPKGPREFIX}-ZODB>=3.2.1nb2
BUILDLINK_PKGSRCDIR.pyZODB?= ../../databases/py-ZODB
.endif # PY_ZODB_BUILDLINK3_MK
diff -r 51f0e496fedd -r d08704f1b4fc databases/py-bsddb3/buildlink3.mk
--- a/databases/py-bsddb3/buildlink3.mk Fri Jun 16 10:58:08 2006 +0000
+++ b/databases/py-bsddb3/buildlink3.mk Fri Jun 16 10:58:23 2006 +0000
@@ -1,14 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/06/16 10:58:23 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_BSDDB3_BUILDLINK3_MK:= ${PY_BSDDB3_BUILDLINK3_MK}+
-.include "../../mk/pthread.buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-PYTHON_VERSIONS_ACCEPTED= 24 23 22
-.endif
-.include "../../lang/python/pyversion.mk"
-
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= py-bsddb3
.endif
@@ -17,8 +11,14 @@
BUILDLINK_PACKAGES+= py-bsddb3
.if !empty(PY_BSDDB3_BUILDLINK3_MK:M+)
+. include "../../mk/pthread.buildlink3.mk"
+. if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
+PYTHON_VERSIONS_ACCEPTED= 24 23 22
+. endif
+. include "../../lang/python/pyversion.mk"
+
BUILDLINK_API_DEPENDS.py-bsddb3+= ${PYPKGPREFIX}-bsddb3>=4.3.3nb1
-BUILDLINK_ABI_DEPENDS.py-bsddb3?= ${PYPKGPREFIX}-bsddb3>=4.3.3nb2
+BUILDLINK_ABI_DEPENDS.py-bsddb3+= ${PYPKGPREFIX}-bsddb3>=4.3.3nb2
BUILDLINK_PKGSRCDIR.py-bsddb3?= ../../databases/py-bsddb3
.endif # PY_BSDDB3_BUILDLINK3_MK
diff -r 51f0e496fedd -r d08704f1b4fc databases/py-gdbm/Makefile
--- a/databases/py-gdbm/Makefile Fri Jun 16 10:58:08 2006 +0000
+++ b/databases/py-gdbm/Makefile Fri Jun 16 10:58:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:35 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/06/16 10:58:23 rillig Exp $
#
PKGNAME= ${PYPKGPREFIX}-gdbm-0
@@ -22,10 +22,11 @@
# ignore errors due to missing files (EXTRACT_ELEMENTS!)
do-patch:
- (cd ${WRKSRC}; \
- for f in ${PATCHDIR}/patch-*;do \
- ${PATCH} --batch <$$f || true; \
- done)
+ set -e; \
+ cd ${WRKSRC}; \
+ for f in ${PATCHDIR}/patch-*; do \
+ ${PATCH} --batch < "$$f" || ${TRUE}; \
+ done
.include "../../databases/gdbm/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff -r 51f0e496fedd -r d08704f1b4fc databases/py-ldap/buildlink3.mk
--- a/databases/py-ldap/buildlink3.mk Fri Jun 16 10:58:08 2006 +0000
+++ b/databases/py-ldap/buildlink3.mk Fri Jun 16 10:58:23 2006 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/05/14 21:09:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/06/16 10:58:23 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_LDAP_BUILDLINK3_MK:= ${PY_LDAP_BUILDLINK3_MK}+
-.include "../../lang/python/pyversion.mk"
-
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= pyldap
.endif
@@ -13,8 +11,9 @@
BUILDLINK_PACKAGES+= pyldap
.if !empty(PY_LDAP_BUILDLINK3_MK:M+)
+.include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.pyldap+= ${PYPKGPREFIX}-ldap>=2.2.0
-BUILDLINK_ABI_DEPENDS.pyldap?= ${PYPKGPREFIX}-ldap>=2.2.0
+BUILDLINK_ABI_DEPENDS.pyldap+= ${PYPKGPREFIX}-ldap>=2.2.0
BUILDLINK_PKGSRCDIR.pyldap?= ../../databases/py-ldap
.endif # PY_LDAP_BUILDLINK3_MK
diff -r 51f0e496fedd -r d08704f1b4fc databases/py-metakit/buildlink3.mk
--- a/databases/py-metakit/buildlink3.mk Fri Jun 16 10:58:08 2006 +0000
+++ b/databases/py-metakit/buildlink3.mk Fri Jun 16 10:58:23 2006 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/06/16 10:58:23 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_METAKIT_BUILDLINK3_MK:= ${PY_METAKIT_BUILDLINK3_MK}+
-.include "../../lang/python/pyversion.mk"
-
.if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= pymetakit
.endif
@@ -13,8 +11,9 @@
BUILDLINK_PACKAGES+= pymetakit
.if !empty(PY_METAKIT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.pymetakit+= ${PYPKGPREFIX}-metakit-*
-BUILDLINK_ABI_DEPENDS.pymetakit?= ${PYPKGPREFIX}-metakit>=2.4.9.3nb2
+.include "../../lang/python/pyversion.mk"
+BUILDLINK_API_DEPENDS.pymetakit+= ${PYPKGPREFIX}-metakit-[0-9]*
+BUILDLINK_ABI_DEPENDS.pymetakit+= ${PYPKGPREFIX}-metakit>=2.4.9.3nb2
BUILDLINK_PKGSRCDIR.pymetakit?= ../../databases/py-metakit
.endif # PY_METAKIT_BUILDLINK3_MK
diff -r 51f0e496fedd -r d08704f1b4fc databases/py-postgresql/Makefile
--- a/databases/py-postgresql/Makefile Fri Jun 16 10:58:08 2006 +0000
+++ b/databases/py-postgresql/Makefile Fri Jun 16 10:58:23 2006 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.47 2006/06/11 00:58:39 darcy Exp $
+# $NetBSD: Makefile,v 1.48 2006/06/16 10:58:23 rillig Exp $
DISTNAME= PyGreSQL-3.8.1
PKGNAME= ${PYPKGPREFIX}-postgresql-3.8.1
CATEGORIES= databases python
-MASTER_SITES= ftp://ftp.druid.net/pub/distrib/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= ftp://ftp.druid.net/pub/distrib/
+EXTRACT_SUFX= .tgz
MAINTAINER= darcy%NetBSD.org@localhost
HOMEPAGE= http://www.PyGreSQL.org/
@@ -12,27 +12,31 @@
MAKE_ENV+= MANDIR=${LOCALBASE}/man
MAKE_ENV+= BINDIR=${LOCALBASE}/bin
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
MAKE_ENV+= INSTALLED_LIBPQ=1
-PY_PATCHPLIST= yes
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
+PY_PATCHPLIST= yes
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
PYTHON_VERSIONS_ACCEPTED= 24 23 22
-PYDISTUTILSPKG= yes
-PYBINMODULE= yes
+PYDISTUTILSPKG= yes
+PYBINMODULE= yes
DOCDIR= ${PREFIX}/share/doc/${PYPKGPREFIX}-postgresql
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}/tutorial
${INSTALL_DATA_DIR} ${DOCDIR}/docs
- for inst_file in ${WRKSRC}/tutorial/*.py; do \
- ${INSTALL_DATA} $${inst_file} ${DOCDIR}/tutorial; \
+ set -e; \
+ cd ${WRKSRC}/tutorial; \
+ for f in *.py; do \
+ ${INSTALL_DATA} "$$f" ${DOCDIR}/tutorial; \
done
- for inst_file in ${WRKSRC}/docs/*; do \
- ${INSTALL_DATA} $${inst_file} ${DOCDIR}/docs; \
+ set -e; \
+ cd ${WRKSRC}/docs; \
+ for f in *; do \
+ ${INSTALL_DATA} "$$f" ${DOCDIR}/docs; \
done
.include "../../lang/python/extension.mk"
diff -r 51f0e496fedd -r d08704f1b4fc databases/py-psycopg/buildlink3.mk
--- a/databases/py-psycopg/buildlink3.mk Fri Jun 16 10:58:08 2006 +0000
+++ b/databases/py-psycopg/buildlink3.mk Fri Jun 16 10:58:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/12 10:27:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/06/16 10:58:23 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PY_PSYCOPG_BUILDLINK3_MK:= ${PY_PSYCOPG_BUILDLINK3_MK}+
@@ -11,8 +11,9 @@
BUILDLINK_PACKAGES+= psycopg
.if !empty(PY_PSYCOPG_BUILDLINK3_MK:M+)
+. include "../../lang/python/pyversion.mk"
BUILDLINK_API_DEPENDS.psycopg+= ${PYPKGPREFIX}-psycopg>=1.1.21
-BUILDLINK_ABI_DEPENDS.psycopg?= ${PYPKGPREFIX}-psycopg>=1.1.21nb1
+BUILDLINK_ABI_DEPENDS.psycopg+= ${PYPKGPREFIX}-psycopg>=1.1.21nb1
BUILDLINK_PKGSRCDIR.psycopg?= ../../databases/py-psycopg
.endif # PY_PSYCOPG_BUILDLINK3_MK
diff -r 51f0e496fedd -r d08704f1b4fc databases/py-sybase/Makefile
--- a/databases/py-sybase/Makefile Fri Jun 16 10:58:08 2006 +0000
+++ b/databases/py-sybase/Makefile Fri Jun 16 10:58:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:11 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/06/16 10:58:23 rillig Exp $
#
DISTNAME= sybase-0.36
@@ -19,10 +19,11 @@
SYBASE= ${BUILDLINK_PREFIX.freetds}
MAKE_ENV+= SYBASE=${SYBASE:Q}
-post-patch:
- ${SED} "s|\(runtime_library_dirs = \)None|\1['${SYBASE}'+'/lib']|" \
- <${WRKSRC}/setup.py >${WRKSRC}/setup.py.tmp
- ${MV} ${WRKSRC}/setup.py.tmp ${WRKSRC}/setup.py
+SUBST_CLASSES+= sybase
+SUBST_STAGE.sybase= pre-configure
+SUBST_MESSAGE.sybase= Fixing runtime_library_dirs.
+SUBST_FILES.sybase= setup.py
+SUBST_SED.sybase= -e "s|\\(runtime_library_dirs = \\)None|\\1['${SYBASE}/lib']|"
.include "../../databases/freetds/buildlink3.mk"
.include "../../lang/python/extension.mk"
Home |
Main Index |
Thread Index |
Old Index