diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile index ef3dce4b8e80..ef19bb2b3193 100644 --- a/audio/mumble/Makefile +++ b/audio/mumble/Makefile @@ -1,105 +1,105 @@ PORTNAME= mumble DISTVERSION= 1.5.634 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= vvd@FreeBSD.org COMMENT= Voice chat software primarily intended for use while gaming WWW= https://www.mumble.info/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ microsoft-gsl>=3.0.0:devel/microsoft-gsl \ ${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json LIB_DEPENDS= libsndfile.so:audio/libsndfile \ libopus.so:audio/opus \ libspeexdsp.so:audio/speexdsp \ libabsl_base.so:devel/abseil \ libpcre2-8.so:devel/pcre2 \ libPocoXML.so:devel/poco \ libPocoZip.so:devel/poco \ libprotobuf.so:devel/protobuf \ libexpat.so:textproc/expat2 USES= cmake compiler:c++17-lang cpe desktop-file-utils \ pkgconfig python:build qt:5 ssl xorg USE_CXXSTD= c++17 USE_LDCONFIG= yes USE_QT= buildtools:build concurrent core dbus gui l10n linguist:build network \ qmake:build sql sql-sqlite3:run svg widgets xml USE_XORG= x11 xext xi CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 CMAKE_ON= client oss overlay plugins translations xinput2 CMAKE_OFF= bundled-gsl bundled-json bundle-qt-translations bundled-speex \ crash-report g15 server tracy update CONFIGURE_ENV= MUMBLE_PYTHON=${PYTHON_CMD} CXXFLAGS+= -Wno-deprecated-declarations PLIST_SUB= MUMBLE_VERSION="${DISTVERSION:R}" OPTIONS_DEFINE= ALSA AVAHI JACK LTO PIPEWIRE PORTAUDIO PULSEAUDIO RENAMENOISE OPTIONS_DEFINE_amd64= OVERLAY_32BIT OPTIONS_DEFAULT= RENAMENOISE OPTIONS_DEFAULT_amd64= OVERLAY_32BIT OPTIONS_RADIO= SPEECH OPTIONS_RADIO_SPEECH= QTSPEECH SPEECHD OVERLAY_32BIT_DESC= Build and install 32bit overlay module QTSPEECH_DESC= Use Qt's text-to-speech system RENAMENOISE_DESC= Use ReNameNoise for machine learning noise reduction SPEECHD_DESC= Support for Speech Dispatcher SPEECH_DESC= Support text-to-speech ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= alsa AVAHI_LIB_DEPENDS= libdns_sd.so:net/avahi-libdns AVAHI_CMAKE_BOOL= zeroconf JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= jackaudio LTO_BROKEN= "QWidget: Cannot create a QWidget without QApplication": \ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273078 LTO_CMAKE_BOOL= lto OVERLAY_32BIT_CMAKE_BOOL= overlay-xcompile PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_CMAKE_BOOL= pipewire PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CMAKE_BOOL= portaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= pulseaudio QTSPEECH_USE= QT=speech QTSPEECH_CMAKE_BOOL= qtspeech RENAMENOISE_CMAKE_BOOL= bundled-renamenoise renamenoise SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher SPEECHD_USES= gettext-runtime gnome SPEECHD_USE= GNOME=glib20 SPEECHD_CMAKE_BOOL= speechd .include .if ${PORT_OPTIONS:MOVERLAY_32BIT} . if ${ARCH} == amd64 PLIST_SUB+= OVERLAY_32BIT="" PLIST_SUB+= OVERLAY_32BIT_SUFFIX=.x86 PLIST_SUB+= OVERLAY_NATIVE_SUFFIX=.x86_64 . endif .else PLIST_SUB+= OVERLAY_32BIT="@comment " PLIST_SUB+= OVERLAY_NATIVE_SUFFIX="" .endif .include diff --git a/multimedia/nymphcast/Makefile b/multimedia/nymphcast/Makefile index 800a76f6b2cc..5043a63861f4 100644 --- a/multimedia/nymphcast/Makefile +++ b/multimedia/nymphcast/Makefile @@ -1,35 +1,35 @@ PORTNAME= NymphCast DISTVERSION= v0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MAINTAINER= adridg@FreeBSD.org COMMENT= Audio and video source for a television or powered speakers WWW= http://nyanko.ws/nymphcast.php # The LICENSE_FILE lives outside the top-of-the-tree because # WRKSRC_SUBDIR is set. LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../../LICENSE BUILD_DEPENDS= rapidjson>=0:devel/rapidjson LIB_DEPENDS= libnymphrpc.so:multimedia/nymphrpc \ libnymphcast.so:multimedia/nymphcastlib \ libasound.so:audio/alsa-lib \ libPocoFoundation.so:devel/poco \ libcurl.so:ftp/curl \ libfreeimage.so:graphics/freeimage \ libavutil.so:multimedia/ffmpeg \ libvlccore.so:multimedia/vlc \ libfreetype.so:print/freetype2 USES= compiler:c++17-lang gl gmake pkgconfig sdl USE_GL= gl USE_SDL= sdl2 image2 USE_GITHUB= yes GH_ACCOUNT= MayaPosch WRKSRC_SUBDIR= src/server .include diff --git a/multimedia/nymphcastlib/Makefile b/multimedia/nymphcastlib/Makefile index 287a313b3aa6..f1a45a100165 100644 --- a/multimedia/nymphcastlib/Makefile +++ b/multimedia/nymphcastlib/Makefile @@ -1,22 +1,22 @@ PORTNAME= NymphCastLib DISTVERSION= v0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= adridg@FreeBSD.org COMMENT= Core functionality for a NymphCast client WWW= https://github.com/MayaPosch/libnymphcast LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libnymphrpc.so:multimedia/nymphrpc \ libPocoNet.so:devel/poco USES= compiler:c++17-lang gmake USE_GITHUB= yes GH_ACCOUNT= MayaPosch GH_PROJECT= libnymphcast .include diff --git a/multimedia/nymphrpc/Makefile b/multimedia/nymphrpc/Makefile index def05fe85284..ea465b95ffe6 100644 --- a/multimedia/nymphrpc/Makefile +++ b/multimedia/nymphrpc/Makefile @@ -1,20 +1,20 @@ PORTNAME= NymphRPC DISTVERSION= v0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia devel MAINTAINER= adridg@FreeBSD.org COMMENT= Compact, C++-based Remote Procedure Call (RPC) library WWW= https://github.com/MayaPosch/NymphRPC LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libPocoNet.so:devel/poco USES= compiler:c++17-lang gmake USE_GITHUB= yes GH_ACCOUNT= MayaPosch .include diff --git a/multimedia/nymphrpc/files/patch-Makefile b/multimedia/nymphrpc/files/patch-Makefile index e0039b646257..668c8edbe7fa 100644 --- a/multimedia/nymphrpc/files/patch-Makefile +++ b/multimedia/nymphrpc/files/patch-Makefile @@ -1,82 +1,83 @@ ---- Makefile.orig 2021-12-16 10:20:49 UTC +--- Makefile.orig 2022-03-20 11:56:45 UTC +++ Makefile -@@ -7,6 +7,8 @@ +@@ -7,6 +7,8 @@ export TOP := $(CURDIR) export TOP := $(CURDIR) +CXX ?= g++ + ifndef ANDROID_ABI_LEVEL - ANDROID_ABI_LEVEL := 21 + ANDROID_ABI_LEVEL := 24 endif -@@ -31,9 +33,7 @@ TOOLCHAIN_POSTFIX := .cmd +@@ -37,9 +39,7 @@ endif endif endif -ifndef ARCH -ARCH := $(shell g++ -dumpmachine)/ -endif +ARCH := USYS := $(shell uname -s) UMCH := $(shell uname -m) -@@ -60,7 +60,7 @@ MAKEDIR = mkdir -p +@@ -71,7 +71,7 @@ else RM = rm AR = ar else -GCC = g++ +GCC = $(CXX) MAKEDIR = mkdir -p RM = rm AR = ar -@@ -81,9 +81,10 @@ endif +@@ -92,9 +92,10 @@ INCLUDE = -I src INCLUDE = -I src +INCLUDE += -I /usr/local/include LIBS := -lPocoNet -lPocoUtil -lPocoFoundation -lPocoJSON - CFLAGS := $(INCLUDE) -g3 -std=c++11 -O0 +-CFLAGS := $(INCLUDE) -g3 -std=c++11 -O0 -SHARED_FLAGS := -fPIC -shared -Wl,$(SONAME),$(LIBNAME) ++CFLAGS := $(INCLUDE) -g3 -std=c++14 -O0 +SHARED_FLAGS := -fPIC -shared -Wl,$(SONAME),$(LIBNAME) -L /usr/local/lib ifdef ANDROID CFLAGS += -fPIC -@@ -113,9 +114,10 @@ SOURCES := $(wildcard src/*.cpp) +@@ -132,9 +133,10 @@ SHARED_OBJECTS := $(addprefix obj/shared/$(ARCH),$(not OBJECTS := $(addprefix obj/static/$(ARCH),$(notdir) $(SOURCES:.cpp=.o)) SHARED_OBJECTS := $(addprefix obj/shared/$(ARCH),$(notdir) $(SOURCES:.cpp=.o)) -all: lib +all: makedir + $(MAKE) lib -lib: makedir lib/$(ARCH)$(OUTPUT).a lib/$(ARCH)$(LIBNAME) +lib: makedir lib/$(OUTPUT).a lib/$(LIBNAME) obj/static/$(ARCH)%.o: %.cpp $(GCC) -c -o $@ $< $(CFLAGS) -@@ -123,11 +125,11 @@ obj/static/$(ARCH)%.o: %.cpp +@@ -142,11 +144,11 @@ obj/shared/$(ARCH)%.o: %.cpp obj/shared/$(ARCH)%.o: %.cpp $(GCC) -c -o $@ $< $(SHARED_FLAGS) $(CFLAGS) $(LIBS) -lib/$(ARCH)$(OUTPUT).a: $(OBJECTS) +lib/$(OUTPUT).a: $(OBJECTS) -rm -f $@ $(AR) rcs $@ $^ -lib/$(ARCH)$(LIBNAME): $(SHARED_OBJECTS) +lib/$(LIBNAME): $(SHARED_OBJECTS) $(GCC) -o $@ $(CFLAGS) $(SHARED_FLAGS) $(SHARED_OBJECTS) $(LIBS) makedir: -@@ -165,9 +167,9 @@ endif +@@ -184,9 +186,9 @@ install: .PHONY: install install: install -d $(DESTDIR)$(PREFIX)/lib/ - install -m 644 lib/$(ARCH)$(OUTPUT).a $(DESTDIR)$(PREFIX)/lib/ + install -m 644 lib/$(OUTPUT).a $(DESTDIR)$(PREFIX)/lib/ ifndef OS - install -m 644 lib/$(ARCH)$(OUTPUT).so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/ + install -m 644 lib/$(OUTPUT).so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/ endif install -d $(DESTDIR)$(PREFIX)/include/nymph install -m 644 src/*.h $(DESTDIR)$(PREFIX)/include/nymph/ diff --git a/security/clamfs/Makefile b/security/clamfs/Makefile index fa8fcb11d66a..0481dd1eb6dc 100644 --- a/security/clamfs/Makefile +++ b/security/clamfs/Makefile @@ -1,43 +1,42 @@ PORTNAME= clamfs -PORTVERSION= 1.2.0 -PORTREVISION= 4 +DISTVERSION= 1.2.0 +PORTREVISION= 5 CATEGORIES= security -MASTER_SITES= https://github.com/burghardt/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ +MASTER_SITES= https://github.com/burghardt/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ MAINTAINER= anastasios@mageirias.com COMMENT= User-space fs with on-access antivirus scanning WWW= https://github.com/burghardt/clamfs LICENSE= GPLv2 BUILD_DEPENDS= boost-libs>=1.33:devel/boost-libs LIB_DEPENDS= libPocoFoundation.so:devel/poco \ libPocoNet.so:devel/poco \ libPocoXML.so:devel/poco \ librlog.so:devel/rlog RUN_DEPENDS= clamd:security/clamav USES= autoreconf compiler:c++11-lib fuse:3 pkgconfig GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share PLIST_FILES= bin/clamfs \ share/man/man1/clamfs.1.gz PORTDOCS= * OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|-Werror ||g' ${WRKSRC}/configure.ac post-patch-DOCS-on: @${REINPLACE_CMD} -e '/socket=/s/ctl/sock/' \ ${WRKSRC}/doc/clamfs.xml ${WRKSRC}/doc/debug.xml post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/clamfs.xml ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/debug.xml ${STAGEDIR}${DOCSDIR} .include