diff options
| -rw-r--r-- | french/aster/Makefile | 6 | ||||
| -rw-r--r-- | www/chromium/Makefile | 14 | ||||
| -rw-r--r-- | www/iridium/Makefile | 10 |
3 files changed, 16 insertions, 14 deletions
diff --git a/french/aster/Makefile b/french/aster/Makefile index aeda99fa77d6..19735fc2ee92 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -3,6 +3,7 @@ PORTNAME= aster DISTVERSION= ${ASTER_DISTVERSION} +PORTREVISION= 1 CATEGORIES= french cad CATEGORIES= french cad @@ -37,7 +38,6 @@ BUILD_DEPENDS+= astk-serveur>0:cad/astk-serveur \ ${LOCALBASE}/lib/libGKlib.a:math/metis-edf \ pylupdate4:textproc/py-qt4-xml \ gnproc:sysutils/coreutils \ - python:lang/python \ bash:shells/bash \ ${PYNUMPY} LIB_DEPENDS+= libhdf5-18.so:science/hdf5-18 \ @@ -52,7 +52,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot@${PY_FLAVOR} \ BROKEN_FreeBSD_12= does not build (sed: ${STAGEDIR}${inst_dir}/${VE}/aster.conf: No such file or directory) -USES= bison fortran gettext python:2 tk +USES= bison fortran gettext python:2.7 tk USE_BINUTILS= yes USE_QT4= linguisttools_build @@ -69,6 +69,8 @@ MAKE_ENV= INCLUDES="${LOCALBASE}/include/hdf5-18 ${LOCALBASE}/include" \ LINKFLAGS="${LDFLAGS}" LD_LIBRARY_PATH="${LOCALBASE}/lib/gcc${_GCC_VER}" REINPLACE_ARGS= -i "" +BINARY_ALIAS= python=${PYTHON_CMD} + VER= ${PORTVERSION:R} VE= ${VER:R} WRKSRC= ${WRKDIR}/${PORTNAME}-full-src-${VER} diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 17ca75be889d..48e87a3c87ce 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -14,8 +14,7 @@ COMMENT?= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi -BUILD_DEPENDS= python:lang/python \ - bash:shells/bash \ +BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ @@ -69,12 +68,13 @@ ONLY_FOR_ARCHS= aarch64 amd64 i386 .endif .if defined(GN_ONLY) -USES= compiler:c++14-lang ninja pkgconfig python:2,build shebangfix tar:xz +USES= compiler:c++14-lang ninja pkgconfig python:2.7,build shebangfix tar:xz .else USES= bison cpe desktop-file-utils jpeg ninja perl5 pkgconfig \ - python:2,build shebangfix tar:xz + python:2.7,build shebangfix tar:xz .endif MAKE_ARGS= -C out/${BUILDTYPE} +BINARY_ALIAS= python=${PYTHON_CMD} .if !defined(GN_ONLY) CPE_VENDOR= google @@ -231,18 +231,18 @@ pre-configure: # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] - cd ${WRKSRC} && ${PYTHON_CMD} \ + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE} .endif do-configure: # GN generator bootstrapping and generating ninja files - cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} LD=${CXX} \ + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} .if !defined(GN_ONLY) - cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \ + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 26aee6228cd3..3159066196e1 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -18,7 +18,6 @@ LICENSE_COMB= multi BUILD_DEPENDS= gperf:devel/gperf \ clang50:devel/llvm50 \ yasm:devel/yasm \ - python:lang/python \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ bash:shells/bash \ flock:sysutils/flock \ @@ -62,7 +61,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ ONLY_FOR_ARCHS= amd64 i386 USES= bison desktop-file-utils jpeg ninja perl5 \ - pkgconfig python:2,build shebangfix tar:xz + pkgconfig python:2.7,build shebangfix tar:xz USE_PERL5= build USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ @@ -71,6 +70,7 @@ USE_GNOME= atk dconf glib20 gtk20 gtk30 libxml2 libxslt MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome INSTALLS_ICONS= yes +BINARY_ALIAS= python=${PYTHON_CMD} CC= clang50 CXX= clang++50 @@ -186,16 +186,16 @@ pre-configure: # system libraries and not shippen ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] - cd ${WRKSRC} && ${PYTHON_CMD} \ + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac harfbuzz-ng libwebp libxml libxslt snappy yasm || ${FALSE} do-configure: # GN generator bootstrapping and generating ninja files - cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} LD=${CXX} \ + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} - cd ${WRKSRC} && ${SETENV} ./out/${BUILDTYPE}/gn \ + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency |