convert to use python/extension.buildlink.mk

4 files changed, 75 insertions, 65 deletions

diff --git a/time/py-mxDateTime/Makefile b/time/py-mxDateTime/Makefile
index 15312dffe21..7e7d50adbcf 100644
--- a/time/py-mxDateTime/Makefile
+++ b/time/py-mxDateTime/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/02/20 11:40:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/01/15 18:25:38 drochner Exp $
 #
 
 DISTNAME=	mxDateTime-1.3.0
-PKGNAME=	py-mxDateTime-1.3.0
+PKGNAME=	${PYPKGPREFIX}-mxDateTime-1.3.0
 WRKSRC=         ${WRKDIR}/DateTime
 CATEGORIES=	time
 MASTER_SITES=	http://starship.python.net/~lemburg/
@@ -12,34 +12,33 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://starship.python.net/~lemburg/mxDateTime.html
 COMMENT=	Python extension that provides new types and conversions for dates
 
-DEPENDS+=	python-2.0*:../../lang/python
-
 EXTRACT_CMD=	unzip -Laqo ${DOWNLOADED_DISTFILE}
 
 RESTRICTED=	No commercial distribution
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PYTHON_VERSIONS_ACCEPTED=	20 21 # 22 doesn't work
+USE_PYPKGPREFIX=	yes
+PY_PATCHPLIST=		yes
+
 do-configure:
-	( cd ${WRKSRC}/mxDateTime; ${MAKE_PROGRAM} -f Makefile.pre.in boot )
+	( cd ${WRKSRC}/mxDateTime; ${MAKE_PROGRAM} -f Makefile.pre.in boot PYTHONBIN=${PYTHONBIN})
 
 do-build:
 	( cd ${WRKSRC}/mxDateTime; ${MAKE_PROGRAM} )
-	( cd ${WRKSRC}; python ${PREFIX}/lib/python2.0/compileall.py . )
-	( cd ${WRKSRC}; python -O ${PREFIX}/lib/python2.0/compileall.py . )
+	( cd ${WRKSRC}; ${PYTHONBIN} ${PREFIX}/${PYLIB}/compileall.py . )
+	( cd ${WRKSRC}; ${PYTHONBIN} -O ${PREFIX}/${PYLIB}/compileall.py . )
 
 do-install:
