use python buildlink file

2 files changed, 30 insertions, 22 deletions

diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index 88d3acf4472..1abdd8f565a 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2002/01/02 10:21:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2002/01/19 17:34:24 drochner Exp $
 
 DISTNAME=	Imaging-1.1.1
-PKGNAME=	py-imaging-1.1.1
+PKGNAME=	${PYPKGPREFIX}-imaging-1.1.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.pythonware.com/downloads/
 
@@ -9,48 +9,56 @@ MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.pythonware.com/products/pil/
 COMMENT=	PIL, the Python Imaging Library
 
-DEPENDS+=	python>=2.0:../../lang/python
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 
 DIST_SUBDIR=    python
 
 PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
 
+# this pkg uses Makefile.pre.in
+PYTHON_VERSIONS_ACCEPTED=	20 21
+BUILDLINK_DEPENDS.python20=	python20>=2.0.1nb1
+BUILDLINK_DEPENDS.python21=	python21>=2.1.1nb1
+
+PY_PATCHPLIST=	yes
+
 do-configure:
 	(cd ${WRKSRC}/libImaging; CC="cc -fPIC" LIBS="${LDFLAGS}" ./configure)
 	${SED} -e 's,@PREFIX@,${PREFIX},g' ${FILESDIR}/Setup.in \
 		>${WRKSRC}/Setup.in
+	${CP} ${LOCALBASE}/${PYLIB}/config/Makefile.pre.in ${WRKSRC}
 	(cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot)
 
 do-build:
 	(cd ${WRKSRC}/libImaging; ${SETENV} ${MAKE_ENV} ${MAKE}; cd ..; ${MAKE})
 
 post-build:
-	(cd ${WRKSRC}/PIL; python ${PREFIX}/lib/python2.0/compileall.py .)
-	(cd ${WRKSRC}/PIL; python -O ${PREFIX}/lib/python2.0/compileall.py .)
+	(cd ${WRKSRC}/PIL; ${PYTHONBIN} ${PREFIX}/${PYLIB}/compileall.py .)
+	(cd ${WRKSRC}/PIL; ${PYTHONBIN} -O ${PREFIX}/${PYLIB}/compileall.py .)
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/python2.0/site-packages
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/python2.0/site-packages/PIL
+	${INSTALL_DATA_DIR} ${PREFIX}/${PYSITELIB}
+	${INSTALL_DATA_DIR} ${PREFIX}/${PYSITELIB}/PIL
 	${INSTALL_SCRIPT} ${WRKSRC}/PIL.pth \
-		${PREFIX}/lib/python2.0/site-packages
+		${PREFIX}/${PYSITELIB}
 	${INSTALL_SCRIPT} ${WRKSRC}/_imaging.so \
 		${WRKSRC}/PIL/*.py ${WRKSRC}/PIL/*.py[co] \
-		${PREFIX}/lib/python2.0/site-packages/PIL
-	${INSTALL_DATA_DIR} ${PREFIX}/include/PIL
-	${INSTALL_DATA} ${WRKSRC}/libImaging/*.h ${PREFIX}/include/PIL
+		${PREFIX}/${PYSITELIB}/PIL
+	${INSTALL_DATA_DIR} ${PREFIX}/${PYINC}/PIL
+	${INSTALL_DATA} ${WRKSRC}/libImaging/*.h ${PREFIX}/${PYINC}/PIL
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
 	(cd ${WRKSRC}/PIL; ${FIND} . -name \*.py\* -print \
-		| ${SED} -e 's,^./,lib/python2.0/site-packages/PIL/,g' \
+		| ${SED} -e 's,^./,${PYSITELIB}/PIL/,g' \
 		>>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} include/PIL -type f -print >>${PLIST_SRC})
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-imaging
+	(cd ${PREFIX}; ${FIND} ${PYINC}/PIL -type f -print >>${PLIST_SRC})
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PYPKGPREFIX}-imaging
 	(cd ${WRKSRC}/Scripts; \
 	 for i in  README bdf2pil.py explode.py gifmaker.py image2py.py pil*.py; do \
-	 ${INSTALL_DATA} $$i ${PREFIX}/share/examples/py-imaging; \
-	 ${ECHO} share/examples/py-imaging/$$i >>${PLIST_SRC}; done )
-	${ECHO} "@dirrm share/examples/py-imaging" >>${PLIST_SRC}
-	${ECHO} "@dirrm include/PIL" >>${PLIST_SRC}
-	${ECHO} "@dirrm lib/python2.0/site-packages/PIL" >> ${PLIST_SRC}
+	 ${INSTALL_DATA} $$i ${PREFIX}/share/examples/${PYPKGPREFIX}-imaging; \
+	 ${ECHO} share/examples/${PYPKGPREFIX}-imaging/$$i >>${PLIST_SRC}; done )
+	${ECHO} "@dirrm share/examples/${PYPKGPREFIX}-imaging" >>${PLIST_SRC}
+	${ECHO} "@dirrm ${PYINC}/PIL" >>${PLIST_SRC}
+	${ECHO} "@dirrm ${PYSITELIB}/PIL" >> ${PLIST_SRC}
 
+.include "../../lang/python/extension.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-imaging/PLIST.pre b/graphics/py-imaging/PLIST.pre
index 35b1988172f..fc9abf03f1e 100644
--- a/graphics/py-imaging/PLIST.pre
+++ b/graphics/py-imaging/PLIST.pre
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/10/31 23:58:13 zuntum Exp $
-lib/python2.0/site-packages/PIL.pth
-lib/python2.0/site-packages/PIL/_imaging.so
+@comment $NetBSD: PLIST.pre,v 1.2 2002/01/19 17:34:25 drochner Exp $
+${PYSITELIB}/PIL.pth
+${PYSITELIB}/PIL/_imaging.so