git: ae22a7846afe - main - *: Clean up some things
- Reply: Alexey Dokuchaev : "Re: git: ae22a7846afe - main - *: Clean up some things"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 12 Oct 2021 15:02:37 UTC
The branch main has been updated by tobik:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ae22a7846afe2f4c0ac5bc88c5a63001c5eeafb1
commit ae22a7846afe2f4c0ac5bc88c5a63001c5eeafb1
Author: Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-10-12 10:56:12 +0000
Commit: Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-10-12 15:01:38 +0000
*: Clean up some things
- Fix typos
- Fix overwritten variables with focus on master/slave ports
- Remove unreferenced variables
- Sort categories
- Remove redundant option descriptions
- Clean up commented PORTREVISION
- Add missing USES
Reported by: portscan
---
biology/jellyfish/Makefile | 2 +-
cad/kicad-library-packages3d-devel/Makefile | 2 +-
comms/qtel/Makefile | 1 -
comms/svxlink/Makefile | 2 +-
devel/cvstrac/Makefile | 2 +-
devel/gittrac/Makefile | 1 -
devel/godot-tools/Makefile | 2 +-
devel/godot/Makefile | 2 +-
devel/py-Jinja2-doc/Makefile | 3 ---
devel/re2c/Makefile | 3 +--
devel/svntrac/Makefile | 1 -
dns/bind9-devel/Makefile | 1 -
editors/Makefile | 2 +-
editors/libreoffice/Makefile | 1 -
emulators/mgba/Makefile | 1 -
games/nethack33-nox11/Makefile | 2 --
games/nethack34-nox11/Makefile | 2 --
games/nethack36-nox11/Makefile | 2 --
games/scummvm-tools/Makefile | 2 +-
games/trackballs/Makefile | 2 +-
games/xnethack-nox11/Makefile | 2 --
graphics/Makefile | 2 +-
graphics/atril-lite/Makefile | 2 --
graphics/openshadinglanguage/Makefile | 4 ++--
graphics/poppler-qt5/Makefile | 1 -
graphics/sane-airscan/Makefile | 2 --
graphics/xv-m17n/Makefile | 2 --
irc/hexchat/Makefile | 6 +-----
mail/claws-mail-litehtml_viewer/Makefile | 2 +-
math/eigen3/Makefile | 2 +-
math/fftw/Makefile | 2 +-
math/lapack/Makefile | 2 +-
misc/amanda-server/Makefile | 2 --
net-im/telegram-desktop/Makefile | 1 -
net-mgmt/Makefile | 2 +-
net/chrony-lite/Makefile | 1 -
net/tshark/Makefile | 1 -
news/suck-cnews/Makefile | 4 ----
print/gimp-gutenprint/Makefile | 1 -
print/gutenprint/Makefile | 2 +-
print/pdflib-perl/Makefile | 2 --
science/fvcom-mpi/Makefile | 2 --
science/libsvm/Makefile | 2 +-
security/gpgme-cpp/Makefile | 1 -
security/gpgme-qt5/Makefile | 1 -
sysutils/cdrkit/Makefile | 2 --
sysutils/genisoimage/Makefile | 2 --
sysutils/moosefs2-cgi/Makefile | 2 --
sysutils/moosefs2-cgiserv/Makefile | 2 --
sysutils/moosefs2-chunkserver/Makefile | 2 --
sysutils/moosefs2-cli/Makefile | 2 --
sysutils/moosefs2-client/Makefile | 2 --
sysutils/moosefs2-metalogger/Makefile | 2 --
sysutils/moosefs2-netdump/Makefile | 2 --
sysutils/moosefs3-cgi/Makefile | 2 --
sysutils/moosefs3-cgiserv/Makefile | 2 --
sysutils/moosefs3-chunkserver/Makefile | 2 --
sysutils/moosefs3-cli/Makefile | 2 --
sysutils/moosefs3-client/Makefile | 2 --
sysutils/moosefs3-metalogger/Makefile | 2 --
sysutils/moosefs3-netdump/Makefile | 2 --
sysutils/mstflint/Makefile | 2 +-
sysutils/passwordsafe/Makefile | 2 +-
sysutils/pdsh/Makefile | 3 ++-
www/sarg/Makefile | 4 ++--
www/sogo-activesync/Makefile | 2 --
www/sogo2-activesync/Makefile | 2 --
www/webkit2-gtk3/Makefile | 2 --
x11-themes/Makefile | 2 +-
x11-themes/gnome-icon-theme-symbolic/Makefile | 2 +-
70 files changed, 29 insertions(+), 111 deletions(-)
diff --git a/biology/jellyfish/Makefile b/biology/jellyfish/Makefile
index d69f8a62f373..1a8034e67d4c 100644
--- a/biology/jellyfish/Makefile
+++ b/biology/jellyfish/Makefile
@@ -12,7 +12,7 @@ COMMENT= Fast, memory-efficient counting of k-mers in DNA
LICENSE= BSD3CLAUSE GPLv3+
LICENSE_COMB= dual
LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE-BSD-3-Clause
-LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE-GPL-3.0
+LICENSE_FILE_GPLv3+ = ${WRKSRC}/LICENSE-GPL-3.0
LIB_DEPENDS= libhts.so:biology/htslib
diff --git a/cad/kicad-library-packages3d-devel/Makefile b/cad/kicad-library-packages3d-devel/Makefile
index 4af0bf2c5f64..045491f046c7 100644
--- a/cad/kicad-library-packages3d-devel/Makefile
+++ b/cad/kicad-library-packages3d-devel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kicad
DISTVERSION= r${GIT_P3D_DATE}
-#PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= cad
MASTER_SITES= https://gitlab.com/kicad/libraries/${PORTNAME}-packages3D/-/archive/${GL_COMMIT}/
PKGNAMESUFFIX= -library-packages3d-devel
diff --git a/comms/qtel/Makefile b/comms/qtel/Makefile
index 9643a79234d1..46d14a4cd912 100644
--- a/comms/qtel/Makefile
+++ b/comms/qtel/Makefile
@@ -2,7 +2,6 @@
PORTNAME= qtel
-MAINTAINER= hamradio@FreeBSD.org
COMMENT= Qtel Echolink client
LICENSE= GPLv2
diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile
index efa2cf0ea370..451ba9e14676 100644
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= comms hamradio
MAINTAINER= hamradio@FreeBSD.org
COMMENT?= General purpose ham radio voice services
-LICENSE= GPLv2
+LICENSE?= GPLv2
LIB_DEPENDS?= libgsm.so:audio/gsm \
libspeex.so:audio/speex \
diff --git a/devel/cvstrac/Makefile b/devel/cvstrac/Makefile
index 03356b50f994..49d90bd5e7c2 100644
--- a/devel/cvstrac/Makefile
+++ b/devel/cvstrac/Makefile
@@ -2,7 +2,7 @@
PORTNAME?= cvstrac
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION?= 1
CATEGORIES= devel
MASTER_SITES= http://www.cvstrac.org/
DISTNAME= cvstrac-${PORTVERSION}
diff --git a/devel/gittrac/Makefile b/devel/gittrac/Makefile
index cce73cd6e5ee..d1cefacae10d 100644
--- a/devel/gittrac/Makefile
+++ b/devel/gittrac/Makefile
@@ -1,7 +1,6 @@
# Created by: Greg Larkin <glarkin@FreeBSD.org>
PORTNAME= gittrac
-CATEGORIES= devel
COMMENT= Web-Based Bug And Patch-Set Tracking System For Git
diff --git a/devel/godot-tools/Makefile b/devel/godot-tools/Makefile
index f26ba5463bd7..26d00f4c6828 100644
--- a/devel/godot-tools/Makefile
+++ b/devel/godot-tools/Makefile
@@ -1,6 +1,6 @@
# Created by: Shane Ambler <FreeBSD@Shaneware.biz>
-PORTREVISION= 1
+PORTREVISION= 4
PKGNAMESUFFIX= -tools
COMMENT= Game integrated development environment
diff --git a/devel/godot/Makefile b/devel/godot/Makefile
index f07be526715e..01f95b342bc1 100644
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@@ -3,7 +3,7 @@
PORTNAME= godot
DISTVERSION= 3.2.3
DISTVERSIONSUFFIX= -stable
-PORTREVISION= 4
+PORTREVISION?= 4
CATEGORIES= devel games
MAINTAINER= FreeBSD@Shaneware.biz
diff --git a/devel/py-Jinja2-doc/Makefile b/devel/py-Jinja2-doc/Makefile
index 8a5acd955ba7..9a1b53dcade0 100644
--- a/devel/py-Jinja2-doc/Makefile
+++ b/devel/py-Jinja2-doc/Makefile
@@ -1,10 +1,7 @@
PKGNAMESUFFIX= -doc
-MAINTAINER= nivit@FreeBSD.org
COMMENT= Documentation of Jinja2 template engine
-LICENSE= BSD3CLAUSE
-
DESCR= ${.CURDIR}/pkg-descr
MASTERDIR= ${.CURDIR}/../py-Jinja2
diff --git a/devel/re2c/Makefile b/devel/re2c/Makefile
index 34f9703b02f0..1f9728acae91 100644
--- a/devel/re2c/Makefile
+++ b/devel/re2c/Makefile
@@ -12,10 +12,9 @@ LICENSE= PD
TEST_DEPENDS= bash:shells/bash
-USES= cmake cpe python:3.6+,test tar:xz
+USES= cmake cpe python:3.6+,test shebangfix tar:xz
TEST_TARGET= check
-TEST_USES= shebangfix
SHEBANG_FILES= test/posix_captures/.run/__run.sh \
test/posix_captures/.gen/__gen.sh \
test/__run_unicode_tests.sh
diff --git a/devel/svntrac/Makefile b/devel/svntrac/Makefile
index 577d1177c78c..5322c086c077 100644
--- a/devel/svntrac/Makefile
+++ b/devel/svntrac/Makefile
@@ -2,7 +2,6 @@
PORTNAME= svntrac
PORTREVISION= 4
-CATEGORIES= devel
COMMENT= Web-Based Bug And Patch-Set Tracking System For Subversion
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index d4df34e282b1..bd03b0d85d78 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -109,7 +109,6 @@ OPTIONS_EXCLUDE= DNSTAP DOCS GEOIP LMDB \
OPTIONS_SUB= yes
-CRYPTO_DESC= Choose which crypto engine to use
DNSTAP_DESC= Provides fast passive logging of DNS messages
FIXED_RRSET_DESC= Enable fixed rrset ordering
GSSAPI_BASE_DESC= Using Heimdal in base
diff --git a/editors/Makefile b/editors/Makefile
index c481ccb18902..03f989d645a2 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -219,7 +219,7 @@
SUBDIR += pico-alpine
SUBDIR += picpas
SUBDIR += pluma
- SUBDIR += pluma-plugins
+ SUBDIR += pluma-plugins
SUBDIR += poedit
SUBDIR += poke
SUBDIR += psgml
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 4d95da5e1a91..f83fbab5a9cb 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -121,7 +121,6 @@ OPTIONS_DEFINE= COINMP CUPS DOCS GNOME GTK3 GTK4 JAVA KF5 LTO MMEDIA PGSQL MARIA
OPTIONS_DEFAULT= CUPS JAVA MMEDIA QT5
COINMP_DESC= Enable CoinMP (deprecated) math solver
-GTK3_DESC= GTK+ 3 GUI toolkit support
GTK4_DESC= GTK+ 4 GUI toolkit support
JAVA_DESC= Add Java support (XML filters, macros, DB connections)
KF5_DESC= KF5/Qt5 GUI toolkit support (implies QT5)
diff --git a/emulators/mgba/Makefile b/emulators/mgba/Makefile
index 7217f4407862..844e0fcd3027 100644
--- a/emulators/mgba/Makefile
+++ b/emulators/mgba/Makefile
@@ -68,6 +68,5 @@ MAGICK_CMAKE_BOOL= USE_MAGICK
QT5_USES= desktop-file-utils qt:5
QT5_USE= qt=qmake_build,buildtools_build,core,gui,widgets,network,opengl,multimedia
QT5_CMAKE_BOOL= BUILD_QT
-QT5_VARS= installs_icons=yes
.include <bsd.port.mk>
diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile
index 32d450e890c3..e829b9d2ea27 100644
--- a/games/nethack33-nox11/Makefile
+++ b/games/nethack33-nox11/Makefile
@@ -2,8 +2,6 @@
MASTERDIR= ${.CURDIR}/../nethack33
-MAINTAINER= glewis@FreeBSD.org
-
PKGNAMESUFFIX= -nox11
.include "${MASTERDIR}/Makefile"
diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index 27c999a8f7f2..4fa9d10f81de 100644
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@@ -2,8 +2,6 @@
MASTERDIR= ${.CURDIR}/../nethack34
-MAINTAINER= glewis@FreeBSD.org
-
PKGNAMESUFFIX= -nox11
.include "${MASTERDIR}/Makefile"
diff --git a/games/nethack36-nox11/Makefile b/games/nethack36-nox11/Makefile
index e5e49af1d1fa..3babc1137b08 100644
--- a/games/nethack36-nox11/Makefile
+++ b/games/nethack36-nox11/Makefile
@@ -2,8 +2,6 @@
MASTERDIR= ${.CURDIR}/../nethack36
-MAINTAINER= glewis@FreeBSD.org
-
PKGNAMESUFFIX= -nox11
.include "${MASTERDIR}/Makefile"
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 269d642c1eb8..0d2bb9463fbe 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -41,7 +41,7 @@ OPTIONS_DEFAULT=WXGTK
OPTIONS_SUB= yes
WXGTK_USE= WX=2.8
-WXGTK_VARS= WX_COMP=wx:lib:build WX_CONFIG_ARGS=absolute
+WXGTK_VARS= WX_COMPS=wx WX_CONFIG_ARGS=absolute
WXGTK_CONFIGURE_ENABLE= wxwidgets
pre-patch:
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index 5cf1bbe9279c..919f419e98bd 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -18,7 +18,7 @@ USES= cmake desktop-file-utils gettext-runtime gl gnome pkgconfig sdl
USE_GL= gl
USE_SDL= image2 mixer2 sdl2 ttf2
-LICENSE_FILE_GPLv2+= ${WRKSRC}/COPYING
+LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
LICENSE_FILE_ETHYMONICS= ${WRKSRC}/share/music/README
LICENSE_NAME_ETHYMONICS= Ethymonics Free Music License
LICENSE_PERMS_ETHYMONICS= dist-mirror dist-sell pkg-mirror pkg-sell \
diff --git a/games/xnethack-nox11/Makefile b/games/xnethack-nox11/Makefile
index e8199d9acbd6..faba98afde3d 100644
--- a/games/xnethack-nox11/Makefile
+++ b/games/xnethack-nox11/Makefile
@@ -2,8 +2,6 @@
MASTERDIR= ${.CURDIR}/../xnethack
-MAINTAINER= fuz@fuz.su
-
PKGNAMESUFFIX= -nox11
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/Makefile b/graphics/Makefile
index 78a28b6466d1..2a1b0f1b95d6 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -457,8 +457,8 @@
SUBDIR += libgphoto2
SUBDIR += libgxps
SUBDIR += libheif
- SUBDIR += libimg
SUBDIR += libimagequant
+ SUBDIR += libimg
SUBDIR += libiptcdata
SUBDIR += libjpeg-turbo
SUBDIR += libjxl
diff --git a/graphics/atril-lite/Makefile b/graphics/atril-lite/Makefile
index 00179c03a422..c6e9b1a9eb85 100644
--- a/graphics/atril-lite/Makefile
+++ b/graphics/atril-lite/Makefile
@@ -2,8 +2,6 @@
PKGNAMESUFFIX= -lite
-COMMENT= MATE multi-format document viewer
-
OPTIONS_EXCLUDE= CAJA DBUS
MASTERDIR= ${.CURDIR}/../../graphics/atril
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index 06ab523f9067..a81ad6a298ff 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -3,10 +3,10 @@
PORTNAME= openshadinglanguage
DISTVERSIONPREFIX= Release-
DISTVERSION= 1.11.15.0
-CATEGORIES= graphics devel
+CATEGORIES?= graphics devel
MAINTAINER= FreeBSD@Shaneware.biz
-COMMENT= Advanced shading language for production GI renderers
+COMMENT?= Advanced shading language for production GI renderers
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.md
diff --git a/graphics/poppler-qt5/Makefile b/graphics/poppler-qt5/Makefile
index 5817eaf3853e..7c907c3f7eda 100644
--- a/graphics/poppler-qt5/Makefile
+++ b/graphics/poppler-qt5/Makefile
@@ -1,5 +1,4 @@
PORTREVISION= 0
-PKGNAMESUFFIX= -qt5
COMMENT= Qt 5 bindings to poppler
diff --git a/graphics/sane-airscan/Makefile b/graphics/sane-airscan/Makefile
index c9ffb679beff..1ac909a715ea 100644
--- a/graphics/sane-airscan/Makefile
+++ b/graphics/sane-airscan/Makefile
@@ -20,8 +20,6 @@ GH_ACCOUNT= alexpevzner
MAKE_ARGS= CC=${CC} PKG_CONFIG=pkgconf
-MANPAGES= sane-airscan.5 airscan-discover.1
-
post-install:
@${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/airscan.conf \
${STAGEDIR}${PREFIX}/etc/sane.d/airscan.conf.sample
diff --git a/graphics/xv-m17n/Makefile b/graphics/xv-m17n/Makefile
index 8e97da3c0bbb..050f02c2f016 100644
--- a/graphics/xv-m17n/Makefile
+++ b/graphics/xv-m17n/Makefile
@@ -9,6 +9,4 @@ OPTIONS_SLAVE= M17N
PKGNAMESUFFIX= -m17n${PKGNAMESUFFIX2}
-PORTREVISION= 1
-
.include "${MASTERDIR}/Makefile"
diff --git a/irc/hexchat/Makefile b/irc/hexchat/Makefile
index 6cf15d98c8bb..1d96aa0a14e4 100644
--- a/irc/hexchat/Makefile
+++ b/irc/hexchat/Makefile
@@ -38,7 +38,7 @@ PORTDOCS= *
OPTIONS_DEFINE= CA_BUNDLE CANBERRA DBUS DOCS FISHLIM LUA PERL TEXTFE \
SYSINFO
-OPTIONS_DEFAULT= CA_BUNDLE CANBERRA DBUS NOTIFY PERL
+OPTIONS_DEFAULT= CA_BUNDLE CANBERRA DBUS PERL
OPTIONS_SUB= yes
@@ -49,8 +49,6 @@ TEXTFE_DESC= Text frontend
SYSINFO_DESC= Sysinfo plugin
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-CA_BUNDLE_VARS= CA_BUNDLE="${LOCALBASE}/share/certs/ca-root-nss.crt"
-CA_BUNDLE_VARS_OFF= CA_BUNDLE=NULL
CANBERRA_LIB_DEPENDS= libcanberra.so:audio/libcanberra
CANBERRA_MESON_ON= -Dlibcanberra=enabled
CANBERRA_MESON_OFF= -Dlibcanberra=disabled
@@ -62,8 +60,6 @@ LUA_MESON_ON= -Dwith-lua=lua-${LUA_VER}
LUA_MESON_OFF= -Dwith-lua=false
LUA_USES= lua
LUA_USE= GCC=any
-NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
-NOTIFY_MESON_TRUE= with-libnotify
PERL_MESON_TRUE= with-perl
PERL_USES= perl5
TEXTFE_MESON_TRUE= text-frontend
diff --git a/mail/claws-mail-litehtml_viewer/Makefile b/mail/claws-mail-litehtml_viewer/Makefile
index 1eaea59f7db1..46b1f92eaf09 100644
--- a/mail/claws-mail-litehtml_viewer/Makefile
+++ b/mail/claws-mail-litehtml_viewer/Makefile
@@ -4,7 +4,7 @@ PORTNAME= litehtml_viewer
COMMENT= Viewer plugin for HTML emails, using the litehtml library
-USES+= compiler:c++11-lang
+USES+= compiler:c++11-lang gnome
USE_GNOME= cairo glib20
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libgumbo.so:devel/gumbo \
diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile
index c7a53273f2be..cbfb99fd6abd 100644
--- a/math/eigen3/Makefile
+++ b/math/eigen3/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFINE= BLAS TEST
OPTIONS_DEFAULT=BLAS
BLAS_DESC= Adds math dependencies
-BLAS_CMAKE_ARGS=-DBLAS_DIR:PATH="${LOCALBASE}"
+BLAS_CMAKE_ON= -DBLAS_DIR:PATH="${LOCALBASE}"
BLAS_USES= blaslapack pkgconfig
TEST_CMAKE_ON= EIGEN_TEST_CUDA EIGEN_TEST_CUDA_CLANG
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 3a6370405f3b..10fa17a0688b 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -35,7 +35,7 @@ FFTW_SUFX= s
PKGNAMESUFFIX= -float
.else
USES+= makeinfo
-FFTW_SUFIX=
+FFTW_SUFX=
INFO= fftw
.endif
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 1d405ed0bf1e..8f3b09663624 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -20,7 +20,7 @@ DIST_SUBDIR= lapack-${PORTVERSION}
MAINTAINER?= fortran@FreeBSD.org
COMMENT?= Linear Algebra PACKage
-LICENSE= BSD3CLAUSE
+LICENSE?= BSD3CLAUSE
USES= cmake:testing fortran
WRKSRC= ${WRKDIR}/lapack-${PORTVERSION}
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 8e5f934d6cb2..898445dc5ec9 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= perl-amanda:misc/amanda-perl-wrapper
BUILD_DEPENDS= perl-amanda:misc/amanda-perl-wrapper
WRKSRC= ${WRKDIR}/amanda-${PORTVERSION}
-SLAVEDIRS= misc/amanda-client
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
@@ -33,7 +32,6 @@ CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
--with-ssh-security \
--disable-installperms --with-security-file=${ETCDIR}/amanda-security.conf
CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl-amanda
-PKG_MESSAGE= ${WRKDIR}/pkg-message
SUB_FILES= pkg-message
SUB_LIST= PORTSDIR=${PORTSDIR}
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index ac82241f4905..209c2388409d 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -53,7 +53,6 @@ GH_ACCOUNT= telegramdesktop
GH_PROJECT= tdesktop
USE_GL= gl
USE_GNOME= glib20 glibmm gtk30
-INSTALLS_ICONS= yes
USE_QT= core dbus gui imageformats network widgets buildtools_build \
qmake_build wayland svg
USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrender xrandr xtst
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 54a67dceae97..0c11bdfbccc7 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -277,10 +277,10 @@
SUBDIR += pandorafms_server
SUBDIR += percona-monitoring-plugins
SUBDIR += pftabled
+ SUBDIR += php-fpm_exporter
SUBDIR += php73-snmp
SUBDIR += php74-snmp
SUBDIR += php80-snmp
- SUBDIR += php-fpm_exporter
SUBDIR += phpfpm_exporter
SUBDIR += phpipam
SUBDIR += phpweathermap
diff --git a/net/chrony-lite/Makefile b/net/chrony-lite/Makefile
index 71cc874200e9..ffeaca9d805e 100644
--- a/net/chrony-lite/Makefile
+++ b/net/chrony-lite/Makefile
@@ -1,4 +1,3 @@
-PORTNAME= chrony
PKGNAMESUFFIX= -lite
MAINTAINER= decke@FreeBSD.org
diff --git a/net/tshark/Makefile b/net/tshark/Makefile
index cf23a3960b72..dfa8f2437aff 100644
--- a/net/tshark/Makefile
+++ b/net/tshark/Makefile
@@ -1,7 +1,6 @@
# Created by: Bill Fumerola <billf@mu.org>
PORTNAME= tshark
-CATEGORIES= net
CONFLICTS_INSTALL?= tshark-lite-[0-9]* wireshark-lite-[0-9]* wireshark-[0-9]*
diff --git a/news/suck-cnews/Makefile b/news/suck-cnews/Makefile
index 70bee92d5c69..2607e25a44ed 100644
--- a/news/suck-cnews/Makefile
+++ b/news/suck-cnews/Makefile
@@ -1,7 +1,3 @@
-CATEGORIES= news
-
-MAINTAINER= dinoex@FreeBSD.org
-
MASTERDIR= ${.CURDIR}/../suck
OPTIONS_DEFAULT= SSL CNEWS
diff --git a/print/gimp-gutenprint/Makefile b/print/gimp-gutenprint/Makefile
index a27e60de2b7d..9e6d8567f1f1 100644
--- a/print/gimp-gutenprint/Makefile
+++ b/print/gimp-gutenprint/Makefile
@@ -3,7 +3,6 @@
PORTREVISION= 1
PKGNAMEPREFIX= gimp-
-MAINTAINER= cmt@FreeBSD.org
COMMENT= Gimp print plug-in
MASTERDIR= ${.CURDIR}/../../print/gutenprint
diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index d7cae1adc1f3..e22fcbe02bcb 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= print
MASTER_SITES= SF/gimp-print/gutenprint-5.3/${PORTVERSION}
MAINTAINER= cmt@FreeBSD.org
-COMMENT= Gutenprint Printer Drivers
+COMMENT?= Gutenprint Printer Drivers
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
diff --git a/print/pdflib-perl/Makefile b/print/pdflib-perl/Makefile
index 3478dab28dca..631b0f922cfa 100644
--- a/print/pdflib-perl/Makefile
+++ b/print/pdflib-perl/Makefile
@@ -2,8 +2,6 @@
PKGNAMESUFFIX= -perl
-MAINTAINER= ale@FreeBSD.org
-
MASTERDIR= ${.CURDIR}/../pdflib
OPTIONS_DEFAULT=PERL
diff --git a/science/fvcom-mpi/Makefile b/science/fvcom-mpi/Makefile
index da96a2c5c536..1dce0bafd3ff 100644
--- a/science/fvcom-mpi/Makefile
+++ b/science/fvcom-mpi/Makefile
@@ -3,8 +3,6 @@ PKGNAMESUFFIX= -openmpi
MPIPREFIX= mpi/openmpi/
-MAINTAINER= jwb@FreeBSD.org
-
LIB_DEPENDS+= libmpi.so:net/openmpi
MASTERDIR= ${.CURDIR}/../fvcom
diff --git a/science/libsvm/Makefile b/science/libsvm/Makefile
index b8b2dabf400c..bd24f5eaf149 100644
--- a/science/libsvm/Makefile
+++ b/science/libsvm/Makefile
@@ -6,7 +6,7 @@ CATEGORIES= science math
MASTER_SITES= http://www.csie.ntu.edu.tw/~cjlin/libsvm/ \
http://www.csie.ntu.edu.tw/~cjlin/libsvm/oldfiles/
-MAINTAINER= iblis@hs.ntnu.edu.tw
+MAINTAINER?= iblis@hs.ntnu.edu.tw
COMMENT= Library for Support Vector Machines
LICENSE= BSD3CLAUSE
diff --git a/security/gpgme-cpp/Makefile b/security/gpgme-cpp/Makefile
index a681eea2d020..d40a9e62f5a8 100644
--- a/security/gpgme-cpp/Makefile
+++ b/security/gpgme-cpp/Makefile
@@ -1,7 +1,6 @@
PORTREVISION= 0
PKGNAMESUFFIX= -${SLAVEPORT}
-MAINTAINER= jhale@FreeBSD.org
COMMENT= Gpgme C++ bindings
MASTERDIR= ${.CURDIR}/../../security/gpgme
diff --git a/security/gpgme-qt5/Makefile b/security/gpgme-qt5/Makefile
index 91e84d886354..b12dcd3911c7 100644
--- a/security/gpgme-qt5/Makefile
+++ b/security/gpgme-qt5/Makefile
@@ -1,7 +1,6 @@
PORTREVISION= 0
PKGNAMESUFFIX= -${SLAVEPORT}
-MAINTAINER= jhale@FreeBSD.org
COMMENT= Gpgme Qt5 bindings
LICENSE= GPLv2+
diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index dfa4c8f3a64b..0b286ff2a681 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -23,8 +23,6 @@ CFLAGS+= -fcommon
CONFLICTS?= cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]*
-SLAVEDIRS= sysutils/genisoimage
-
PLIST_SUB?= CDRKIT="" GENISOIMAGE="@comment "
post-patch:
diff --git a/sysutils/genisoimage/Makefile b/sysutils/genisoimage/Makefile
index e5b32ec4ea8d..57049eae8980 100644
--- a/sysutils/genisoimage/Makefile
+++ b/sysutils/genisoimage/Makefile
@@ -13,8 +13,6 @@ CONFLICTS= # nada
PLIST_SUB= CDRKIT="@comment " GENISOIMAGE=""
-SLAVE_PORT= cdrkit
-
MASTERDIR= ${.CURDIR}/../cdrkit
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs2-cgi/Makefile b/sysutils/moosefs2-cgi/Makefile
index 630d1850a777..1f2298787584 100644
--- a/sysutils/moosefs2-cgi/Makefile
+++ b/sysutils/moosefs2-cgi/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -cgi
COMMENT= MooseFS CGI interface
-LICENSE= GPLv2
-
MFS_COMPONENT= cgi
MASTERDIR= ${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-cgiserv/Makefile b/sysutils/moosefs2-cgiserv/Makefile
index 0ccd3d2489cd..341974270da1 100644
--- a/sysutils/moosefs2-cgiserv/Makefile
+++ b/sysutils/moosefs2-cgiserv/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -cgiserv
COMMENT= MooseFS CGI webserver
-LICENSE= GPLv2
-
MFS_COMPONENT= cgiserv
MASTERDIR= ${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-chunkserver/Makefile b/sysutils/moosefs2-chunkserver/Makefile
index e09943199873..745620720804 100644
--- a/sysutils/moosefs2-chunkserver/Makefile
+++ b/sysutils/moosefs2-chunkserver/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -chunkserver
COMMENT= MooseFS data storage and synchronization component
-LICENSE= GPLv2
-
MFS_COMPONENT= chunkserver
MASTERDIR= ${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-cli/Makefile b/sysutils/moosefs2-cli/Makefile
index 97f1924a213e..5463f56aedc7 100644
--- a/sysutils/moosefs2-cli/Makefile
+++ b/sysutils/moosefs2-cli/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -cli
COMMENT= MooseFS command line interface
-LICENSE= GPLv2
-
MFS_COMPONENT= cli
MASTERDIR= ${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-client/Makefile b/sysutils/moosefs2-client/Makefile
index 5617098f4399..234c366f94ff 100644
--- a/sysutils/moosefs2-client/Makefile
+++ b/sysutils/moosefs2-client/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -client
COMMENT= MooseFS client tools
-LICENSE= GPLv2
-
MFS_COMPONENT= client
MASTERDIR= ${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-metalogger/Makefile b/sysutils/moosefs2-metalogger/Makefile
index 2336daa336fb..becf1e89c63b 100644
--- a/sysutils/moosefs2-metalogger/Makefile
+++ b/sysutils/moosefs2-metalogger/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -metalogger
COMMENT= MooseFS metadata backup server
-LICENSE= GPLv2
-
MFS_COMPONENT= metalogger
MASTERDIR= ${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-netdump/Makefile b/sysutils/moosefs2-netdump/Makefile
index 7df650ca451e..923c99811a58 100644
--- a/sysutils/moosefs2-netdump/Makefile
+++ b/sysutils/moosefs2-netdump/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -netdump
COMMENT= MooseFS network packet dump utility
-LICENSE= GPLv2
-
MFS_COMPONENT= netdump
MASTERDIR= ${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs3-cgi/Makefile b/sysutils/moosefs3-cgi/Makefile
index 7f84203e3fe8..33598d679ef4 100644
--- a/sysutils/moosefs3-cgi/Makefile
+++ b/sysutils/moosefs3-cgi/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -cgi
COMMENT= MooseFS CGI interface
-LICENSE= GPLv2
-
MFS_COMPONENT= cgi
MASTERDIR= ${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-cgiserv/Makefile b/sysutils/moosefs3-cgiserv/Makefile
index 79692f7ed4a8..dcfca328869a 100644
--- a/sysutils/moosefs3-cgiserv/Makefile
+++ b/sysutils/moosefs3-cgiserv/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -cgiserv
COMMENT= MooseFS CGI webserver
-LICENSE= GPLv2
-
MFS_COMPONENT= cgiserv
MASTERDIR= ${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-chunkserver/Makefile b/sysutils/moosefs3-chunkserver/Makefile
index 9d00bda211c3..618486153678 100644
--- a/sysutils/moosefs3-chunkserver/Makefile
+++ b/sysutils/moosefs3-chunkserver/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -chunkserver
COMMENT= MooseFS data storage and synchronization component
-LICENSE= GPLv2
-
MFS_COMPONENT= chunkserver
MASTERDIR= ${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-cli/Makefile b/sysutils/moosefs3-cli/Makefile
index 356cf37a2cf0..b6a7a9a928f2 100644
--- a/sysutils/moosefs3-cli/Makefile
+++ b/sysutils/moosefs3-cli/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -cli
COMMENT= MooseFS command line interface
-LICENSE= GPLv2
-
MFS_COMPONENT= cli
MASTERDIR= ${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-client/Makefile b/sysutils/moosefs3-client/Makefile
index 23e44ad3da61..0d8386aa62c0 100644
--- a/sysutils/moosefs3-client/Makefile
+++ b/sysutils/moosefs3-client/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -client
COMMENT= MooseFS client tools
-LICENSE= GPLv2
-
MFS_COMPONENT= client
MASTERDIR= ${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-metalogger/Makefile b/sysutils/moosefs3-metalogger/Makefile
index ad426ce678e4..3bc3fbedc889 100644
--- a/sysutils/moosefs3-metalogger/Makefile
+++ b/sysutils/moosefs3-metalogger/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -metalogger
COMMENT= MooseFS metadata backup server
-LICENSE= GPLv2
-
MFS_COMPONENT= metalogger
MASTERDIR= ${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-netdump/Makefile b/sysutils/moosefs3-netdump/Makefile
index 3789a6875abb..0fedd8ca6ca4 100644
--- a/sysutils/moosefs3-netdump/Makefile
+++ b/sysutils/moosefs3-netdump/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX= -netdump
COMMENT= MooseFS network packet dump utility
-LICENSE= GPLv2
-
MFS_COMPONENT= netdump
MASTERDIR= ${.CURDIR}/../moosefs3-master
diff --git a/sysutils/mstflint/Makefile b/sysutils/mstflint/Makefile
index 196b63f1e3b3..10af903636e2 100644
--- a/sysutils/mstflint/Makefile
+++ b/sysutils/mstflint/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 4.16.0-1
CATEGORIES= sysutils
MAINTAINER= hselasky@FreeBSD.org
-COMMENT= Firmware Burning and Diagnostics Tools for Mellanox devices
+COMMENT?= Firmware Burning and Diagnostics Tools for Mellanox devices
LICENSE= BSD2CLAUSE GPLv2
LICENSE_COMB= dual
diff --git a/sysutils/passwordsafe/Makefile b/sysutils/passwordsafe/Makefile
index 901160657179..2405072f2f75 100644
--- a/sysutils/passwordsafe/Makefile
+++ b/sysutils/passwordsafe/Makefile
@@ -37,7 +37,7 @@ MAKE_ENV= NO_QR=yes
GH_ACCOUNT= pwsafe
GH_PROJECT= ${GH_ACCOUNT}
-WX_COMP= wx
+WX_COMPS= wx
WANT_WX_VER= 3.0
LDFLAGS= -L${PREFIX}/lib -lqrencode
diff --git a/sysutils/pdsh/Makefile b/sysutils/pdsh/Makefile
index e61679e14b53..d3afc071d4b0 100644
--- a/sysutils/pdsh/Makefile
+++ b/sysutils/pdsh/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pdsh
PORTVERSION= 2.34
DISTVERSIONPREFIX= ${PORTNAME}-
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= i@levsha.me
@@ -12,7 +13,7 @@ LICENSE= GPLv2
GNU_CONFIGURE= yes
# :keepla because port uses lt_dlopen
-USES= autoreconf gmake libtool:keepla shebangfix
+USES= autoreconf gmake libtool:keepla perl5 shebangfix
USE_GITHUB= yes
GH_ACCOUNT= chaos
USE_PERL5= run
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index d845f493bbd0..382918a8a1a4 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sarg
PORTVERSION= 2.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -37,7 +37,7 @@ PHP_CONFIGURE_ON= --enable-sargphp="${ETCDIR}"
PHP_CONFIGURE_OFF= --disable-sargphp
PCRE_CONFIGURE_WITH= pcre
PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
-LDAP_USE= USE_OPENLDAP=yes
+LDAP_USE= OPENLDAP=yes
LDAP_CONFIGURE_WITH= ldap
ICONV_USES= iconv
ICONV_CONFIGURE_WITH= iconv
diff --git a/www/sogo-activesync/Makefile b/www/sogo-activesync/Makefile
index 783f7a0acf5c..c8c3ef26a633 100644
--- a/www/sogo-activesync/Makefile
+++ b/www/sogo-activesync/Makefile
@@ -1,7 +1,5 @@
PKGNAMESUFFIX= -activesync
-MAINTAINER= acm@FreeBSD.org
-
CONFLICTS= sogo[2-4]-[0-9]* sogo[2-4]-activesync-[0-9]*
OPTIONS_SLAVE= ACTIVESYNC MFA
diff --git a/www/sogo2-activesync/Makefile b/www/sogo2-activesync/Makefile
index e2b2f9af1575..f521d46deda5 100644
--- a/www/sogo2-activesync/Makefile
+++ b/www/sogo2-activesync/Makefile
*** 51 LINES SKIPPED ***