sonic: clean up, simplify

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Tue Jan 30 10:00:03 2024 +0100
Changeset:	7742ea891c1367f322fc12690f962bdb8e850c93

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

Log Message:
sonic: clean up, simplify

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

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

diffstat:
 sonic/Makefile               |  6 +++---
 sonic/distinfo               |  1 -
 sonic/patches/patch-Makefile | 23 -----------------------
 3 files changed, 3 insertions(+), 27 deletions(-)

diffs:
diff --git a/sonic/Makefile b/sonic/Makefile
index 6adc906b94..5c9f54557c 100644
--- a/sonic/Makefile
+++ b/sonic/Makefile
@@ -13,8 +13,8 @@ LICENSE=	apache-2.0
 
 USE_LANGUAGES=		c
 USE_TOOLS=		gmake
-CFLAGS+=		-Wall -O3 -Wno-unused-function -ansi -fPIC -pthread
-CFLAGS+=		-Wl,-rpath=${PREFIX}/lib
-CHECK_SHLIBS_SKIP=	bin/sonic
+CFLAGS+=		-Wall -Wno-unused-function -ansi -fPIC -pthread
+CFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib
+MAKE_FLAGS+=		PREFIX=${PREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sonic/distinfo b/sonic/distinfo
index ff2937133f..7c9ec7d292 100644
--- a/sonic/distinfo
+++ b/sonic/distinfo
@@ -3,4 +3,3 @@ $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) = 6d99fbfe6f27eb25a0e9123c288ce437c803c5a0
diff --git a/sonic/patches/patch-Makefile b/sonic/patches/patch-Makefile
deleted file mode 100644
index f396c3b0ff..0000000000
--- a/sonic/patches/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-Preserve PREFIX
-
---- Makefile.orig	2023-10-12 22:32:47.000000000 +0000
-+++ Makefile
-@@ -11,13 +11,13 @@
- # speech recognition.
- #USE_SPECTROGRAM=1
- 
--PREFIX=/usr
--
- UNAME := $(shell uname)
- ifeq ($(UNAME), Darwin)
--  PREFIX=/usr/local
-+  PREFIX?=/usr/local
- endif
- 
-+PREFIX?=/usr
-+
- BINDIR=$(PREFIX)/bin
- LIBDIR=$(PREFIX)/lib
- INCDIR=$(PREFIX)/include