From 62ab01c7c973e258906db24d10dc9f46d5724de0 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Wed, 22 Jul 2020 09:09:01 +0000 Subject: [PATCH] Clean up some things Reported by: portscan --- games/rubygem-lolcat/Makefile | 2 +- irc/smuxi/Makefile | 2 +- math/or-tools/Makefile | 1 - misc/valentina/Makefile | 2 +- textproc/Makefile | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/games/rubygem-lolcat/Makefile b/games/rubygem-lolcat/Makefile index 8d05649a43e7..e631630d9d84 100644 --- a/games/rubygem-lolcat/Makefile +++ b/games/rubygem-lolcat/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= rubygem-manpages>=0.6.1<0.7:devel/rubygem-manpages \ USES= gem -CONFLICT_INSTALL= lolcat +CONFLICTS_INSTALL= lolcat USE_RUBY= yes diff --git a/irc/smuxi/Makefile b/irc/smuxi/Makefile index 81713aa6a95a..7ce069441d25 100644 --- a/irc/smuxi/Makefile +++ b/irc/smuxi/Makefile @@ -28,7 +28,7 @@ INSTALLS_ICONS= yes OPTIONS_DEFINE= DBUS NLS SPELLCHECK OPTIONS_DEFAULT= DBUS NLS SPELLCHECK -oOPTIONS_SUB= yes +OPTIONS_SUB= yes SPELLCHECK_DESC= Spell checking support via GtkSpell diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile index 883305ea6ef2..402c958340eb 100644 --- a/math/or-tools/Makefile +++ b/math/or-tools/Makefile @@ -26,7 +26,6 @@ USE_LDCONFIG= yes CMAKE_OFF= BUILD_DEPS INSTALL_BUILD_DEPS BUILD_PYTHON BUILD_EXAMPLES CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} -BUILD_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} post-configure: # https://github.com/google/or-tools/issues/2109 @${REINPLACE_CMD} -e 's|protobuf::protoc|protoc -I${LOCALBASE}/include| ; s|protobuf$$:$$:protoc||' ${BUILD_WRKSRC}/build.ninja diff --git a/misc/valentina/Makefile b/misc/valentina/Makefile index e3a24d9a8aa2..b9b8e4dab470 100644 --- a/misc/valentina/Makefile +++ b/misc/valentina/Makefile @@ -20,7 +20,7 @@ USE_GITLAB= yes GL_ACCOUNT= smart-pattern GL_COMMIT= 15e731671f9471390d7ccf95c7eb5bbda8c25f95 -DOS2UNIX_FILE= src/libs/vgeometry/vellipticalarc.cpp +DOS2UNIX_FILES= src/libs/vgeometry/vellipticalarc.cpp QMAKE_ARGS= CONFIG+="noTests" CONFIG+="noRunPath" .if !defined(WITH_CCACHE_BUILD) || defined(NO_CCACHE) diff --git a/textproc/Makefile b/textproc/Makefile index 55f16e51f291..4c31771a1d84 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -5,13 +5,13 @@ SUBDIR += 2bsd-diff SUBDIR += CLDR - SUBDIR += R-cran-commonmark SUBDIR += R-cran-DT SUBDIR += R-cran-R2HTML SUBDIR += R-cran-XML SUBDIR += R-cran-bibtex SUBDIR += R-cran-brew SUBDIR += R-cran-cellranger + SUBDIR += R-cran-commonmark SUBDIR += R-cran-formatR SUBDIR += R-cran-highr SUBDIR += R-cran-htmltools