diff --git a/multimedia/nymphcast/Makefile b/multimedia/nymphcast/Makefile
index 8541324460fb..f05fc6969883 100644
--- a/multimedia/nymphcast/Makefile
+++ b/multimedia/nymphcast/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	NymphCast
 DISTVERSION=	v0.1-rc0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 # -p3 because WRKSRC_SUBDIR is set; the patches are from the toplevel,
 # similarly the LICENSE_FILE lives at the toplevel of the upstream
 # source repo, outside of WRKSRC_SUBDIR.
 PATCHFILES=	e4de6983e738acff88db8c81a2e5bb0760db5855.patch:-p3 \
 		1d32a9d470dd8b6c2af5f6638b53b9a012865cc7.patch:-p3 \
 		40e8c286f7d5f37e976e655a086d5630107c7f09.patch:-p3 \
 		9e192666796bdb1913a2f965314a8cf51c2a644f.patch:-p3
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Audio and video source for a television or powered speakers
 
 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 \
-		libSDL2.so:devel/sdl20 \
 		libcurl.so:ftp/curl \
 		libfreeimage.so:graphics/freeimage \
-		libSDL2_image-2.0.so.0:graphics/sdl2_image \
 		libavutil.so:multimedia/ffmpeg \
 		libvlccore.so:multimedia/vlc \
 		libfreetype.so:print/freetype2
 
-USES=		compiler:c++17-lang gl gmake pkgconfig
+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
 
 post-extract:
 	${MV} ${WRKSRC}/version ${WRKSRC}/version.mk
 
 .include <bsd.port.mk>
diff --git a/multimedia/nymphrpc/Makefile b/multimedia/nymphrpc/Makefile
index f36c8dd07393..bf772153a811 100644
--- a/multimedia/nymphrpc/Makefile
+++ b/multimedia/nymphrpc/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	NymphRPC
 DISTVERSION=	v0.1-alpha1
+PORTREVISION=	1
 CATEGORIES=	multimedia devel
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Compact, C++-based Remote Procedure Call (RPC) library
 
 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 <bsd.port.mk>
diff --git a/multimedia/nymphrpc/files/patch-Makefile b/multimedia/nymphrpc/files/patch-Makefile
index 660f7f7da65f..e0039b646257 100644
--- a/multimedia/nymphrpc/files/patch-Makefile
+++ b/multimedia/nymphrpc/files/patch-Makefile
@@ -1,78 +1,82 @@
 --- Makefile.orig	2021-12-16 10:20:49 UTC
 +++ Makefile
 @@ -7,6 +7,8 @@
  
  export TOP := $(CURDIR)
  
 +CXX ?= g++
 +
  ifndef ANDROID_ABI_LEVEL
  ANDROID_ABI_LEVEL := 21
  endif
 @@ -31,9 +33,7 @@ TOOLCHAIN_POSTFIX := .cmd
  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
  RM = rm
  AR = ar 
  else
 -GCC = g++
 +GCC = $(CXX)
  MAKEDIR = mkdir -p
  RM = rm
  AR = ar
 @@ -81,9 +81,10 @@ endif
  
  
  INCLUDE = -I src
 +INCLUDE += -I /usr/local/include
  LIBS := -lPocoNet -lPocoUtil -lPocoFoundation -lPocoJSON 
  CFLAGS := $(INCLUDE) -g3 -std=c++11 -O0
 -SHARED_FLAGS := -fPIC -shared -Wl,$(SONAME),$(LIBNAME)
 +SHARED_FLAGS := -fPIC -shared -Wl,$(SONAME),$(LIBNAME) -L /usr/local/lib
  
  ifdef ANDROID
  CFLAGS += -fPIC
-@@ -115,7 +116,7 @@ SHARED_OBJECTS := $(addprefix obj/shared/$(ARCH),$(not
+@@ -113,9 +114,10 @@ SOURCES := $(wildcard src/*.cpp)
+ OBJECTS := $(addprefix obj/static/$(ARCH),$(notdir) $(SOURCES:.cpp=.o))
+ SHARED_OBJECTS := $(addprefix obj/shared/$(ARCH),$(notdir) $(SOURCES:.cpp=.o))
  
- all: lib
+-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 +124,11 @@ obj/static/$(ARCH)%.o: %.cpp
+@@ -123,11 +125,11 @@ obj/static/$(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 +166,9 @@ endif
+@@ -165,9 +167,9 @@ endif
  .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/