From f657dcb9d40d75572cc4d6babcbb719f9616f545 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 21 Sep 2002 23:46:45 +0000 Subject: Strip the ".buildlink" from the names of the python application and extension Makefile fragments, because they really don't have anything to do with the buildlink[12] frameworks. Change all the Makefiles that use application.buildlink.mk and extension.buildlink.mk to use application.mk and extension.mk instead. --- graphics/py-gd/Makefile | 4 ++-- graphics/py-gdchart/Makefile | 4 ++-- graphics/py-gimp/Makefile | 6 +++--- graphics/py-imaging/Makefile | 4 ++-- graphics/py-imagingtk/Makefile | 4 ++-- graphics/scigraphica/Makefile | 4 ++-- graphics/sketch/Makefile | 4 ++-- graphics/yplot/Makefile | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) (limited to 'graphics') diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index ea908520695..46bb00b4c1c 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:16 fredb Exp $ +# $NetBSD: Makefile,v 1.10 2002/09/21 23:46:50 jlam Exp $ DISTNAME= gdmodule.c PKGNAME= ${PYPKGPREFIX}-gd-1.3 @@ -34,5 +34,5 @@ do-configure: ${CP} ${PREFIX}/${PYLIB}/config/Makefile.pre.in ${WRKSRC} cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile index 33ece07b2c8..5f38d24a66a 100644 --- a/graphics/py-gdchart/Makefile +++ b/graphics/py-gdchart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:16 fredb Exp $ +# $NetBSD: Makefile,v 1.7 2002/09/21 23:46:50 jlam Exp $ # DISTNAME= gdchart-py-0.6 @@ -34,5 +34,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLE_DIR} .endfor -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile index 71bc7402807..093577b2532 100644 --- a/graphics/py-gimp/Makefile +++ b/graphics/py-gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:17 fredb Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:51 jlam Exp $ # DISTNAME= pygimp-1.2 @@ -28,8 +28,8 @@ post-install: ${INSTALL_DATA} $$i ${PREFIX}/share/doc/pygimp; \ done -.include "../../lang/python/application.buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/application.mk" +.include "../../lang/python/extension.mk" .include "../../graphics/gimp-base/buildlink.mk" .include "../../x11/pygtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile index c40366485b2..ded55fddc3b 100644 --- a/graphics/py-imaging/Makefile +++ b/graphics/py-imaging/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/09/04 13:06:54 drochner Exp $ +# $NetBSD: Makefile,v 1.15 2002/09/21 23:46:51 jlam Exp $ DISTNAME= Imaging-1.1.3 PKGNAME= ${PYPKGPREFIX}-imaging-1.1.3 @@ -22,6 +22,6 @@ do-configure: >${WRKSRC}/setup.py.tmp && ${MV} -f ${WRKSRC}/setup.py.tmp \ ${WRKSRC}/setup.py -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile index 9cb4c27645f..b57815ce0a6 100644 --- a/graphics/py-imagingtk/Makefile +++ b/graphics/py-imagingtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/02/14 11:39:47 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2002/09/21 23:46:51 jlam Exp $ # DISTNAME= Imaging-1.1.2 @@ -30,7 +30,7 @@ do-install: ${INSTALL_DATA} enhancer.py painter.py player.py \ thresholder.py viewer.py ${PREFIX}/share/examples/py20-imaging ) -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../graphics/py-imaging/buildlink.mk" .include "../../x11/py-Tk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile index a835e1b6402..559722c1f40 100644 --- a/graphics/scigraphica/Makefile +++ b/graphics/scigraphica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:17 fredb Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/21 23:46:51 jlam Exp $ # DISTNAME= scigraphica-0.8.0 @@ -21,7 +21,7 @@ USE_GNU_READLINE= yes .include "../../devel/readline/buildlink.mk" .include "../../graphics/imlib/buildlink.mk" -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../math/py-Numeric/buildlink.mk" .include "../../textproc/libxml/buildlink.mk" .include "../../x11/gtk/buildlink.mk" diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile index 58bcc1e41a7..3836590696a 100644 --- a/graphics/sketch/Makefile +++ b/graphics/sketch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/08/30 08:06:14 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2002/09/21 23:46:52 jlam Exp $ # DISTNAME= sketch-0.6.13 @@ -46,7 +46,7 @@ do-install: ${SED} -e "s|@PREFIX@|${PREFIX}|g" < ${FILESDIR}/sk2ps.in > ${PREFIX}/bin/sk2ps ${CHMOD} +x ${PREFIX}/bin/sk2ps -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../x11/py-Tk/buildlink.mk" .include "../../graphics/py-imaging/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/yplot/Makefile b/graphics/yplot/Makefile index 266964d3342..a7bd3aa51de 100644 --- a/graphics/yplot/Makefile +++ b/graphics/yplot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/04/28 18:08:27 hubertf Exp $ +# $NetBSD: Makefile,v 1.13 2002/09/21 23:46:52 jlam Exp $ DISTNAME= yplot-1.1.0 PKGREVISION= 1 @@ -28,5 +28,5 @@ MAKEFILE= Makefile.build PYTHON_FOR_BUILD_ONLY= yes PYTHON_PATCH_SCRIPTS= parse_documentation.py -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3