diff options
-rw-r--r-- | german/trytond28_account_de_skr03/Makefile | 5 | ||||
-rw-r--r-- | german/trytond_account_de_skr03/Makefile | 5 | ||||
-rw-r--r-- | japanese/ibus-anthy/Makefile | 3 | ||||
-rw-r--r-- | japanese/ibus-skk/Makefile | 3 | ||||
-rw-r--r-- | japanese/kana-no-quiz/Makefile | 5 | ||||
-rw-r--r-- | japanese/libtomoe-gtk/Makefile | 2 | ||||
-rw-r--r-- | japanese/mailman/Makefile | 3 | ||||
-rw-r--r-- | japanese/py-mecab/Makefile | 4 | ||||
-rw-r--r-- | japanese/py-tegaki-gtk/Makefile | 4 | ||||
-rw-r--r-- | japanese/py-tegaki/Makefile | 4 | ||||
-rw-r--r-- | japanese/py-zinnia/Makefile | 4 | ||||
-rw-r--r-- | japanese/tegaki-recognize/Makefile | 4 | ||||
-rw-r--r-- | java/eclipse-pydev/Makefile | 3 | ||||
-rw-r--r-- | ports-mgmt/fastest_sites/Makefile | 3 | ||||
-rw-r--r-- | ports-mgmt/gnome-packagekit/Makefile | 3 | ||||
-rw-r--r-- | ports-mgmt/pkg-plist/Makefile | 2 | ||||
-rw-r--r-- | ports-mgmt/pkg_trackinst/Makefile | 2 | ||||
-rw-r--r-- | ports-mgmt/portbuilder/Makefile | 5 | ||||
-rw-r--r-- | ports-mgmt/portell/Makefile | 3 | ||||
-rw-r--r-- | ports-mgmt/porttree/Makefile | 3 |
20 files changed, 29 insertions, 41 deletions
diff --git a/german/trytond28_account_de_skr03/Makefile b/german/trytond28_account_de_skr03/Makefile index 86b9baa5d654..5108ef75b7a4 100644 --- a/german/trytond28_account_de_skr03/Makefile +++ b/german/trytond28_account_de_skr03/Makefile @@ -18,8 +18,7 @@ RUN_DEPENDS= trytond28_account>=2.8.1:${PORTSDIR}/finance/trytond28_account CONFLICTS= trytond_account_de_skr03-2.[46].* -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/german/trytond_account_de_skr03/Makefile b/german/trytond_account_de_skr03/Makefile index cc40e85ae9ec..966e210f97e7 100644 --- a/german/trytond_account_de_skr03/Makefile +++ b/german/trytond_account_de_skr03/Makefile @@ -17,8 +17,7 @@ RUN_DEPENDS= trytond>=2.4.0:${PORTSDIR}/finance/trytond \ CONFLICTS= trytond28_account_de_skr03-2.8.* -USE_PYTHON= yes -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +USES= python +USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile index 719335fb8245..2739109497b3 100644 --- a/japanese/ibus-anthy/Makefile +++ b/japanese/ibus-anthy/Makefile @@ -18,8 +18,7 @@ LIB_DEPENDS= libanthy.so:${PORTSDIR}/japanese/anthy \ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:${PORTSDIR}/devel/py-notify GNU_CONFIGURE= yes -USES= libtool gettext gmake pkgconfig -USE_PYTHON= yes +USES= libtool gettext gmake pkgconfig python USE_GNOME= pygtk2 LOCALBASE_REPLACE_FILES= \ diff --git a/japanese/ibus-skk/Makefile b/japanese/ibus-skk/Makefile index 070bc3f524d4..98b47c2cbf74 100644 --- a/japanese/ibus-skk/Makefile +++ b/japanese/ibus-skk/Makefile @@ -14,8 +14,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/skk/SKK-JISYO.L:${PORTSDIR}/japanese/skk-jisyo LIB_DEPENDS= libskk.so:${PORTSDIR}/japanese/libskk \ libibus-1.0.so:${PORTSDIR}/textproc/ibus -USE_PYTHON= yes -USES= gettext gmake pkgconfig +USES= gettext gmake pkgconfig python USE_GNOME= intltool GNU_CONFIGURE= yes CONFIGURE_ENV+= DATADIRNAME=share diff --git a/japanese/kana-no-quiz/Makefile b/japanese/kana-no-quiz/Makefile index ccb2fe49c240..f3862f995956 100644 --- a/japanese/kana-no-quiz/Makefile +++ b/japanese/kana-no-quiz/Makefile @@ -20,9 +20,8 @@ NO_BUILD= yes RM_FILES= CHANGES.txt FAL.txt GPL.txt RM_OPTS= -f -USES= gettext -USE_PYTHON= yes -USE_PYDISTUTILS=yes +USES= gettext python +USE_PYTHON= distutils PYDISTUTILS_PKGNAME= Kana-no-quiz WRKSRC= "${WRKDIR}/Kana no quiz-${DISTVERSION}" diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile index 1308fe4e2336..49fe6aa63f87 100644 --- a/japanese/libtomoe-gtk/Makefile +++ b/japanese/libtomoe-gtk/Makefile @@ -31,7 +31,7 @@ PLIST_SUB+= GUCHARMAP="@comment " #.endif .if exists(${LOCALBASE}/libdata/pkgconfig/pytomoe.pc) -USE_PYTHON= yes +USES+= python CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S;python;;} \ pyexecdir=${PYTHON_SITELIBDIR} PLIST_SUB+= PYTHON="" diff --git a/japanese/mailman/Makefile b/japanese/mailman/Makefile index e81018c40e52..e4279ad02bb7 100644 --- a/japanese/mailman/Makefile +++ b/japanese/mailman/Makefile @@ -23,8 +23,7 @@ CONFLICTS= mailman-2.1.* PORTSCOUT= limit:.*\.j\d+$$ USE_AUTOTOOLS= autoconf -USES= gettext tar:tgz -USE_PYTHON= 2 +USES= gettext python:2 tar:tgz USE_RC_SUBR= mailman GNU_CONFIGURE_PREFIX= ${MAILMANDIR} diff --git a/japanese/py-mecab/Makefile b/japanese/py-mecab/Makefile index 3ae88172f2bd..936675b11ed6 100644 --- a/japanese/py-mecab/Makefile +++ b/japanese/py-mecab/Makefile @@ -16,8 +16,8 @@ LICENSE_COMB= dual BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS= libmecab.so:${PORTSDIR}/japanese/mecab -USE_PYTHON= yes -USE_PYDISTUTILS=yes +USES= python +USE_PYTHON= distutils PYDISTUTILS_EGGINFO= ${PORTNAME}_python-${PKGVERSION}-${PYTHON_VERSION:S/thon//}.egg-info pre-patch: diff --git a/japanese/py-tegaki-gtk/Makefile b/japanese/py-tegaki-gtk/Makefile index c9ba3db5a364..cf69fbda3658 100644 --- a/japanese/py-tegaki-gtk/Makefile +++ b/japanese/py-tegaki-gtk/Makefile @@ -17,8 +17,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libzinnia.so:${PORTSDIR}/japanese/zinnia RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegaki/engine.py:${PORTSDIR}/japanese/py-tegaki -USE_PYTHON= yes -USE_PYDISTUTILS= yes +USES= python +USE_PYTHON= distutils PYDISTUTILS_PKGNAME= ${PORTNAME}_pygtk .include <bsd.port.mk> diff --git a/japanese/py-tegaki/Makefile b/japanese/py-tegaki/Makefile index d1e3dbe10c75..e67311ecdddc 100644 --- a/japanese/py-tegaki/Makefile +++ b/japanese/py-tegaki/Makefile @@ -16,8 +16,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libzinnia.so:${PORTSDIR}/japanese/zinnia RUN_DEPENDS= ${PYTHON_SITELIBDIR}/zinnia.py:${PORTSDIR}/japanese/py-zinnia -USE_PYTHON= yes -USE_PYDISTUTILS= yes +USES= python +USE_PYTHON= distutils PYDISTUTILS_PKGNAME= ${PORTNAME}_python .include <bsd.port.mk> diff --git a/japanese/py-zinnia/Makefile b/japanese/py-zinnia/Makefile index c1df8a96356a..bfa8a3628f72 100644 --- a/japanese/py-zinnia/Makefile +++ b/japanese/py-zinnia/Makefile @@ -16,8 +16,8 @@ RUN_DEPENDS= zinnia:${PORTSDIR}/japanese/zinnia LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYING -USE_PYTHON= yes -USE_PYDISTUTILS=yes +USES= python +USE_PYTHON= distutils PYDISTUTILS_PKGNAME= ${PORTNAME}_python PYDISTUTILS_PKGVERSION= 0.0.0 diff --git a/japanese/tegaki-recognize/Makefile b/japanese/tegaki-recognize/Makefile index 0cf263f39540..5d083a8aee18 100644 --- a/japanese/tegaki-recognize/Makefile +++ b/japanese/tegaki-recognize/Makefile @@ -18,8 +18,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegakigtk/recognizer.py:${PORTSDIR}/japanese/p OPTIONS_DEFINE= DOCS -USE_PYTHON= 2 -USE_PYDISTUTILS= yes +USES= python:2 +USE_PYTHON= distutils PYDISTUTILS_PKGNAME= ${PORTNAME}_recognize post-install: diff --git a/java/eclipse-pydev/Makefile b/java/eclipse-pydev/Makefile index d11b76b073e1..61cc0f423edb 100644 --- a/java/eclipse-pydev/Makefile +++ b/java/eclipse-pydev/Makefile @@ -27,8 +27,7 @@ OPTIONS_DEFINE= JYTHON PLUGINDIR= share/eclipse/dropins/pydev/eclipse/plugins PYDEV_BUNDLES_INFO= ${PREFIX}/${PLUGINDIR}/bundles.info -USE_PYTHON= yes -USES= zip +USES= python zip .include <bsd.port.options.mk> diff --git a/ports-mgmt/fastest_sites/Makefile b/ports-mgmt/fastest_sites/Makefile index 0146b828bc1c..42a6b0a4994b 100644 --- a/ports-mgmt/fastest_sites/Makefile +++ b/ports-mgmt/fastest_sites/Makefile @@ -10,8 +10,7 @@ EXTRACT_SUFX= # nada MAINTAINER= wxs@FreeBSD.org COMMENT= Sort MASTER_SITE_* based upon TCP handshake times -USES= shebangfix -USE_PYTHON= yes +USES= python shebangfix NO_BUILD= yes PLIST_FILES= bin/fastest_sites diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile index d0764a6821aa..584002a6cd12 100644 --- a/ports-mgmt/gnome-packagekit/Makefile +++ b/ports-mgmt/gnome-packagekit/Makefile @@ -21,8 +21,7 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ USE_GNOME= gnomeprefix intlhack gconf2 gnomemenus gnomedocutils USES= desktop-file-utils gettext iconv pathfix gmake pkgconfig \ - tar:bzip2 -USE_PYTHON_BUILD=2 + python:2,build tar:bzip2 GCONF_SCHEMAS= gnome-packagekit.schemas INSTALLS_ICONS= yes INSTALLS_OMF= yes diff --git a/ports-mgmt/pkg-plist/Makefile b/ports-mgmt/pkg-plist/Makefile index 3feafedd4aa8..447a3b59751e 100644 --- a/ports-mgmt/pkg-plist/Makefile +++ b/ports-mgmt/pkg-plist/Makefile @@ -11,7 +11,7 @@ COMMENT= Generate a pkg-plist for a port LICENSE= MIT -USE_PYTHON= yes +USES= python NO_BUILD= yes PLIST_FILES= bin/pkg-plist man/man1/pkg-plist.1.gz diff --git a/ports-mgmt/pkg_trackinst/Makefile b/ports-mgmt/pkg_trackinst/Makefile index 6d6f81ff199a..5271e4373e94 100644 --- a/ports-mgmt/pkg_trackinst/Makefile +++ b/ports-mgmt/pkg_trackinst/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://people.freebsd.org/~perky/distfiles/ MAINTAINER= olgeni@FreeBSD.org COMMENT= PkgDB/pkg-plist generator by tracking installation -USE_PYTHON= yes +USES= python MAKE_ENV= PYTHON_CMD=${PYTHON_CMD} STAGEDIR=${STAGEDIR} PLIST_SUB+= PYTHON_VER=${PYTHON_VER} VERSION=${PORTVERSION} diff --git a/ports-mgmt/portbuilder/Makefile b/ports-mgmt/portbuilder/Makefile index f26a1ecd5e58..01cb595d2a17 100644 --- a/ports-mgmt/portbuilder/Makefile +++ b/ports-mgmt/portbuilder/Makefile @@ -12,9 +12,8 @@ COMMENT= Concurrent FreeBSD port builder LICENSE= BSD2CLAUSE -USE_PYTHON= yes -USE_PYDISTUTILS=yes -USES= tar:xz +USE_PYTHON= distutils +USES= python tar:xz PORTDOCS= BUGS ChangeLog COPYRIGHT README diff --git a/ports-mgmt/portell/Makefile b/ports-mgmt/portell/Makefile index 1cb1e935f5b4..009295e0f2b6 100644 --- a/ports-mgmt/portell/Makefile +++ b/ports-mgmt/portell/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} MAINTAINER= mich@FreeBSD.org COMMENT= Quick display of FreeBSD port descriptions -USES= zip -USE_PYTHON= yes +USES= python zip NO_BUILD= yes PLIST_FILES= bin/portell diff --git a/ports-mgmt/porttree/Makefile b/ports-mgmt/porttree/Makefile index 121bce4c76fe..c28681b357cf 100644 --- a/ports-mgmt/porttree/Makefile +++ b/ports-mgmt/porttree/Makefile @@ -11,8 +11,7 @@ COMMENT= Show dependences of FreeBSD port as pseudo graphical tree LICENSE= MIT -USES= tar:bzip2 -USE_PYTHON= yes +USES= python tar:bzip2 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}networkx>=1.5:${PORTSDIR}/math/py-networkx |