git: feb95d6a41b2 - main - *: Clean up some things
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Dec 2021 13:05:29 UTC
The branch main has been updated by tobik:
URL: https://cgit.FreeBSD.org/ports/commit/?id=feb95d6a41b28e32a17aa9044b8687d83f93ef1f
commit feb95d6a41b28e32a17aa9044b8687d83f93ef1f
Author: Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-12-14 12:27:51 +0000
Commit: Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-12-14 13:02:26 +0000
*: Clean up some things
- Fix typos
- Remove unreferenced variables
- Sort categories
- Clean up commented PORTREVISION
- Fix broken syntax
Reported by: portscan
---
audio/calf-lv2/Makefile | 2 --
comms/klog/Makefile | 2 +-
deskutils/bookworm/Makefile | 1 -
devel/Makefile | 2 +-
emulators/qemu/Makefile | 2 +-
emulators/qemu5/Makefile | 3 +--
games/stonesoup/Makefile | 1 -
multimedia/emby-server/Makefile | 3 ---
net-im/telegram-desktop/Makefile | 2 --
security/mbedtls/Makefile | 2 +-
www/chromium/Makefile | 1 -
www/typo3-9/Makefile | 2 +-
12 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/audio/calf-lv2/Makefile b/audio/calf-lv2/Makefile
index a5d286921e5e..4097a0ad3dc8 100644
--- a/audio/calf-lv2/Makefile
+++ b/audio/calf-lv2/Makefile
@@ -32,8 +32,6 @@ USE_GITHUB= yes
GH_ACCOUNT= calf-studio-gear
GH_TAGNAME= 648f05e85287cf08af198bdd9e52baba95b502ec # this revision has clang compilation issues fixed
-INSTALLS_ICONS= yes
-
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= DOCS LASH
diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index 50deaea205e8..983f76934811 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -1,6 +1,6 @@
PORTNAME= klog
PORTVERSION= 1.8.5
-#PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= comms hamradio
MAINTAINER= hamradio@FreeBSD.org
diff --git a/deskutils/bookworm/Makefile b/deskutils/bookworm/Makefile
index 559fe5cfe318..9af9b0b2c6fc 100644
--- a/deskutils/bookworm/Makefile
+++ b/deskutils/bookworm/Makefile
@@ -31,7 +31,6 @@ GH_ACCOUNT= babluboy
USE_GNOME= gdkpixbuf2 glib20 gtk30 libxml2 pango
GLIB_SCHEMAS= com.github.babluboy.bookworm.gschema.xml
-INSTALLS_ICONS= yes
SHEBANG_FILES= data/scripts/com.github.babluboy.bookworm.search.sh \
data/scripts/mobi_lib/mobi_dict.py \
data/scripts/mobi_lib/mobi_html.py \
diff --git a/devel/Makefile b/devel/Makefile
index c8f9a34475df..eae57f3936b7 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -289,6 +289,7 @@
SUBDIR += brz
SUBDIR += bsdbuild
SUBDIR += bsdcflow
+ SUBDIR += bsddialog
SUBDIR += bsdowl
SUBDIR += bugzilla44
SUBDIR += bugzilla50
@@ -298,7 +299,6 @@
SUBDIR += busybee
SUBDIR += byacc
SUBDIR += byaccj
- SUBDIR += bsddialog
SUBDIR += c2mdoc
SUBDIR += caf
SUBDIR += calibrator
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index efa262c09906..01a98f31421e 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= https://download.qemu.org/
DIST_SUBDIR= qemu/${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
-COMMENT= QEMU CPU Emulator
+COMMENT= QEMU CPU Emulator ${${FLAVOR}_COMMENT}
LICENSE= GPLv2
diff --git a/emulators/qemu5/Makefile b/emulators/qemu5/Makefile
index b8153fe58729..4a4da7520e8e 100644
--- a/emulators/qemu5/Makefile
+++ b/emulators/qemu5/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= https://download.qemu.org/
DIST_SUBDIR= qemu/${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
-COMMENT= QEMU CPU Emulator - 5.X.X branch
+COMMENT= QEMU CPU Emulator - 5.X.X branch ${${FLAVOR}_COMMENT}
LICENSE= GPLv2
@@ -113,7 +113,6 @@ CONFIGURE_ARGS= --localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \
--disable-linux-user --disable-linux-aio --disable-xen \
--enable-debug-info --python=${PYTHON_CMD} \
--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
-INSTALLS_ICONS= yes
.include <bsd.port.options.mk>
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 7d8aa331085e..753616776a4a 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -67,7 +67,6 @@ LUA_DESC= Bindings for LUA user scripts
USES+= gl sdl
USE_SDL= sdl2 image2 mixer2
USE_GL= gl glu
-SDL_USES_OFF= ncurses
MAKE_ARGS+= TILES=y SOUND=y
BUILD_DEPENDS+= \
advpng:archivers/advancecomp \
diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile
index 3aa99e91a5c1..358f6ea46a72 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -106,9 +106,6 @@ OPTIONS_DEFAULT= LAME X11
LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
LAME_CONFIGURE_ENABLE= libmp3lame
-SMB_USES= samba:lib
-SMB_CONFIGURE_ENABLE= libsmbclient
-
X11_USES= xorg magick:6
X11_USES_OFF= magick:6,nox11
X11_USE= xorg=x11
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 4c9100f435ab..45b764ffc91e 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -71,8 +71,6 @@ CXXFLAGS+= -DNDEBUG
# see Bugzilla #245452 for details
NO_CCACHE= yes
-INSTALLS_ICONS= yes
-
# Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA.
# It dynamically loads PulseAudio, and if this fails, it loads ALSA.
# If both of them are not installed, then voice calls do not work, but other functionalities still work.
diff --git a/security/mbedtls/Makefile b/security/mbedtls/Makefile
index a339c83f21ca..23e2229c14f2 100644
--- a/security/mbedtls/Makefile
+++ b/security/mbedtls/Makefile
@@ -9,7 +9,7 @@ COMMENT= SSL/TLS and cryptography library
LICENSE= APACHE20 GPLv2+
LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/apache-2.0.txt
-LICENSE_FILE_GPLv2= ${WRKSRC}/gpl-2.0.txt
+LICENSE_FILE_GPLv2+ = ${WRKSRC}/gpl-2.0.txt
USE_GITHUB= yes
GH_ACCOUNT= ARMmbed
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 12d227ce72d7..96cb5ca75eb2 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -74,7 +74,6 @@ CPE_PRODUCT= chrome
DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h
USE_GL= gbm gl
USE_GNOME= atk dconf gdkpixbuf2 glib20 gtk30 libxml2 libxslt
-INSTALLS_ICONS= yes
USE_LDCONFIG= ${DATADIR}
USE_PERL5= build
USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \
diff --git a/www/typo3-9/Makefile b/www/typo3-9/Makefile
index 8bf1eda4b007..8ace4d5ebec7 100644
--- a/www/typo3-9/Makefile
+++ b/www/typo3-9/Makefile
@@ -68,7 +68,7 @@ ZLIB_USE= PHP=zlib
.if ${PORT_OPTIONS:MIMAGICK}
.if ${PORT_OPTIONS:MX11}
USES+= magick:6,run
-else
+.else
USES+= magick:6,run,nox11
.endif
.endif