aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/py-bsddb/Makefile12
-rw-r--r--databases/py-gdbm/Makefile2
-rw-r--r--databases/py25-bsddb/Makefile12
-rw-r--r--math/py-mpz/Makefile2
-rw-r--r--textproc/py-expat/Makefile2
-rw-r--r--x11-toolkits/py-tkinter/Makefile2
6 files changed, 10 insertions, 22 deletions
diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile
index 0715eb7572ac..7dbb7f9537f3 100644
--- a/databases/py-bsddb/Makefile
+++ b/databases/py-bsddb/Makefile
@@ -9,7 +9,7 @@ PORTNAME= bsddb
PORTVERSION= ${PYTHON_PORTVERSION}
CATEGORIES= databases python
MASTER_SITES= ${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
@@ -26,19 +26,13 @@ DBVERSION= db4
.endif
DIST_SUBDIR= python
-USE_PYTHON= yes
+USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
USE_REINPLACE= yes
WRKSRC= ${PYTHON_WRKSRC}/Modules
MD5_FILE= ${PORTSDIR}/lang/python/distinfo
MAKE_ENV= BSDDB_VERSION=${DBVERSION}
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 230
-IGNORE= "is a port for python2.3 and later versions"
-.endif
-
post-extract:
@${CP} ${FILESDIR}/setup.py ${WRKSRC}
@@ -47,4 +41,4 @@ post-patch:
's,^\(#include.*\)\(db\.h.*\)$$,\1${DBVERSION}/\2,' \
${WRKSRC}/_bsddb.c
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index d0cc8ba5aac4..aeb638851a14 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gdbm
PORTVERSION= ${PYTHON_PORTVERSION}
CATEGORIES= databases python
MASTER_SITES= ${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
diff --git a/databases/py25-bsddb/Makefile b/databases/py25-bsddb/Makefile
index 0715eb7572ac..7dbb7f9537f3 100644
--- a/databases/py25-bsddb/Makefile
+++ b/databases/py25-bsddb/Makefile
@@ -9,7 +9,7 @@ PORTNAME= bsddb
PORTVERSION= ${PYTHON_PORTVERSION}
CATEGORIES= databases python
MASTER_SITES= ${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
@@ -26,19 +26,13 @@ DBVERSION= db4
.endif
DIST_SUBDIR= python
-USE_PYTHON= yes
+USE_PYTHON= 2.3+
USE_PYDISTUTILS=yes
USE_REINPLACE= yes
WRKSRC= ${PYTHON_WRKSRC}/Modules
MD5_FILE= ${PORTSDIR}/lang/python/distinfo
MAKE_ENV= BSDDB_VERSION=${DBVERSION}
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 230
-IGNORE= "is a port for python2.3 and later versions"
-.endif
-
post-extract:
@${CP} ${FILESDIR}/setup.py ${WRKSRC}
@@ -47,4 +41,4 @@ post-patch:
's,^\(#include.*\)\(db\.h.*\)$$,\1${DBVERSION}/\2,' \
${WRKSRC}/_bsddb.c
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/py-mpz/Makefile b/math/py-mpz/Makefile
index 90580c90dad2..f54d277cceac 100644
--- a/math/py-mpz/Makefile
+++ b/math/py-mpz/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mpz
PORTVERSION= ${PYTHON_PORTVERSION}
CATEGORIES= math python
MASTER_SITES= ${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile
index 2c6f2db7c65b..fcd77f36b0ce 100644
--- a/textproc/py-expat/Makefile
+++ b/textproc/py-expat/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= ${PYTHON_PORTVERSION}
PORTREVISION= 2
CATEGORIES= textproc python
MASTER_SITES= ${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index b4ed5b0298af..e48271c912da 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= ${PYTHON_PORTVERSION}
PORTREVISION= 1
CATEGORIES= x11-toolkits python
MASTER_SITES= ${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION}
+MASTER_SITE_SUBDIR= ${PYTHON_SITE_SUBDIR}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}