Date: Fri, 3 Sep 2021 13:06:37 GMT From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 310623bb97f6 - main - *: Clean up some things Message-ID: <202109031306.183D6bxN068045@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=310623bb97f644b7a9a90c9e231574670edfa8f7 commit 310623bb97f644b7a9a90c9e231574670edfa8f7 Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2021-09-03 13:01:58 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2021-09-03 13:01:58 +0000 *: Clean up some things - Fix typos - Remove duplicate variables - Remove nop or unreferenced variables - Add missing ports to the build - Clean up commented PORTREVISION - Add missing USES Reported by: portscan --- biology/unikmer/Makefile | 5 ++--- cad/kicad-devel/Makefile | 2 +- databases/mongodb44/Makefile | 2 -- graphics/libpillowfight/Makefile | 4 +--- lang/ocaml/Makefile | 1 - math/Makefile | 1 + math/lib2geom/Makefile | 2 +- math/mdal/Makefile | 2 +- math/mfem/Makefile | 2 +- math/piranha/Makefile | 2 -- math/sundials/Makefile | 2 +- net-im/biboumi/Makefile | 3 ++- net/rabbitmq/Makefile | 1 - science/dynare/Makefile | 1 - textproc/pdfoutline/Makefile | 4 ++-- www/caddy/Makefile | 1 - www/nextcloud-deck/Makefile | 3 --- 17 files changed, 13 insertions(+), 25 deletions(-) diff --git a/biology/unikmer/Makefile b/biology/unikmer/Makefile index 07708cea83cc..2a0abf953a45 100644 --- a/biology/unikmer/Makefile +++ b/biology/unikmer/Makefile @@ -11,15 +11,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE TEST_DEPENDS= csvtk:science/csvtk -USES= go:modules +USES= go:modules perl5 +USE_PERL5= test GO_MODULE= github.com/shenwei356/unikmer GO_TARGET= ./${PORTNAME} PLIST_FILES= bin/${PORTNAME} -TEST_USES= perl5 - do-test: # from the benchmark section in README @cd ${WRKSRC} && \ ${GO_CMD} test . -bench=Bench* -benchmem \ diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 0ba5d1eda9f2..9a4c477c8767 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= kicad DISTVERSION= r${GIT_SRC_DATE} -#PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= cad PKGNAMESUFFIX= -devel DIST_SUBDIR= ${PORTNAME} diff --git a/databases/mongodb44/Makefile b/databases/mongodb44/Makefile index dace6dac9d76..a3720cf9b94f 100644 --- a/databases/mongodb44/Makefile +++ b/databases/mongodb44/Makefile @@ -75,8 +75,6 @@ EXTRA_PATCHES= ${FILESDIR}/${ARCH} ALL_TARGET= install-core -PORTSCOUT= limitw:1,even - CPE_PRODUCT= mongodb pre-patch: diff --git a/graphics/libpillowfight/Makefile b/graphics/libpillowfight/Makefile index 9d97bd275ebf..8c73be97b6ad 100644 --- a/graphics/libpillowfight/Makefile +++ b/graphics/libpillowfight/Makefile @@ -12,15 +12,13 @@ BUILD_DEPENDS= gmake:devel/gmake TEST_DEPENDS= gmake:devel/gmake \ tox:devel/py-tox@${PY_FLAVOR} -USES= cmake +USES= cmake python:test USE_GITLAB= yes GL_SITE= https://gitlab.gnome.org/World GL_ACCOUNT= OpenPaperwork GL_COMMIT= dae21f97de872e4ad2e94f1b0fc53302a00259fd USE_LDCONFIG= yes -TEST_USES= python - PLIST_FILES= include/pillowfight/pillowfight.h \ include/pillowfight/util.h \ lib/libpillowfight.so \ diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 737109f22199..e5bf42a77dd0 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -49,7 +49,6 @@ OPTIONS_DEFAULT=X11 THREADS CMP_LIB_DESC= Install compiler libraries MODOPT= camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt -PATTERN= [[:space:]]*(do|then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]] DOCSDISTNAME= ${DISTNAME:C/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/\1.\2/} CONFLICTS= metaocaml-[0-9]* diff --git a/math/Makefile b/math/Makefile index 4b3a2891d70c..f0a40e3353b5 100644 --- a/math/Makefile +++ b/math/Makefile @@ -570,6 +570,7 @@ SUBDIR += oleo SUBDIR += onednn SUBDIR += openblas + SUBDIR += openfst SUBDIR += openlibm SUBDIR += openmesh SUBDIR += opensolaris-libm diff --git a/math/lib2geom/Makefile b/math/lib2geom/Makefile index e9bea4482b2a..7b029b2eb507 100644 --- a/math/lib2geom/Makefile +++ b/math/lib2geom/Makefile @@ -11,7 +11,7 @@ LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ libgsl.so:math/gsl \ libboost_thread.so:devel/boost-libs -USES= cmake gettext-runtime localbase:ldflags pkgconfig +USES= cmake gettext-runtime gnome localbase:ldflags pkgconfig USE_GNOME= cairo glib20 CMAKE_ON= 2GEOM_BUILD_SHARED diff --git a/math/mdal/Makefile b/math/mdal/Makefile index f3698a0aa0ff..872e3a965776 100644 --- a/math/mdal/Makefile +++ b/math/mdal/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libpdal_base.so:math/pdal \ libhdf5.so:science/hdf5 \ libsz.so:science/szip -USES= cmake localbase +USES= cmake gnome localbase USE_GNOME= libxml2 USE_LDCONFIG= yes diff --git a/math/mfem/Makefile b/math/mfem/Makefile index 15a5593e4736..3d991f0036ce 100644 --- a/math/mfem/Makefile +++ b/math/mfem/Makefile @@ -14,7 +14,7 @@ USE_GITHUB= yes USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS -MFEM_TESTING_ON= MFEM_ENABLE_TESTING # tests are broken, see https://github.com/mfem/mfem/issues/2442 +CMAKE_TESTING_ON= MFEM_ENABLE_TESTING # tests are broken, see https://github.com/mfem/mfem/issues/2442 OPTIONS_DEFINE= MPI diff --git a/math/piranha/Makefile b/math/piranha/Makefile index bff142a6f816..f61a956e6c37 100644 --- a/math/piranha/Makefile +++ b/math/piranha/Makefile @@ -26,8 +26,6 @@ HEADER_DEPENDS= ${LOCALBASE}/include/boost/numeric/conversion/cast.hpp:devel/boo ${LOCALBASE}/include/gmp.h:math/gmp \ ${LOCALBASE}/include/mpfr.h:math/mpfr -TEST_USES= compiler:c++14-lang - do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \ diff --git a/math/sundials/Makefile b/math/sundials/Makefile index 94f9d2135dc4..25ec0a678494 100644 --- a/math/sundials/Makefile +++ b/math/sundials/Makefile @@ -60,7 +60,7 @@ PETSC_CMAKE_ON= -DPETSC_DIR=${LOCALBASE} \ PETSC_LIB_DEPENDS= libpetsc.so:science/PETSc PETSC_IMPLIES= MPI PETSC_PREVENTS= LAPACK # error: Incompatible sunindextype for LAPACK; disable LAPACK and rebuild -PERSC_BROKEN= ERROR: PETSc not functional due to index size mismatch: SUNDIALS_INDEX_SIZE=64, but PETSc was built with 32-bit indices +PETSC_BROKEN= ERROR: PETSc not functional due to index size mismatch: SUNDIALS_INDEX_SIZE=64, but PETSc was built with 32-bit indices PORTEXAMPLES= * diff --git a/net-im/biboumi/Makefile b/net-im/biboumi/Makefile index 87c5313249c3..194d565ef3ce 100644 --- a/net-im/biboumi/Makefile +++ b/net-im/biboumi/Makefile @@ -1,5 +1,6 @@ PORTNAME= biboumi DISTVERSION= 9.0 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://git.louiz.org/biboumi/snapshot/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -46,7 +47,7 @@ SQLITE3_CMAKE_OFF= -DWITHOUT_SQLITE3=1 TLS_LIB_DEPENDS= libbotan-2.so:security/botan2 TLS_LIB_DEPENDS_OFF= libgcrypt.so:security/libgcrypt -TLS_RUN_DEPENDS_ON= ca_root_nss>0:security/ca_root_nss +TLS_RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss TLS_CMAKE_ON= -DWITH_BOTAN=1 TLS_CMAKE_OFF= -DWITHOUT_BOTAN=1 diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index ed075c088410..08b2790c78bb 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -44,7 +44,6 @@ PLIST_SUB= VERSION=${PORTVERSION} CPE_VENDOR= pivotal_software REINPLACE_ARGS= -i "" -SCRIPTS_DIR= ${WRKSRC}/deps/rabbit/scripts SHEBANG_FILES= deps/rabbitmq_management/bin/rabbitmqadmin MAKE_ARGS+= PYTHON=${PYTHON_CMD} MAKE_ENV+= PATH="${LOCALBASE}/lib/${ERLANG_LIB}/bin:${PATH}" \ diff --git a/science/dynare/Makefile b/science/dynare/Makefile index 6a0a984b908d..d7084de36578 100644 --- a/science/dynare/Makefile +++ b/science/dynare/Makefile @@ -20,7 +20,6 @@ RUN_DEPENDS= epstool:graphics/epstool \ xfig:graphics/xfig # README says that these executables are required for the test suite USES= bison compiler:c++17-lang fortran gmake localbase tar:xz -USE_PDFLATEX= yes USE_TEX= pdftex USE_GCC= yes # clang-11 fails: error: reference to local binding 'ii1' declared in enclosing function 'ss2Iteration_pruning' # Clang still doesn't support this c++20 feature, see https://bugs.llvm.org/show_bug.cgi?id=49238 diff --git a/textproc/pdfoutline/Makefile b/textproc/pdfoutline/Makefile index cc1111874c14..e9e71b8f005b 100644 --- a/textproc/pdfoutline/Makefile +++ b/textproc/pdfoutline/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdfoutline PORTVERSION= 5.4 DISTVERSIONPREFIX= release/ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= sunpoet@FreeBSD.org @@ -13,7 +13,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${RUN_DEPENDS} -xRUN_DEPENDS= p5-Locale-libintl>=0:devel/p5-Locale-libintl \ +RUN_DEPENDS= p5-Locale-libintl>=0:devel/p5-Locale-libintl \ p5-PDF-API2>=0:textproc/p5-PDF-API2 USES= perl5 shebangfix diff --git a/www/caddy/Makefile b/www/caddy/Makefile index 14db3c762bd5..0c78eea9cf2c 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= go:modules -GO_TARGET= ./cmd/caddy USE_RC_SUBR= caddy SUB_FILES= Caddyfile.sample caddy pkg-message diff --git a/www/nextcloud-deck/Makefile b/www/nextcloud-deck/Makefile index a4b63b63bb5e..1a42c990a4fe 100644 --- a/www/nextcloud-deck/Makefile +++ b/www/nextcloud-deck/Makefile @@ -22,9 +22,6 @@ USES= php:flavors NO_BUILD= yes NO_ARCH= yes -NEXTCLOUD_USERNAME?= ${WWWOWN} -NEXTCLOUD_GROUPNAME?= ${WWWGRP} - WWWDIR= ${PREFIX}/www/nextcloud/apps-pkg/${PORTNAME} do-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109031306.183D6bxN068045>