git: d0b3828f268c - main - multimedia/nymphcastlib: update to 0.2.1, latest upstream

The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d0b3828f268c905842c3155556bfcf30efa3d3d6

commit d0b3828f268c905842c3155556bfcf30efa3d3d6
Author:     Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2024-11-14 18:19:25 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2024-11-14 18:22:36 +0000

    multimedia/nymphcastlib: update to 0.2.1, latest upstream
    
    Release notes at
            https://github.com/MayaPosch/libnymphcast/releases/tag/v0.2.1
    which mention FreeBSD compile fixes in particular, which is
    how we can lose the patches in ports.
    
    Dump consumers while we're here.
    
    Reported-by: portscout
---
 multimedia/nymphcast/Makefile                |  2 +-
 multimedia/nymphcastlib/Makefile             |  3 +-
 multimedia/nymphcastlib/distinfo             |  6 +-
 multimedia/nymphcastlib/files/patch-Makefile | 92 ----------------------------
 multimedia/nymphcastlib/pkg-plist            |  2 +-
 5 files changed, 6 insertions(+), 99 deletions(-)

diff --git a/multimedia/nymphcast/Makefile b/multimedia/nymphcast/Makefile
index 5043a63861f4..92f621330a0e 100644
--- a/multimedia/nymphcast/Makefile
+++ b/multimedia/nymphcast/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	NymphCast
 DISTVERSION=	v0.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 
 MAINTAINER=	adridg@FreeBSD.org
diff --git a/multimedia/nymphcastlib/Makefile b/multimedia/nymphcastlib/Makefile
index f1a45a100165..419c70645758 100644
--- a/multimedia/nymphcastlib/Makefile
+++ b/multimedia/nymphcastlib/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	NymphCastLib
-DISTVERSION=	v0.1
-PORTREVISION=	2
+DISTVERSION=	v0.2.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	adridg@FreeBSD.org
diff --git a/multimedia/nymphcastlib/distinfo b/multimedia/nymphcastlib/distinfo
index 96574b87d199..971d70e2d07d 100644
--- a/multimedia/nymphcastlib/distinfo
+++ b/multimedia/nymphcastlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650833765
-SHA256 (MayaPosch-libnymphcast-v0.1_GH0.tar.gz) = 9a8d61b107cc199106913638a03948f57ad9aa6bbfe1cffaa49f851b70e17306
-SIZE (MayaPosch-libnymphcast-v0.1_GH0.tar.gz) = 208571
+TIMESTAMP = 1731522174
+SHA256 (MayaPosch-libnymphcast-v0.2.1_GH0.tar.gz) = 4a824b3aef22e1bc32d4b4fcc6158e7c0e0d674155b031c12a5bdd0c3e534cf0
+SIZE (MayaPosch-libnymphcast-v0.2.1_GH0.tar.gz) = 214673
diff --git a/multimedia/nymphcastlib/files/patch-Makefile b/multimedia/nymphcastlib/files/patch-Makefile
deleted file mode 100644
index c839722e93a0..000000000000
--- a/multimedia/nymphcastlib/files/patch-Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
---- Makefile.orig	2021-12-25 18:20:11 UTC
-+++ Makefile
-@@ -6,6 +6,9 @@
- 
- export TOP := $(CURDIR)
- 
-+CXX ?= c++
-+ARCH =
-+
- ifndef ANDROID_ABI_LEVEL
- ANDROID_ABI_LEVEL := 21
- endif
-@@ -30,10 +33,6 @@ TOOLCHAIN_POSTFIX := .cmd
- endif
- endif
- 
--ifndef ARCH
--ARCH := $(shell g++ -dumpmachine)/
--endif
--
- USYS := $(shell uname -s)
- UMCH := $(shell uname -m)
- 
-@@ -59,7 +58,7 @@ MAKEDIR = mkdir -p
- RM = rm
- AR = ar 
- else
--GCC = g++
-+GCC = $(CXX)
- MAKEDIR = mkdir -p
- RM = rm
- AR = ar
-@@ -76,11 +75,11 @@ ifeq ($(shell uname -s),Darwin)
- 	LIBNAME = $(OUTPUT).0.dylib
- endif
- 
--INCLUDE := -I src
-+INCLUDE := -I src -I /usr/local/include
- LIBS := -lnymphrpc -lPocoNet -lPocoUtil -lPocoFoundation -lPocoJSON 
- #-lstdc++fs
- CFLAGS := $(INCLUDE) -g3 -std=c++17 -O0
--SHARED_FLAGS := -fPIC -shared -Wl,$(SONAME),$(LIBNAME)
-+SHARED_FLAGS := -fPIC -shared -Wl,$(SONAME),$(LIBNAME) -L /usr/local/lib
- 
- ifdef ANDROID
- CFLAGS += -fPIC
-@@ -109,9 +108,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: 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)
-@@ -119,11 +119,11 @@ obj/static/$(ARCH)%.o: %.cpp
- obj/shared/$(ARCH)%.o: %.cpp
- 	$(GCC) -c -o $@ $< $(CFLAGS) $(SHARED_FLAGS) $(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:
-@@ -168,9 +168,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
- 	install -m 644 src/nymphcast_client.h $(DESTDIR)$(PREFIX)/include/
-@@ -183,4 +183,4 @@ ifndef OS
- endif
- 
- package:
--	tar -C lib/$(ARCH) -cvzf lib/$(OUTPUT)-$(VERSION)-$(USYS)-$(UMCH).tar.gz $(OUTPUT).a $(OUTPUT).so.$(VERSION)
-\ No newline at end of file
-+	tar -C lib/$(ARCH) -cvzf lib/$(OUTPUT)-$(VERSION)-$(USYS)-$(UMCH).tar.gz $(OUTPUT).a $(OUTPUT).so.$(VERSION)
diff --git a/multimedia/nymphcastlib/pkg-plist b/multimedia/nymphcastlib/pkg-plist
index a79a77b00558..178d9a5d0a6f 100644
--- a/multimedia/nymphcastlib/pkg-plist
+++ b/multimedia/nymphcastlib/pkg-plist
@@ -1,4 +1,4 @@
 include/nymphcast_client.h
 lib/libnymphcast.a
-lib/libnymphcast.so.0.1
+lib/libnymphcast.so.0.2
 lib/libnymphcast.so