diff options
78 files changed, 183 insertions, 179 deletions
diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile index 08c94f90714..e394ed75b8d 100644 --- a/audio/py-cddb/Makefile +++ b/audio/py-cddb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/01/17 11:33:41 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/21 23:46:45 jlam Exp $ # DISTNAME= CDDB-1.3 @@ -13,5 +13,5 @@ COMMENT= python module to access the CDDB online database PYDISTUTILSPKG= yes PYBINMODULE= yes -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile index 68dd0a7b59d..7bd8193d396 100644 --- a/chat/fugu/Makefile +++ b/chat/fugu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/01/29 11:33:54 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/21 23:46:46 jlam Exp $ # DISTNAME= fugu-1.0 @@ -17,6 +17,6 @@ CONFIGURE_ENV+= vi_cv_path_python=${PYTHONBIN} LDFLAGS+= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/rsaref -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../x11/py-Pmw/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common index 992cf838da3..7dce3461f0d 100644 --- a/chat/xchat/Makefile.common +++ b/chat/xchat/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2002/09/12 12:34:00 tron Exp $ +# $NetBSD: Makefile.common,v 1.4 2002/09/21 23:46:46 jlam Exp $ DISTNAME= xchat-1.8.10 CATEGORIES= chat x11 @@ -15,17 +15,19 @@ PATCHDIR= ${.CURDIR}/../xchat/patches PKGDIR= ${.CURDIR}/../xchat PLIST_SRC= ${.CURDIR}/../xchat/PLIST -USE_GMAKE= YES -USE_PERL5= YES -USE_X11BASE= YES -GNU_CONFIGURE= YES -CONFIGURE_ENV+= ac_cv_lib_intl_bindtextdomain='yes' -CONFIGURE_ENV+= pythonpath=${PYTHONBIN} -MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +USE_BUILDLINK2= YES +USE_X11BASE= YES +USE_GMAKE= YES +USE_PERL5= YES USE_GNU_GETTEXT= YES BUILD_USES_MSGFMT= YES -BUILD_DEFS+= USE_INET6 USE_SOCKS +BUILD_DEFS+= USE_INET6 USE_SOCKS +MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" + +GNU_CONFIGURE= YES +CONFIGURE_ENV+= ac_cv_lib_intl_bindtextdomain='yes' +CONFIGURE_ENV+= pythonpath=${PYTHONBIN} .include "../../mk/bsd.prefs.mk" @@ -49,6 +51,6 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat -.include "../../devel/glib/buildlink.mk" -.include "../../lang/perl5/buildlink.mk" -.include "../../lang/python/application.buildlink.mk" +.include "../../devel/glib/buildlink2.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../lang/python/application.mk" diff --git a/converters/py-koCodecs/Makefile b/converters/py-koCodecs/Makefile index 8907e331ecb..0318ab0974d 100644 --- a/converters/py-koCodecs/Makefile +++ b/converters/py-koCodecs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/07/07 16:03:16 jschauma Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:46 jlam Exp $ DISTNAME= KoreanCodecs-2.0.4 PKGNAME= ${PYPKGPREFIX}-koCodecs-2.0.4 @@ -12,5 +12,5 @@ COMMENT= Python Unicode codecs for Korean charsets PYDISTUTILSPKG= yes PYBINMODULE= yes -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/py-zhCodecs/Makefile b/converters/py-zhCodecs/Makefile index 5a3667d99f9..87c0b2f9ea5 100644 --- a/converters/py-zhCodecs/Makefile +++ b/converters/py-zhCodecs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/06/15 08:18:15 shell Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:46 jlam Exp $ DISTNAME= ChineseCodecs1.2.0 PKGNAME= ${PYPKGPREFIX}-zhCodecs-1.2.0 @@ -18,5 +18,5 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/Python post-extract: @${CHMOD} 711 ${WRKSRC}/chinesetw -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/oraedit/Makefile b/databases/oraedit/Makefile index 278f6caf4c8..5a398425beb 100644 --- a/databases/oraedit/Makefile +++ b/databases/oraedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/01/19 16:45:43 drochner Exp $ +# $NetBSD: Makefile,v 1.6 2002/09/21 23:46:46 jlam Exp $ DISTNAME= oraedit-0.1.3 CATEGORIES= databases @@ -15,5 +15,5 @@ PYTHON_PATCH_SCRIPTS= oraedit do-install: ${INSTALL_SCRIPT} ${WRKSRC}/oraedit ${LOCALBASE}/bin/oraedit -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile index d566030fff4..e9423ce9151 100644 --- a/databases/py-gdbm/Makefile +++ b/databases/py-gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/01/28 09:30:08 drochner Exp $ +# $NetBSD: Makefile,v 1.16 2002/09/21 23:46:47 jlam Exp $ # PKGNAME= ${PYPKGPREFIX}-gdbm-0 @@ -26,5 +26,5 @@ do-patch: done) .include "../../lang/python/srcdist.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile index 1822a1e54cb..a1c4c4a7658 100644 --- a/databases/py-ldap/Makefile +++ b/databases/py-ldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/01/19 17:14:55 drochner Exp $ +# $NetBSD: Makefile,v 1.9 2002/09/21 23:46:47 jlam Exp $ DISTNAME= python-ldap-1.10alpha3-src PKGNAME= ${PYPKGPREFIX}-ldap-1.10a3 @@ -27,5 +27,5 @@ post-install: (cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/python-ldap \ -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-mysqldb/Makefile b/databases/py-mysqldb/Makefile index eb179498026..5286c2c23e7 100644 --- a/databases/py-mysqldb/Makefile +++ b/databases/py-mysqldb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/01/29 14:39:38 drochner Exp $ +# $NetBSD: Makefile,v 1.8 2002/09/21 23:46:47 jlam Exp $ DISTNAME= MySQL-python-0.9.1 PKGNAME= ${PYPKGPREFIX}-mysqldb-0.9.1 @@ -19,5 +19,5 @@ post-patch: ${MV} ${WRKSRC}/setup.py.tmp ${WRKSRC}/setup.py .include "../../databases/mysql-client/buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile index 65a8f6536f6..b3f7d1fa253 100644 --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/04/04 14:36:42 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2002/09/21 23:46:47 jlam Exp $ PKGNAME= ${PYPKGPREFIX}-postgresql-3.2 COMMENT= Python interface to PostgreSQL @@ -42,6 +42,6 @@ post-install: done .include "../../databases/postgresql-lib/buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../time/py-mxDateTime/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/zope-mysql/Makefile b/databases/zope-mysql/Makefile index e92dd4763fc..969b21e4679 100644 --- a/databases/zope-mysql/Makefile +++ b/databases/zope-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/01/22 18:50:17 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2002/09/21 23:46:48 jlam Exp $ # DISTNAME= ZMySQLDA-1.1.3-nonbin @@ -37,6 +37,6 @@ do-install: (cd ${PREFIX}; ${FIND} lib/zope/${DAPATH} -type f -print >>${PLIST_SRC}) ${ECHO} "@dirrm lib/zope/${DAPATH}" >> ${PLIST_SRC} -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../databases/py-mysqldb/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-Checker-mixedcase/Makefile b/devel/py-Checker-mixedcase/Makefile index 6200cca52a9..aa6b6f7ef42 100644 --- a/devel/py-Checker-mixedcase/Makefile +++ b/devel/py-Checker-mixedcase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/10 02:25:03 shell Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:48 jlam Exp $ DISTNAME= pychecker-0.8.10 PKGNAME= ${PYPKGPREFIX}-checker-0.8.10 @@ -19,5 +19,5 @@ post-patch: -e "s|@PYPKGPREFIX@|${PYPKGPREFIX}|" \ <${WRKSRC}/setup.py > ${WRKSRC}/setup.py.new -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-Optik/Makefile b/devel/py-Optik/Makefile index 3c77a1c08ec..7161ff4039a 100644 --- a/devel/py-Optik/Makefile +++ b/devel/py-Optik/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/10 02:29:35 shell Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:48 jlam Exp $ DISTNAME= Optik-1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,5 +11,5 @@ COMMENT= command line parsing library for Python PYDISTUTILSPKG= # defined -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile index 53131607398..537e252bf77 100644 --- a/devel/py-curses/Makefile +++ b/devel/py-curses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/01/28 09:32:54 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2002/09/21 23:46:48 jlam Exp $ # PKGNAME= ${PYPKGPREFIX}-curses-0 @@ -26,5 +26,5 @@ do-patch: done) .include "../../lang/python/srcdist.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-expect/Makefile b/devel/py-expect/Makefile index edac13a5d0f..63a89dcf8a5 100644 --- a/devel/py-expect/Makefile +++ b/devel/py-expect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/01/19 15:03:35 drochner Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:48 jlam Exp $ # DISTNAME= ExpectPy-1.9b1 @@ -31,5 +31,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/examples/$f ${EXAMPLESDIR} .endfor -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile index ce8311b5aef..4734299912f 100644 --- a/devel/py-idle/Makefile +++ b/devel/py-idle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/01/29 11:12:47 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/21 23:46:49 jlam Exp $ # PKGNAME= ${PYPKGPREFIX}-idle-0 @@ -38,8 +38,8 @@ do-install: (cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/idle -type d -print | \ ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) -.include "../../lang/python/extension.buildlink.mk" -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/extension.mk" +.include "../../lang/python/application.mk" .include "../../lang/python/srcdist.mk" .include "../../x11/py-Tk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-plex/Makefile b/devel/py-plex/Makefile index d8308d6fb1b..0676729593c 100644 --- a/devel/py-plex/Makefile +++ b/devel/py-plex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/17 20:47:20 tsarna Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:49 jlam Exp $ DISTNAME= Plex1.1.2 PKGNAME= ${PYPKGPREFIX}-plex-1.1.2 @@ -16,5 +16,5 @@ pre-configure: PYDISTUTILSPKG= # defined -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile index 35872de6e8b..677b5d0b84e 100644 --- a/devel/py-readline/Makefile +++ b/devel/py-readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2002/03/14 17:58:49 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:49 jlam Exp $ # PKGNAME= ${PYPKGPREFIX}-readline-0 @@ -28,5 +28,5 @@ do-patch: done) .include "../../lang/python/srcdist.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-unit/Makefile b/devel/py-unit/Makefile index d06e2cdb690..169b0440819 100644 --- a/devel/py-unit/Makefile +++ b/devel/py-unit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/29 16:19:03 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:49 jlam Exp $ DISTNAME= pyunit-1.4.1 PKGNAME= ${PYPKGPREFIX}-unit-1.4.1 @@ -11,5 +11,5 @@ COMMENT= unit testing framework for python PYDISTUTILSPKG= # defined -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-unitgui/Makefile b/devel/py-unitgui/Makefile index ed96bb19256..e526e75ed40 100644 --- a/devel/py-unitgui/Makefile +++ b/devel/py-unitgui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/29 16:20:47 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:49 jlam Exp $ DISTNAME= pyunit-1.4.1 PKGNAME= ${PYPKGPREFIX}-unitgui-1.4.1 @@ -11,6 +11,6 @@ COMMENT= unit testing framework for python tk PYDISTUTILSPKG= # defined -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../x11/py-Tk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/finance/emma/Makefile b/finance/emma/Makefile index ea1088d9217..730d3205fbd 100644 --- a/finance/emma/Makefile +++ b/finance/emma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/03/13 17:36:56 fredb Exp $ +# $NetBSD: Makefile,v 1.14 2002/09/21 23:46:50 jlam Exp $ # DISTNAME= emma-0.8-1 @@ -32,6 +32,6 @@ post-extract: ${CP} ${LOCALBASE}/share/automake/$$FILE ${WRKSRC}/$$FILE; \ done -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../time/py-mxDateTime/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/mkfontalias/Makefile b/fonts/mkfontalias/Makefile index 935b8a02280..033f5d555e4 100644 --- a/fonts/mkfontalias/Makefile +++ b/fonts/mkfontalias/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/20 12:38:58 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:50 jlam Exp $ # DISTNAME= mkfontalias.py @@ -23,5 +23,5 @@ do-extract: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/mkfontalias.py ${PREFIX}/bin/mkfontalias -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/pysol/Makefile b/games/pysol/Makefile index ecb562baa8e..1c831f702c8 100644 --- a/games/pysol/Makefile +++ b/games/pysol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/01/28 17:38:44 drochner Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/21 23:46:50 jlam Exp $ # FreeBSD Id: ports/games/pysol/Makefile,v 1.20 1999/12/08 11:01:01 tg Exp DISTNAME= pysol-4.72 @@ -37,6 +37,6 @@ post-install: ${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \ done) -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../x11/py-Tk/buildlink.mk" .include "../../mk/bsd.pkg.mk" 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" diff --git a/ham/cwtext/Makefile b/ham/cwtext/Makefile index a12875b5167..2618579212b 100644 --- a/ham/cwtext/Makefile +++ b/ham/cwtext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/05/12 10:16:47 abs Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/21 23:46:52 jlam Exp $ DISTNAME= cwtext-0.91 CATEGORIES= ham @@ -23,5 +23,5 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cwpcm ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/cwtext ${PREFIX}/bin -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/python/application.buildlink.mk b/lang/python/application.mk index bf73274d305..ce6f21679cb 100644 --- a/lang/python/application.buildlink.mk +++ b/lang/python/application.mk @@ -1,4 +1,4 @@ -# $NetBSD: application.buildlink.mk,v 1.5 2002/01/19 13:39:58 drochner Exp $ +# $NetBSD: application.mk,v 1.1 2002/09/21 23:47:03 jlam Exp $ .include "../../lang/python/pyversion.mk" diff --git a/lang/python/extension.buildlink.mk b/lang/python/extension.mk index 28fbab3d122..d8e5bd274a5 100644 --- a/lang/python/extension.buildlink.mk +++ b/lang/python/extension.mk @@ -1,4 +1,4 @@ -# $NetBSD: extension.buildlink.mk,v 1.12 2002/09/20 22:53:21 jlam Exp $ +# $NetBSD: extension.mk,v 1.1 2002/09/21 23:47:03 jlam Exp $ # derive a python version from the package name if possible .if defined(PKGNAME_REQD) diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index a1cbd89d285..2c6e2159ff5 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2002/08/11 12:36:55 tron Exp $ +# $NetBSD: Makefile,v 1.41 2002/09/21 23:46:52 jlam Exp $ DISTNAME= fetchmail-5.9.13 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} @@ -25,6 +25,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf ${PREFIX}/bin ${LN} -s fetchmail.1 ${PREFIX}/man/man1/fetchmailconf.1 -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../x11/py-Tk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile index e1d6c0bc9aa..b0f71d203ab 100644 --- a/mail/getmail/Makefile +++ b/mail/getmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/01/18 15:57:42 drochner Exp $ +# $NetBSD: Makefile,v 1.8 2002/09/21 23:46:52 jlam Exp $ # DISTNAME= getmail-2.1.3 @@ -34,5 +34,5 @@ do-install: ${PREFIX}/libexec/getmail ${INSTALL_SCRIPT} ${WRKSRC}/getmail ${PREFIX}/bin -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 2d7363f4b61..ebb961bb5f1 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/08/28 19:48:33 bouyer Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:53 jlam Exp $ DISTNAME= mailman-2.0.12 CATEGORIES= mail www @@ -145,6 +145,6 @@ do-install: ${CHOWN} -R root ${EXECDIR} ${CHMOD} -R g-w ${EXECDIR} -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/queue_repair/Makefile b/mail/queue_repair/Makefile index 93a84cf60fe..d8745a5eec1 100644 --- a/mail/queue_repair/Makefile +++ b/mail/queue_repair/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/01/18 16:23:27 drochner Exp $ +# $NetBSD: Makefile,v 1.7 2002/09/21 23:46:53 jlam Exp $ # DISTNAME= queue-repair-0.8.4 @@ -15,5 +15,5 @@ PYTHON_PATCH_SCRIPTS= queue_repair.py do-install: ${INSTALL_SCRIPT} ${WRKSRC}/queue_repair.py ${PREFIX}/bin/queue_repair -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile index d480da07128..68251450266 100644 --- a/mail/tmda/Makefile +++ b/mail/tmda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/08/31 23:08:40 schmonz Exp $ +# $NetBSD: Makefile,v 1.9 2002/09/21 23:46:53 jlam Exp $ # DISTNAME= tmda-0.61 @@ -66,6 +66,6 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR} ${INSTALL_DATA} ${WRKSRC}/htdocs/*.html ${PREFIX}/${HTMLDIR} -.include "../../lang/python/extension.buildlink.mk" -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/extension.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile index 8c740134126..57ea6fac98b 100644 --- a/math/py-Numeric/Makefile +++ b/math/py-Numeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2002/01/15 18:38:05 drochner Exp $ +# $NetBSD: Makefile,v 1.27 2002/09/21 23:46:53 jlam Exp $ DISTNAME= Numeric-20.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,5 +14,5 @@ PYDISTUTILSPKG= yes PYBINMODULE= yes PYSETUP= setup_all.py -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile index 4d365d2e8da..8e812109859 100644 --- a/math/py-Scientific/Makefile +++ b/math/py-Scientific/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/01/17 12:02:25 drochner Exp $ +# $NetBSD: Makefile,v 1.13 2002/09/21 23:46:54 jlam Exp $ DISTNAME= ScientificPython-2.2 PKGNAME= ${PYPKGPREFIX}-Scientific-2.2 @@ -41,6 +41,6 @@ post-install: ${INSTALL_PROGRAM} ${WRKSRC}/Src/MPI/mpipython \ ${PREFIX}/bin/mpipython${PYVERSSUFFIX} -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../math/py-Numeric/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/mtail/Makefile b/misc/mtail/Makefile index 812ce0049ee..ca541a1011f 100644 --- a/misc/mtail/Makefile +++ b/misc/mtail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/01/18 14:16:53 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/21 23:46:54 jlam Exp $ # DISTNAME= mtail-1.0.0 @@ -19,5 +19,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mtail.README ${INSTALL_DATA} ${WRKSRC}/mtailrc.sample ${PREFIX}/share/examples -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ipcheck/Makefile b/net/ipcheck/Makefile index b9812ea4db6..65437126a54 100644 --- a/net/ipcheck/Makefile +++ b/net/ipcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/02/05 19:54:27 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:54 jlam Exp $ # DISTNAME= ipcheck.py @@ -21,5 +21,5 @@ PYTHON_PATCH_SCRIPTS= ipcheck.py do-install: ${INSTALL_SCRIPT} ${WRKSRC}/ipcheck.py ${PREFIX}/bin -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-IP/Makefile b/net/py-IP/Makefile index fd639f52c97..782a4265ccf 100644 --- a/net/py-IP/Makefile +++ b/net/py-IP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/29 16:24:39 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:54 jlam Exp $ DISTNAME= IPy-0.4 PKGNAME= ${PYPKGPREFIX}-IP-0.4 @@ -11,5 +11,5 @@ COMMENT= python module to handle IPv4 and IPv6 address PYDISTUTILSPKG= # defined -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-soaplib/Makefile b/net/py-soaplib/Makefile index d80c63ff7b9..fe2079d4274 100644 --- a/net/py-soaplib/Makefile +++ b/net/py-soaplib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/01/17 11:29:19 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2002/09/21 23:46:54 jlam Exp $ # DISTNAME= soaplib-0.8-20000621 @@ -21,5 +21,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/${PYSITELIB}; \ done -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-xmlrpclib/Makefile b/net/py-xmlrpclib/Makefile index 3eccc79781d..0e0da47e89e 100644 --- a/net/py-xmlrpclib/Makefile +++ b/net/py-xmlrpclib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/01/17 11:31:57 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2002/09/21 23:46:55 jlam Exp $ # DISTNAME= xmlrpc-0.9.8-990621 @@ -21,5 +21,5 @@ do-install: ${INSTALL_DATA} $$f ${PREFIX}/${PYSITELIB}; \ done -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/bg5pdf/Makefile b/print/bg5pdf/Makefile index 6e62df5a64d..a528e194286 100644 --- a/print/bg5pdf/Makefile +++ b/print/bg5pdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/07/12 20:13:39 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:55 jlam Exp $ # DISTNAME= bg5pdf-1.0.0 @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/bg5pdf post-extract: ${RM} -f ${WRKSRC}/bg5pdflib.so -.include "../../lang/python/application.buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/application.mk" +.include "../../lang/python/extension.mk" .include "../../print/pdflib/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/bg5ps/Makefile b/print/bg5ps/Makefile index ce84ba1bc8e..d6137d191f9 100644 --- a/print/bg5ps/Makefile +++ b/print/bg5ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/15 08:25:41 shell Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:55 jlam Exp $ DISTNAME= bg5ps-1.3.0 CATEGORIES= print converters @@ -17,6 +17,6 @@ post-patch: @${SED} 's|%%ETCDIR%%|${PKG_SYSCONFDIR}|g' \ ${WRKSRC}/bg5ps > ${WRKSRC}/bg5ps.new -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../graphics/freetype-lib/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index e632cbcec52..1493434a2bd 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/05/20 13:47:04 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2002/09/21 23:46:55 jlam Exp $ # DISTNAME= lilypond-1.4.13 @@ -23,7 +23,7 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN} PYTHON_VERSIONS_ACCEPTED= 20 21 # 22 has some regular expression problem .include "../../lang/guile/buildlink.mk" -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../print/teTeX-bin/kpathsea.buildlink.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index 3f5f704ca04..966d3c9061d 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/01/29 12:12:07 drochner Exp $ +# $NetBSD: Makefile,v 1.6 2002/09/21 23:46:55 jlam Exp $ # DISTNAME= ReportLab_1_01 @@ -39,5 +39,5 @@ do-install: (cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/reportlab \ -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/flawfinder/Makefile b/security/flawfinder/Makefile index 891e288bbfe..345dee22041 100644 --- a/security/flawfinder/Makefile +++ b/security/flawfinder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/07/14 13:02:23 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:56 jlam Exp $ # DISTNAME= flawfinder-1.20 @@ -20,6 +20,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/flawfinder ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/flawfinder.1 ${PREFIX}/man/man1 -.include "../../lang/python/application.buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/application.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/fsh/Makefile b/security/fsh/Makefile index e5000a72691..72b7f221802 100644 --- a/security/fsh/Makefile +++ b/security/fsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:39 seb Exp $ +# $NetBSD: Makefile,v 1.8 2002/09/21 23:46:56 jlam Exp $ # DISTNAME= fsh-1.1 @@ -14,6 +14,6 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-amkCrypto/Makefile b/security/py-amkCrypto/Makefile index 66aa3a8bc79..7fdac023526 100644 --- a/security/py-amkCrypto/Makefile +++ b/security/py-amkCrypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/06/17 10:27:57 itojun Exp $ +# $NetBSD: Makefile,v 1.5 2002/09/21 23:46:56 jlam Exp $ # DISTNAME= amkCrypto-0.1.3 @@ -22,5 +22,5 @@ do-configure: ${MV} -f ${WRKSRC}/setup.py.tmp ${WRKSRC}/setup.py .include "../../security/openssl/buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-cryptkit/Makefile b/security/py-cryptkit/Makefile index 53a17aef542..ee4ef1e4bf2 100644 --- a/security/py-cryptkit/Makefile +++ b/security/py-cryptkit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/29 16:23:31 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:56 jlam Exp $ DISTNAME= cryptkit-0.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,5 +12,5 @@ COMMENT= python Cryptographic Toolkit PYBINMODULE= yes PYDISTUTILSPKG= yes -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile index db2e299c9e7..ba7fce0fe68 100644 --- a/security/py-gnupg/Makefile +++ b/security/py-gnupg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/29 16:15:47 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:57 jlam Exp $ DISTNAME= GnuPGInterface-0.3.2 PKGNAME= ${PYPKGPREFIX}-gnupg-0.3.2 @@ -14,5 +14,5 @@ DEPENDS+= gnupg>=1.0.0:../../security/gnupg PYTHON_VERSIONS_ACCEPTED= 21 PYDISTUTILSPKG= yes -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-edit/Makefile b/sysutils/rox-edit/Makefile index dafb8d981b4..ffe443f49d0 100644 --- a/sysutils/rox-edit/Makefile +++ b/sysutils/rox-edit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/06/01 20:11:45 cjep Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:57 jlam Exp $ # DISTNAME= Edit-0.1.2 @@ -34,6 +34,6 @@ pre-install: do-install: ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../x11/pygtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-lib/Makefile b/sysutils/rox-lib/Makefile index 38493ce1bfa..0648588a680 100644 --- a/sysutils/rox-lib/Makefile +++ b/sysutils/rox-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/06/01 19:03:55 cjep Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:58 jlam Exp $ # DISTNAME= ROX-Lib-0.1.4 @@ -35,6 +35,6 @@ pre-install: do-install: ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../x11/pygtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-memo/Makefile b/sysutils/rox-memo/Makefile index c25c9cc2ec7..c5acfd48bad 100644 --- a/sysutils/rox-memo/Makefile +++ b/sysutils/rox-memo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/06/02 08:46:16 cjep Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:58 jlam Exp $ # DISTNAME= Memo-1.0.0 @@ -34,6 +34,6 @@ pre-install: do-install: ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../x11/pygtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/rox-wallpaper/Makefile b/sysutils/rox-wallpaper/Makefile index 916885ef412..b6d0bc01de5 100644 --- a/sysutils/rox-wallpaper/Makefile +++ b/sysutils/rox-wallpaper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/06/02 08:51:44 cjep Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:58 jlam Exp $ # DISTNAME= Wallpaper-0.1.1 @@ -35,6 +35,6 @@ pre-install: do-install: ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../x11/pygtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile index 3ed04385612..b5d77811a9f 100644 --- a/sysutils/tdir/Makefile +++ b/sysutils/tdir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/01/18 11:04:04 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2002/09/21 23:46:58 jlam Exp $ # DISTNAME= tdir-1.58 @@ -12,5 +12,5 @@ LICENSE= tdir-license PYTHON_PATCH_SCRIPTS= tdir -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-FourSuite/Makefile b/textproc/py-FourSuite/Makefile index 321db605d9c..ae301ad9128 100644 --- a/textproc/py-FourSuite/Makefile +++ b/textproc/py-FourSuite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/08/22 10:30:27 drochner Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:58 jlam Exp $ # DISTNAME= 4Suite-0.12.0a2 @@ -17,5 +17,5 @@ PY_PATCHPLIST= yes #pyxml is needed at runtime to get pyexpat #.include "../../textproc/py-xml-base/buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile index 703be52fe1f..8386a81c5b2 100644 --- a/textproc/py-HappyDoc/Makefile +++ b/textproc/py-HappyDoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/29 16:26:44 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:59 jlam Exp $ DISTNAME= HappyDoc_r2_0 PKGNAME= ${PYPKGPREFIX}-HappyDoc-2.0 @@ -18,5 +18,5 @@ WRKSRC= ${WRKDIR}/HappyDoc-r2_0 post-extract: ${MV} ${WRKSRC}/happydoc ${WRKSRC}/happydoc${PYVERSSUFFIX} -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/pyDict/Makefile b/textproc/pyDict/Makefile index 4a681edc942..cffb8ae59d0 100644 --- a/textproc/pyDict/Makefile +++ b/textproc/pyDict/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/15 09:55:53 shell Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:59 jlam Exp $ DISTNAME= pyDict-0.2.5.1 CATEGORIES= textproc @@ -27,6 +27,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/COPYING ${WRKSRC}/README ${PREFIX}/share/doc/pyDict ${INSTALL_SCRIPT} ${WRKSRC}/dict.py ${PREFIX}/bin/pydict -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../x11/pygtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/pyxml/Makefile b/textproc/pyxml/Makefile index a2262be00d1..d8f6f3c9218 100644 --- a/textproc/pyxml/Makefile +++ b/textproc/pyxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/09/18 11:54:06 drochner Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/21 23:46:59 jlam Exp $ # DISTNAME= PyXML-0.8.1 @@ -30,6 +30,6 @@ PYTHON_PATCH_SCRIPTS= ${PYXML_SCRIPTS:S/$/${PYVERSSUFFIX}/g} PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} .include "../../textproc/expat/buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/extension.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/py-mxDateTime/Makefile b/time/py-mxDateTime/Makefile index afc9e9325b3..c0087d82bd9 100644 --- a/time/py-mxDateTime/Makefile +++ b/time/py-mxDateTime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/02/25 04:47:23 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/09/21 23:46:59 jlam Exp $ # DISTNAME= mxDateTime-1.3.0 @@ -38,5 +38,5 @@ do-install: ${WRKSRC}/mxDateTime/__init__.py* \ ${PREFIX}/${PYSITELIB}/DateTime/mxDateTime -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile index a82d4c26ee2..5f5f7037711 100644 --- a/www/ap-python/Makefile +++ b/www/ap-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/02/28 18:32:19 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:47:00 jlam Exp $ # DISTNAME= mod_python-2.7.6 @@ -32,6 +32,6 @@ post-install: share/doc/html/ap-mod_python \ -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC} ) -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../www/apache/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/grail/Makefile b/www/grail/Makefile index 66b0ae696ea..f4ead2933c3 100644 --- a/www/grail/Makefile +++ b/www/grail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/05/12 10:16:51 abs Exp $ +# $NetBSD: Makefile,v 1.15 2002/09/21 23:47:00 jlam Exp $ # DISTNAME= grail-0.6 @@ -32,6 +32,6 @@ do-install: (cd ${PREFIX}; ${FIND} -d ${GRAILDIR} -type d -print | \ ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../x11/py-Tk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile index 32ace61571c..deda2bdae35 100644 --- a/www/py-HTMLgen/Makefile +++ b/www/py-HTMLgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/02/05 19:44:53 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:47:00 jlam Exp $ # DISTNAME= HTMLgen @@ -16,5 +16,5 @@ NO_BUILD= yes MAKE_ENV+= PYTHONBIN=${PYTHONBIN} PY_PATCHPLIST= yes -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile index 6fbaf674b0c..d1e1dcf6189 100644 --- a/www/py-curl/Makefile +++ b/www/py-curl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/06/10 01:47:15 shell Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/21 23:47:00 jlam Exp $ DISTNAME= pycurl-7.9.7 PKGNAME= ${PYPKGPREFIX}-curl-7.9.7 @@ -14,5 +14,5 @@ DEPENDS+= curl>=7.9.7:../../www/curl PYDISTUTILSPKG= # defined PYBINMODULE= # defined -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/zope/Makefile b/www/zope/Makefile index bb447bf3a40..cef3635c7e9 100644 --- a/www/zope/Makefile +++ b/www/zope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2002/01/22 18:47:14 drochner Exp $ +# $NetBSD: Makefile,v 1.18 2002/09/21 23:47:00 jlam Exp $ # DISTNAME= Zope-2.2.2-src @@ -46,5 +46,5 @@ do-install: <${FILESDIR}/zope-shutdown.py >${PREFIX}/sbin/zope-shutdown ${CHMOD} 755 ${PREFIX}/sbin/zope-install ${PREFIX}/sbin/zope-shutdown -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/zope25/Makefile b/www/zope25/Makefile index fc741fc5d8d..18ac2ef0394 100644 --- a/www/zope25/Makefile +++ b/www/zope25/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/08/22 16:54:48 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:47:01 jlam Exp $ # DISTNAME= Zope-2.5.1-src @@ -48,5 +48,5 @@ do-install: (cd ${ZOPEDIR}; ${PYTHONBIN} ${WRKSRC}/inst/compilezpy.py) (cd ${WRKSRC}; ${PAX} -r -w ${ZOPEDATA} ${ZOPEDIR}) -.include "../../lang/python/application.buildlink.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile index bc6f8058107..cd9241d7b94 100644 --- a/x11/gnome-python/Makefile +++ b/x11/gnome-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2002/09/10 16:06:52 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2002/09/21 23:47:01 jlam Exp $ DISTNAME= gnome-python-1.4.0 PKGNAME= ${PYPKGPREFIX}-gnome-1.4.0 @@ -38,6 +38,6 @@ post-configure: .endfor .endif -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../x11/gnome-core/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-Pmw/Makefile b/x11/py-Pmw/Makefile index 0bf4fe9e2aa..eefa1c7fade 100644 --- a/x11/py-Pmw/Makefile +++ b/x11/py-Pmw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/01/28 17:35:39 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/21 23:47:01 jlam Exp $ # DISTNAME= Pmw.0.8.5 @@ -25,6 +25,6 @@ do-install: (cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/Pmw \ -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../x11/py-Tk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index 7f58cc7763d..784448f7ebb 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/01/31 15:48:10 drochner Exp $ +# $NetBSD: Makefile,v 1.21 2002/09/21 23:47:01 jlam Exp $ # PKGNAME= ${PYPKGPREFIX}-Tk-0 @@ -34,7 +34,7 @@ post-install: -e "s|@X11BASE@|${X11BASE}|g" \ <${FILESDIR}/Setup.in >${PREFIX}/${PYLIB}/config/Setup.tk -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../lang/python/srcdist.mk" .include "../../lang/tcl/buildlink.mk" .include "../../x11/tk/buildlink.mk" diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile index d3b21dc50a7..62a0463cfbb 100644 --- a/x11/py-qt2-sip/Makefile +++ b/x11/py-qt2-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/09/20 22:46:08 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:47:01 jlam Exp $ # DISTNAME= sip-3.1 @@ -24,7 +24,7 @@ PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX} -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../x11/qt2-libs/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile index 7df0c7fc7a8..72a2d6bd39d 100644 --- a/x11/py-qt2/Makefile +++ b/x11/py-qt2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/17 10:31:36 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 23:47:02 jlam Exp $ # DISTNAME= PyQt-3.1-Qt-2.3.1 @@ -11,21 +11,23 @@ MAINTAINER= drochner@netbsd.org HOMEPAGE= http://www.riverbankcomputing.co.uk/pyqt/index.php COMMENT= Python bindings for the Qt tooltit -USE_LIBTOOL= yes +USE_BUILDLINK2= # defined +USE_X11= # defined +USE_LIBTOOL= # defined LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -USE_BUILDLINK_ONLY= yes -HAVE_CONFIGURE= YES -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-python=${PYTHONBIN} \ - --with-qt-dir=${QT_BUILDLINK_DIR} +HAVE_CONFIGURE= # defined +GNU_CONFIGURE= # defined +CONFIGURE_ARGS= --with-python=${PYTHONBIN} \ + --with-qt-dir=${QTDIR} PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX} -.include "../../x11/py-qt2-sip/buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../lang/python/extension.mk" + +.include "../../x11/py-qt2-sip/buildlink2.mk" +.include "../../x11/qt2-libs/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile index 7e81565b375..2b3589802d7 100644 --- a/x11/py-wxWindows/Makefile +++ b/x11/py-wxWindows/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:59 fredb Exp $ +# $NetBSD: Makefile,v 1.11 2002/09/21 23:47:02 jlam Exp $ # DISTNAME= wxPython-2.2.2 @@ -31,5 +31,5 @@ post-install: -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) .include "../../x11/wxGTK/buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile index 987b945152d..88cc3a48d2c 100644 --- a/x11/pygtk/Makefile +++ b/x11/pygtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:59 fredb Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 23:47:02 jlam Exp $ # DISTNAME= pygtk-0.6.9 @@ -24,6 +24,6 @@ PY_PATCHPLIST= yes .include "../../graphics/imlib/buildlink.mk" .include "../../graphics/gdk-pixbuf/buildlink.mk" .include "../../devel/libglade/buildlink.mk" -.include "../../lang/python/extension.buildlink.mk" +.include "../../lang/python/extension.mk" .include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" |