herbe: simplify Makefile & patch

[pin <voidpin%protonmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Mon Nov 6 08:56:19 2023 +0100
Changeset:	413656030e921dd467d4cafa7c56849ecd48c5fd

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

Log Message:
herbe: simplify Makefile & patch

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

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

diffstat:
 herbe/Makefile               |  9 +++------
 herbe/distinfo               |  8 ++++----
 herbe/patches/patch-Makefile | 14 ++++++--------
 3 files changed, 13 insertions(+), 18 deletions(-)

diffs:
diff --git a/herbe/Makefile b/herbe/Makefile
index 1051215a5a..58f4327971 100644
--- a/herbe/Makefile
+++ b/herbe/Makefile
@@ -1,19 +1,16 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	herbe
-GITHUB_TAG=	refs/tags/1.0.0
-DISTNAME=	1.0.0
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
+DISTNAME=	herbe-1.0.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=dudik/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	kevin.bloom%posteo.net@localhost
 HOMEPAGE=	https://github.com/dudik/herbe/
 COMMENT=	Daemon-less notifications without D-Bus
 LICENSE=	mit
 
-WRKSRC=	${WRKDIR}/herbe-1.0.0
+MAKE_FLAGS+=	CC=${CC}
+MAKE_FLAGS+=	PREFIX=${PREFIX}
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/herbe/distinfo b/herbe/distinfo
index 378bb6c5eb..135bf8bb38 100644
--- a/herbe/distinfo
+++ b/herbe/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-BLAKE2s (herbe/1.0.0.tar.gz) = 726f956b4b21a0d74a19a044c0b4831fec44efd9fe999638da01cc0f15ee3f1a
-SHA512 (herbe/1.0.0.tar.gz) = 3f49de25fd92194d1354054c207616343d9c21a9d82c6c4e3316ebc5228c0bd90650621438d14cd4730135f328c0438ef054a2b6843f3bd4d15f9cb47a22df12
-Size (herbe/1.0.0.tar.gz) = 4974 bytes
-SHA1 (patch-Makefile) = e5eb2dc188594e1ce51fed02b112c347de6d59f6
+BLAKE2s (herbe-1.0.0.tar.gz) = 726f956b4b21a0d74a19a044c0b4831fec44efd9fe999638da01cc0f15ee3f1a
+SHA512 (herbe-1.0.0.tar.gz) = 3f49de25fd92194d1354054c207616343d9c21a9d82c6c4e3316ebc5228c0bd90650621438d14cd4730135f328c0438ef054a2b6843f3bd4d15f9cb47a22df12
+Size (herbe-1.0.0.tar.gz) = 4974 bytes
+SHA1 (patch-Makefile) = 9731572846cf63fc3be213102c070811d18c3845
diff --git a/herbe/patches/patch-Makefile b/herbe/patches/patch-Makefile
index 462ab05cb0..33165d6e23 100644
--- a/herbe/patches/patch-Makefile
+++ b/herbe/patches/patch-Makefile
@@ -1,15 +1,13 @@
 $NetBSD$
 
+Fix build on NetBSD.
+
 --- Makefile.orig	2020-08-23 11:35:19.000000000 +0000
 +++ Makefile
-@@ -1,6 +1,7 @@
+@@ -1,4 +1,5 @@
 -CFLAGS = -Wall -Wextra -pedantic -lX11 -lXft -I/usr/include/freetype2 -pthread
 +CFLAGS += -Wall -Wextra -pedantic -I${X11BASE}/include -L${X11BASE}/lib \
-+-lX11 -lXft -I${X11BASE}/include/freetype2 -pthread $(LDFLAGS)
- 
--PREFIX ?= /usr/local
-+PREFIX ?= ${PREFIX}
--CC ?= cc
-+CC ?= ${CC:Q}
++	-lX11 -lXft -I${X11BASE}/include/freetype2 -pthread $(LDFLAGS)
  
- all: herbe
+ PREFIX ?= /usr/local
+ CC ?= cc