wip/sonic Let out implicit variables from Makefile patch, just preserve PREFIX

[adr <adr%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	adr <adr%sdf.org@localhost>
Pushed By:	adr
Date:		Tue Jan 30 08:30:39 2024 +0000
Changeset:	5955793b31e07471676a6f98f3c888fee45b2ff6

Modified Files:
	sonic/distinfo
	sonic/patches/patch-Makefile

Log Message:
wip/sonic Let out implicit variables from Makefile patch, just preserve PREFIX

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5955793b31e07471676a6f98f3c888fee45b2ff6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sonic/distinfo               |  2 +-
 sonic/patches/patch-Makefile | 33 ++++++++-------------------------
 2 files changed, 9 insertions(+), 26 deletions(-)

diffs:
diff --git a/sonic/distinfo b/sonic/distinfo
index de7c713304..ff2937133f 100644
--- a/sonic/distinfo
+++ b/sonic/distinfo
@@ -3,4 +3,4 @@ $NetBSD$
 BLAKE2s (sonic-0.0.0.225-8694c596378c24e340c09ff2cd47c065494233f1.tar.gz) = dd7bd4ad2d345e9ff370d71e197312d96a6656ce899784e1a4128638c549f191
 SHA512 (sonic-0.0.0.225-8694c596378c24e340c09ff2cd47c065494233f1.tar.gz) = 8bc124915b4bc6d98ad92968e137067e1b48a28aaf84aee725dbad71885aa8e1c3b23c0ae8d827fa07620d2c0116b5e40daa0229981fc2615b2c490d61cddf59
 Size (sonic-0.0.0.225-8694c596378c24e340c09ff2cd47c065494233f1.tar.gz) = 5358482 bytes
-SHA1 (patch-Makefile) = bf9547df890b8571833f3531e00c24ff0cc5b1bb
+SHA1 (patch-Makefile) = 6d99fbfe6f27eb25a0e9123c288ce437c803c5a0
diff --git a/sonic/patches/patch-Makefile b/sonic/patches/patch-Makefile
index ba52d66874..f396c3b0ff 100644
--- a/sonic/patches/patch-Makefile
+++ b/sonic/patches/patch-Makefile
@@ -1,40 +1,23 @@
 $NetBSD$
 
-Let pkgsrc manage flags, &c.
+Preserve PREFIX
 
 --- Makefile.orig	2023-10-12 22:32:47.000000000 +0000
 +++ Makefile
-@@ -11,6 +11,7 @@
+@@ -11,13 +11,13 @@
  # speech recognition.
  #USE_SPECTROGRAM=1
  
-+ifndef PACKAGING
- PREFIX=/usr
- 
+-PREFIX=/usr
+-
  UNAME := $(shell uname)
-@@ -18,6 +19,13 @@ ifeq ($(UNAME), Darwin)
-   PREFIX=/usr/local
+ ifeq ($(UNAME), Darwin)
+-  PREFIX=/usr/local
++  PREFIX?=/usr/local
  endif
  
-+#CFLAGS=-Wall -Wno-unused-function -g -ansi -fPIC -pthread
-+CFLAGS ?= -O3
-+CFLAGS += -Wall -Wno-unused-function -ansi -fPIC -pthread
-+
-+CC=gcc
-+endif
++PREFIX?=/usr
 +
  BINDIR=$(PREFIX)/bin
  LIBDIR=$(PREFIX)/lib
  INCDIR=$(PREFIX)/include
-@@ -35,11 +43,6 @@ ifeq ($(UNAME), Darwin)
-   LIB_TAG=
- endif
- 
--#CFLAGS=-Wall -Wno-unused-function -g -ansi -fPIC -pthread
--CFLAGS ?= -O3
--CFLAGS += -Wall -Wno-unused-function -ansi -fPIC -pthread
--
--CC=gcc
- 
- # Set NO_MALLOC=1 as a parameter to make to compile Sonic with static buffers
- # instead of calling malloc.  This is usefule primarily on microcontrollers.