git: afabf7e5e9d9 - main - /: Bump after update devel/poco

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 21 Oct 2024 23:42:04 UTC
The branch main has been updated by vvd:

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

commit afabf7e5e9d9309038f97017dfe689be6b9a6964
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-10-21 23:07:54 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-10-21 23:40:45 +0000

    */*: Bump after update devel/poco
    
    Bump PORTREVISION for all consumers of the devel/poco.
    
    In multimedia/nymphrpc add patch from upstream to support newer poco:
    https://github.com/MayaPosch/NymphRPC/commit/d56411046e06ec33ec8e81f05aa568c28380a679
    https://github.com/MayaPosch/NymphRPC/issues/9
    
    security/clamfs: while here replace PORTVERSION with DISTVERSION and
    remove GNU_CONFIGURE_MANPREFIX.
    
    PR:             282219
    Approved by:    adridg
---
 audio/mumble/Makefile                    |  2 +-
 multimedia/nymphcast/Makefile            |  2 +-
 multimedia/nymphcastlib/Makefile         |  2 +-
 multimedia/nymphrpc/Makefile             |  2 +-
 multimedia/nymphrpc/files/patch-Makefile | 21 +++++++++++----------
 security/clamfs/Makefile                 |  7 +++----
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index ef3dce4b8e80..ef19bb2b3193 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mumble
 DISTVERSION=	1.5.634
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/${PORTNAME}-voip/${PORTNAME}/releases/download/v${DISTVERSION}/
 
diff --git a/multimedia/nymphcast/Makefile b/multimedia/nymphcast/Makefile
index 800a76f6b2cc..5043a63861f4 100644
--- a/multimedia/nymphcast/Makefile
+++ b/multimedia/nymphcast/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	NymphCast
 DISTVERSION=	v0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 
 MAINTAINER=	adridg@FreeBSD.org
diff --git a/multimedia/nymphcastlib/Makefile b/multimedia/nymphcastlib/Makefile
index 287a313b3aa6..f1a45a100165 100644
--- a/multimedia/nymphcastlib/Makefile
+++ b/multimedia/nymphcastlib/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	NymphCastLib
 DISTVERSION=	v0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	adridg@FreeBSD.org
diff --git a/multimedia/nymphrpc/Makefile b/multimedia/nymphrpc/Makefile
index def05fe85284..ea465b95ffe6 100644
--- a/multimedia/nymphrpc/Makefile
+++ b/multimedia/nymphrpc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	NymphRPC
 DISTVERSION=	v0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia devel
 
 MAINTAINER=	adridg@FreeBSD.org
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,15 +1,15 @@
---- 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
  
@@ -20,7 +20,7 @@
  
  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
@@ -29,19 +29,20 @@
  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))
  
@@ -54,7 +55,7 @@
  	
  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)
  	
@@ -68,7 +69,7 @@
  	$(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/
diff --git a/security/clamfs/Makefile b/security/clamfs/Makefile
index fa8fcb11d66a..0481dd1eb6dc 100644
--- a/security/clamfs/Makefile
+++ b/security/clamfs/Makefile
@@ -1,8 +1,8 @@
 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
@@ -20,7 +20,6 @@ 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