diff --git a/databases/proxysql/Makefile b/databases/proxysql/Makefile index 7741ea538d32..1a1f045d7791 100644 --- a/databases/proxysql/Makefile +++ b/databases/proxysql/Makefile @@ -1,70 +1,70 @@ PORTNAME= proxysql PORTVERSION= 2.6.6 CATEGORIES= databases MAINTAINER= zi@FreeBSD.org COMMENT= High performance, high availability, protocol-aware proxy for MySQL WWW= https://www.proxysql.com/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= configure: error: Unsupported pointer size: 0 BUILD_DEPENDS= aclocal:devel/automake \ autoreconf:devel/autoconf \ bash:shells/bash \ cmake:devel/cmake-core \ - ${LOCALBASE}/bin/grep:textproc/gnugrep \ + ggrep:textproc/gnugrep \ libgcrypt>0:security/libgcrypt \ libtoolize:devel/libtool \ e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \ gnutls>0:security/gnutls RUN_DEPENDS= libgcrypt>0:security/libgcrypt \ e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \ gnutls>0:security/gnutls USES= compiler:c++11-lang gmake libtool perl5 python:build shebangfix USE_PERL5= build USE_GCC= yes MAKE_ENV= GIT_VERSION=${PORTVERSION} USE_GITHUB= yes ALL_TARGET= build_deps default SHEBANG_FILES= deps/libssl/verify-bio_st-match.sh LDFLAGS+= -L${LOCALBASE}/lib BINARY_ALIAS= python3=${PYTHON_CMD} USE_RC_SUBR= ${PORTNAME} USERS= ${PORTNAME} GROUPS= ${PORTNAME} GH_ACCOUNT= sysown post-patch: @${REINPLACE_CMD} -e 's,/etc/,${ETCDIR}/,g' ${WRKSRC}/lib/ProxySQL_GloVars.cpp @${REINPLACE_CMD} \ -e 's,/var/lib,/var/db,g' \ -e '7s/^/errorlog="\/var\/log\/proxysql\/proxysql-error.log"\n\n/g' \ -e '7s/^/pidfile="\/var\/run\/${PORTNAME}\/${PORTNAME}.pid"\n/g' \ ${WRKSRC}/src/proxysql.cfg @${REINPLACE_CMD} \ - -e 's,grep -P,${LOCALBASE}/bin/grep -P,g' \ + -e 's,grep -P,g&,' \ -e '/ export C/d' \ -e 's,PROXYSQLCLICKHOUSE=1 ,,g' \ -e 's,--enable-fastopen=false ,--enable-fastopen=false --enable-shared=no ,g' \ ${WRKSRC}/Makefile ${WRKSRC}/deps/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/proxysql ${STAGEDIR}${LOCALBASE}/sbin post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/db/${PORTNAME} \ ${STAGEDIR}/var/run/${PORTNAME} \ ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \ ${STAGEDIR}/var/log/${PORTNAME} ${INSTALL_DATA} ${FILESDIR}/proxysql.conf-newsyslog \ ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/proxysql.conf.sample ${INSTALL_DATA} ${WRKSRC}/src/proxysql.cfg \ ${STAGEDIR}${ETCDIR}/proxysql.cfg.sample .include diff --git a/devel/argobots/Makefile b/devel/argobots/Makefile index a5cc7b8f72bb..acd42843fb9e 100644 --- a/devel/argobots/Makefile +++ b/devel/argobots/Makefile @@ -1,38 +1,38 @@ PORTNAME= argobots DISTVERSIONPREFIX= v DISTVERSION= 1.2 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= Lightweight, low-level threading and tasking framework WWW= https://www.argobots.org/ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -BUILD_DEPENDS= ${LOCALBASE}/bin/grep:textproc/gnugrep # workaround for https://github.com/pmodels/argobots/issues/375 +BUILD_DEPENDS= ggrep:textproc/gnugrep # workaround for https://github.com/pmodels/argobots/issues/375 USES= autoreconf gmake libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= pmodels INSTALL_TARGET= install-strip -BINARY_ALIAS= grep=${LOCALBASE}/bin/grep # for https://github.com/pmodels/argobots/issues/375 +BINARY_ALIAS= grep=ggrep # for https://github.com/pmodels/argobots/issues/375 PLIST_FILES= include/abt.h \ lib/libabt.a \ lib/libabt.so \ lib/libabt.so.1 \ lib/libabt.so.1.1.0 \ libdata/pkgconfig/argobots.pc do-test: # at least one test never finishes, see https://github.com/pmodels/argobots/issues/376 @cd ${WRKSRC}/test && \ ${GMAKE} check .include diff --git a/devel/xtensa-esp-elf/Makefile b/devel/xtensa-esp-elf/Makefile index 056c6d097cd7..07556b5beb45 100644 --- a/devel/xtensa-esp-elf/Makefile +++ b/devel/xtensa-esp-elf/Makefile @@ -1,178 +1,178 @@ PORTNAME= xtensa-esp-elf DISTVERSION= 13.2.0_20240530 PORTREVISION= 7 CATEGORIES= devel MASTER_SITES= https://github.com/espressif/crosstool-NG/releases/download/esp-${DISTVERSION}/:source1 \ GNU/gmp:source2 \ https://libisl.sourceforge.io/:source3 \ GNU/mpc:source4 \ GNU/mpfr:source5 \ https://github.com/madler/zlib/releases/download/v1.2.13/:source6 \ https://github.com/facebook/zstd/releases/download/v1.5.5/:source7 DISTNAME= crosstool-NG-esp-${DISTVERSION}-src EXTRACT_SUFX= .tar.xz DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source1 \ gmp-6.2.1.tar.bz2:source2 \ isl-0.26.tar.gz:source3 \ mpc-1.2.1.tar.gz:source4 \ mpfr-4.2.1.zip:source5 \ zlib-1.2.13.tar.xz:source6 \ zstd-1.5.5.tar.gz:source7 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ espressif-esp-toolchain-bin-wrappers-${TAG_WRAPPERS}_GH0.tar.gz \ rust/crates/lazy_static-1.4.0.crate \ rust/crates/libc-0.2.147.crate MAINTAINER= leres@FreeBSD.org COMMENT= Espressif ESP toolchain WWW= https://docs.espressif.com/projects/esp-idf/en/v5.3.1/esp32/get-started/ LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -BUILD_DEPENDS= ${LOCALBASE}/bin/grep:textproc/gnugrep \ - ${LOCALBASE}/include/libintl.h:devel/gettext-runtime \ +BUILD_DEPENDS= ${LOCALBASE}/include/libintl.h:devel/gettext-runtime \ bash:shells/bash \ gawk:lang/gawk \ + ggrep:textproc/gnugrep \ gpatch:devel/patch \ gsed:textproc/gsed \ help2man:misc/help2man \ makeinfo:print/texinfo USES= autoreconf:build bison cargo gmake libtool python USE_GCC= yes:build USE_GITHUB= nodefault BROKEN_armv7= fails to build: configure: error: C compiler cannot create executables NO_MTREE= yes GH_ACCOUNT= espressif GH_PROJECT= binutils-gdb:github1 \ gcc:github2 \ newlib-esp32:github3 \ esp-toolchain-bin-wrappers:github4 GH_TAGNAME= esp-2.41.0_${ESPDATE}:github1 \ esp-${GCCVER}_${ESPDATE}:github2 \ esp-4.3.0_${ESPDATE}:github3 \ ${TAG_WRAPPERS}:github4 BINARY_ALIAS= g++=${CXX} gcc=${CC} python=${PYTHON_VERSION} BUILD_ENV= ${WRK_ENV} \ CT_ALLOW_BUILD_AS_ROOT_SURE=1 \ CT_FORBID_DOWNLOAD=y \ - GREP=${LOCALBASE}/bin/grep \ + GREP=ggrep \ LD_RUN_PATH=${PREFIX}/lib/${CC} \ LDFLAGS=-I${PREFIX}/lib \ ${MAKE_ENV:MPATH=*} CARGO_BUILD= no CARGO_CONFIGURE= no CARGO_INSTALL= no CARGO_TEST= no CARGO_TARGET_DIR= ${WRKSRC2}/target CARGO_VENDOR_DIR= ${WRKSRC2}/cargo-crates CARGO_CRATES= lazy_static-1.4.0 \ libc-0.2.147 CARGO_CARGOTOML= ${WRKSRC2}/Cargo.toml CARGO_CARGOLOCK= ${WRKSRC2}/Cargo.lock WRKSRC2= ${WRKDIR}/esp-toolchain-bin-wrappers-${TAG_WRAPPERS}/gnu-xtensa-toolchian ESPVER= esp-${DISTVERSION} ESPDATE= 20240305 GCCVER= 13.2.0 PLIST_SUB= PKGBASE=$(PKGBASE) \ GCCVER=$(GCCVER) TAG_WRAPPERS= 62776e9 TARBALLS= ${BUILD_WRKSRC}/.build/tarballs XTENSA_CHIPS= esp32 esp32s2 esp32s3 XTENSA_WRAPPED= addr2line ar as c++ cc c++filt cpp elfedit g++ gcc \ gcc-${GCCVER} gcc-ar gcc-nm gcc-ranlib gcov gcov-dump \ gcov-tool gprof ld ld.bfd lto-dump nm objcopy objdump \ ranlib readelf size strings strip post-extract: ${MKDIR} ${TARBALLS} .for F in $(DISTFILES:N$(EXTRACT_ONLY)\:source[0-9]*) ${LN} -s ${DISTDIR}/${F:C/:source[0-9]+$//} ${TARBALLS} .endfor ${ECHO} CT_LOG_PROGRESS_BAR=n >> \ ${BUILD_WRKSRC}/samples/${PORTNAME}/crosstool.config # Make tar names match extract directories ${LN} -s \ ${DISTDIR}/espressif-binutils-gdb-esp-2.41.0_${ESPDATE}_GH0.tar.gz \ ${TARBALLS}/binutils-gdb-esp-2.41.0_${ESPDATE}.tar.gz ${LN} -s ${DISTDIR}/espressif-gcc-esp-${GCCVER}_${ESPDATE}_GH0.tar.gz \ ${TARBALLS}/gcc-esp-${GCCVER}_${ESPDATE}.tar.gz ${LN} -s \ ${DISTDIR}/espressif-newlib-esp32-esp-4.3.0_${ESPDATE}_GH0.tar.gz \ ${TARBALLS}/newlib-esp32-esp-4.3.0_${ESPDATE}.tar.gz ${CP} -p ${BUILD_WRKSRC}/maintainer/git-version-gen \ ${BUILD_WRKSRC}/maintainer/git-version-gen- ${PRINTF} "#!/bin/sh\necho -n '${ESPVER}'\n" > \ ${BUILD_WRKSRC}/maintainer/git-version-gen # Use a new crosstool.config that lets us download a # branch/tag tarball instead of doing "git clone" ${MV} ${WRKSRC}/samples/xtensa-esp-elf/crosstool.config \ ${WRKSRC}/samples/xtensa-esp-elf/crosstool.config- ${CP} ${FILESDIR}/crosstool.config ${WRKSRC}/samples/xtensa-esp-elf do-configure: cd ${BUILD_WRKSRC} && ./bootstrap cd ${BUILD_WRKSRC} && \ ${SETENVI} ${BUILD_ENV} LIBS=-lintl \ ./configure --prefix=${WRKDIR}/ct-ng --exec-prefix=${WRKDIR}/ct-ng cd ${BUILD_WRKSRC} && \ ${SETENVI} -uMAKELEVEL -uMAKEFLAGS -u.MAKE.LEVEL.ENV ${BUILD_ENV} \ ${MAKE_CMD} install && \ ${SETENVI} ${BUILD_ENV} ./ct-ng xtensa-esp-elf # xtensa-toolchian-wrapper ${MKDIR} ${WRKDIR}/.cargo : > ${WRKDIR}/.cargo/config.toml ${ECHO_CMD} "[source.cargo]" >> ${WRKDIR}/.cargo/config.toml ${ECHO_CMD} "directory = '${CARGO_VENDOR_DIR}'" >> \ ${WRKDIR}/.cargo/config.toml ${ECHO_CMD} "[source.crates-io]" >> ${WRKDIR}/.cargo/config.toml ${ECHO_CMD} "replace-with = 'cargo'" >> ${WRKDIR}/.cargo/config.toml @cd ${WRKSRC2} && ${CARGO_CARGO_RUN} update \ --manifest-path ${CARGO_CARGOTOML} \ --verbose \ --verbose \ ${CARGO_UPDATE_ARGS} do-build: cd ${BUILD_WRKSRC} && ${SETENVI} ${BUILD_ENV} ./ct-ng build cd ${BUILD_WRKSRC}/builds/${PORTNAME} && \ ${CHMOD} +w . lib && \ ${RM} build.log.bz2 lib/charset.alias && \ ${CHMOD} -w . lib # xtensa-toolchian-wrapper cd ${WRKSRC2} && ${CARGO_CARGO_RUN} build \ --manifest-path ${CARGO_CARGOTOML} \ --verbose \ --verbose \ ${CARGO_BUILD_ARGS} do-install: cd ${BUILD_WRKSRC}/builds/${PORTNAME} && \ ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/${PKGBASE} ${FIND} ${STAGEDIR}${PREFIX}/${PKGBASE} -type f | \ ${XARGS} ${CHMOD} -wx ${FIND} ${STAGEDIR}${PREFIX}/${PKGBASE}/bin \ ${STAGEDIR}${PREFIX}/${PKGBASE}/libexec/gcc/${PORTNAME}/${GCCVER} \ ${STAGEDIR}${PREFIX}/${PKGBASE}/${PORTNAME}/bin -type f | \ ${XARGS} ${CHMOD} +x # xtensa-toolchian-wrapper ${INSTALL_PROGRAM} ${WRKSRC2}/target/release/xtensa-toolchian-wrapper \ ${STAGEDIR}${PREFIX}/${PKGBASE}/bin .for chip in ${XTENSA_CHIPS} .for wrap in ${XTENSA_WRAPPED} ${LN} -f \ ${STAGEDIR}${PREFIX}/${PKGBASE}/bin/xtensa-toolchian-wrapper \ ${STAGEDIR}${PREFIX}/${PKGBASE}/bin/xtensa-${chip}-elf-${wrap} .endfor .endfor ${RM} ${STAGEDIR}${PREFIX}/${PKGBASE}/bin/xtensa-toolchian-wrapper .include