From 128f6c8e6d0421070893a975eaa31c7c827b1ae2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <adridg@FreeBSD.org>
Date: Tue, 22 Feb 2022 00:00:57 +0100
Subject: multimedia/nymphcast: tidy & fix build

- nymphrpc didn't build for me in poudriere, needs a poke
  to ensure that the directory for storing the object files
  is created first (this is erratically a problem with -j)
- nymphcast can USE=sdl, suggestion from makc@
---
 multimedia/nymphrpc/Makefile             |  1 +
 multimedia/nymphrpc/files/patch-Makefile | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'multimedia/nymphrpc')

diff --git a/multimedia/nymphrpc/Makefile b/multimedia/nymphrpc/Makefile
index f36c8dd07393..bf772153a811 100644
--- a/multimedia/nymphrpc/Makefile
+++ b/multimedia/nymphrpc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	NymphRPC
 DISTVERSION=	v0.1-alpha1
+PORTREVISION=	1
 CATEGORIES=	multimedia devel
 
 MAINTAINER=	adridg@FreeBSD.org
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
@@ -41,16 +41,20 @@
  
  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)
  	
@@ -64,7 +68,7 @@
  	$(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/
-- 
cgit v1.2.3