-	@${INSTALL_SCRIPT_DIR} ${PREFIX}/lib/python2.0/site-packages
-	@${INSTALL_SCRIPT_DIR} ${PREFIX}/lib/python2.0/site-packages/DateTime
-	@${INSTALL_DATA} ${WRKSRC}/*.py* \
-		${PREFIX}/lib/python2.0/site-packages/DateTime
-	@${INSTALL_SCRIPT_DIR} \
-		${PREFIX}/lib/python2.0/site-packages/DateTime/mxDateTime
-	@${INSTALL_DATA} ${WRKSRC}/mxDateTime/*.so \
+	@${INSTALL_SCRIPT_DIR} ${PREFIX}/${PYSITELIB}/DateTime
+	${INSTALL_DATA} ${WRKSRC}/*.py* \
+		${PREFIX}/${PYSITELIB}/DateTime
+	${INSTALL_SCRIPT_DIR} \
+		${PREFIX}/${PYSITELIB}/DateTime/mxDateTime
+	${INSTALL_DATA} ${WRKSRC}/mxDateTime/*.so \
 		${WRKSRC}/mxDateTime/__init__.py* \
-		 ${PREFIX}/lib/python2.0/site-packages/DateTime/mxDateTime
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/py-mxDateTime
-	@${INSTALL_SCRIPT} ${WRKSRC}/Doc/*.html \
-		${PREFIX}/share/doc/html/py-mxDateTime/
+		 ${PREFIX}/${PYSITELIB}/DateTime/mxDateTime
 
+.include "../../lang/python/extension.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/py-mxDateTime/PLIST b/time/py-mxDateTime/PLIST
index ef8d3c69f9f..fd5003c23f1 100644
--- a/time/py-mxDateTime/PLIST
+++ b/time/py-mxDateTime/PLIST
@@ -1,46 +1,43 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:19:13 zuntum Exp $
-lib/python2.0/site-packages/DateTime/mxDateTime/mxDateTime.so
-lib/python2.0/site-packages/DateTime/mxDateTime/__init__.py
-lib/python2.0/site-packages/DateTime/mxDateTime/__init__.pyc
-lib/python2.0/site-packages/DateTime/mxDateTime/__init__.pyo
-lib/python2.0/site-packages/DateTime/ARPA.py
-lib/python2.0/site-packages/DateTime/ARPA.pyc
-lib/python2.0/site-packages/DateTime/ARPA.pyo
-lib/python2.0/site-packages/DateTime/DateTime.py
-lib/python2.0/site-packages/DateTime/DateTime.pyc
-lib/python2.0/site-packages/DateTime/DateTime.pyo
-lib/python2.0/site-packages/DateTime/Feasts.py
-lib/python2.0/site-packages/DateTime/Feasts.pyc
-lib/python2.0/site-packages/DateTime/Feasts.pyo
-lib/python2.0/site-packages/DateTime/ISO.py
-lib/python2.0/site-packages/DateTime/ISO.pyc
-lib/python2.0/site-packages/DateTime/ISO.pyo
-lib/python2.0/site-packages/DateTime/LazyModule.py
-lib/python2.0/site-packages/DateTime/LazyModule.pyc
-lib/python2.0/site-packages/DateTime/LazyModule.pyo
-lib/python2.0/site-packages/DateTime/Locale.py
-lib/python2.0/site-packages/DateTime/Locale.pyc
-lib/python2.0/site-packages/DateTime/Locale.pyo
-lib/python2.0/site-packages/DateTime/NIST.py
-lib/python2.0/site-packages/DateTime/NIST.pyc
-lib/python2.0/site-packages/DateTime/NIST.pyo
-lib/python2.0/site-packages/DateTime/ODMG.py
-lib/python2.0/site-packages/DateTime/ODMG.pyc
-lib/python2.0/site-packages/DateTime/ODMG.pyo
-lib/python2.0/site-packages/DateTime/Parser.py
-lib/python2.0/site-packages/DateTime/Parser.pyc
-lib/python2.0/site-packages/DateTime/Parser.pyo
-lib/python2.0/site-packages/DateTime/Timezone.py
-lib/python2.0/site-packages/DateTime/Timezone.pyc
-lib/python2.0/site-packages/DateTime/Timezone.pyo
-lib/python2.0/site-packages/DateTime/__init__.py
-lib/python2.0/site-packages/DateTime/__init__.pyc
-lib/python2.0/site-packages/DateTime/__init__.pyo
-lib/python2.0/site-packages/DateTime/timegm.py
-lib/python2.0/site-packages/DateTime/timegm.pyc
-lib/python2.0/site-packages/DateTime/timegm.pyo
-share/doc/html/py-mxDateTime/mxDateTime.html
-share/doc/html/py-mxDateTime/mxDateTime-History.html
-@dirrm lib/python2.0/site-packages/DateTime/mxDateTime
-@dirrm lib/python2.0/site-packages/DateTime
-@dirrm share/doc/html/py-mxDateTime
+@comment $NetBSD: PLIST,v 1.2 2002/01/15 18:25:38 drochner Exp $
+${PYSITELIB}/DateTime/mxDateTime/mxDateTime.so
+${PYSITELIB}/DateTime/mxDateTime/__init__.py
+${PYSITELIB}/DateTime/mxDateTime/__init__.pyc
+${PYSITELIB}/DateTime/mxDateTime/__init__.pyo
+${PYSITELIB}/DateTime/ARPA.py
+${PYSITELIB}/DateTime/ARPA.pyc
+${PYSITELIB}/DateTime/ARPA.pyo
+${PYSITELIB}/DateTime/DateTime.py
+${PYSITELIB}/DateTime/DateTime.pyc
+${PYSITELIB}/DateTime/DateTime.pyo
+${PYSITELIB}/DateTime/Feasts.py
+${PYSITELIB}/DateTime/Feasts.pyc
+${PYSITELIB}/DateTime/Feasts.pyo
+${PYSITELIB}/DateTime/ISO.py
+${PYSITELIB}/DateTime/ISO.pyc
+${PYSITELIB}/DateTime/ISO.pyo
+${PYSITELIB}/DateTime/LazyModule.py
+${PYSITELIB}/DateTime/LazyModule.pyc
+${PYSITELIB}/DateTime/LazyModule.pyo
+${PYSITELIB}/DateTime/Locale.py
+${PYSITELIB}/DateTime/Locale.pyc
+${PYSITELIB}/DateTime/Locale.pyo
+${PYSITELIB}/DateTime/NIST.py
+${PYSITELIB}/DateTime/NIST.pyc
+${PYSITELIB}/DateTime/NIST.pyo
+${PYSITELIB}/DateTime/ODMG.py
+${PYSITELIB}/DateTime/ODMG.pyc
+${PYSITELIB}/DateTime/ODMG.pyo
+${PYSITELIB}/DateTime/Parser.py
+${PYSITELIB}/DateTime/Parser.pyc
+${PYSITELIB}/DateTime/Parser.pyo
+${PYSITELIB}/DateTime/Timezone.py
+${PYSITELIB}/DateTime/Timezone.pyc
+${PYSITELIB}/DateTime/Timezone.pyo
+${PYSITELIB}/DateTime/__init__.py
+${PYSITELIB}/DateTime/__init__.pyc
+${PYSITELIB}/DateTime/__init__.pyo
+${PYSITELIB}/DateTime/timegm.py
+${PYSITELIB}/DateTime/timegm.pyc
+${PYSITELIB}/DateTime/timegm.pyo
+@dirrm ${PYSITELIB}/DateTime/mxDateTime
+@dirrm ${PYSITELIB}/DateTime
diff --git a/time/py-mxDateTime/distinfo b/time/py-mxDateTime/distinfo
index d722f968ae2..4581a87bf49 100644
--- a/time/py-mxDateTime/distinfo
+++ b/time/py-mxDateTime/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:47:14 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/01/15 18:25:38 drochner Exp $
 
 SHA1 (mxDateTime-1.3.0.zip) = 91aceeea7256138b7b42a4761f0f1dbac4f80d0f
 Size (mxDateTime-1.3.0.zip) = 145186 bytes
+SHA1 (patch-aa) = 7004e4e1b55f93d4952f97e5311207946b8f88db
diff --git a/time/py-mxDateTime/patches/patch-aa b/time/py-mxDateTime/patches/patch-aa
new file mode 100644
index 00000000000..491abaeee04
--- /dev/null
+++ b/time/py-mxDateTime/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2002/01/15 18:25:39 drochner Exp $
+
+--- mxDateTime/Makefile.pre.in.orig	Sun Jan 13 00:30:21 2002
++++ mxDateTime/Makefile.pre.in	Sun Jan 13 00:31:30 2002
+@@ -92,7 +92,7 @@
+ TARGET=		python
+ 
+ # Installed python binary (used only by boot target)
+-PYTHON=		python
++PYTHON=		${PYTHONBIN}
+ 
+ # Add more -I and -D options here
+ CFLAGS=		$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)