x11/herbe: completed

[Kevin Bloom <kevin.bloom%posteo.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Sun Nov 5 21:04:40 2023 -0500
Changeset:	0fd9c6e572c2a8175653c4fed7b0e83b491be136

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

Log Message:
x11/herbe: completed

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

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

diffstat:
 herbe/DESCR                  |  3 ++-
 herbe/Makefile               |  3 ++-
 herbe/PLIST                  |  4 +---
 herbe/distinfo               |  2 +-
 herbe/patches/patch-Makefile | 14 +++++++++-----
 5 files changed, 15 insertions(+), 11 deletions(-)

diffs:
diff --git a/herbe/DESCR b/herbe/DESCR
index 3f92a8d7cd..dd897adc14 100644
--- a/herbe/DESCR
+++ b/herbe/DESCR
@@ -1 +1,2 @@
-Daemon-less notifications without D-Bus
+herbe is a daemon-less notifications program that doesn't require
+D-Bus.
diff --git a/herbe/Makefile b/herbe/Makefile
index 67e019df91..1051215a5a 100644
--- a/herbe/Makefile
+++ b/herbe/Makefile
@@ -15,6 +15,7 @@ LICENSE=	mit
 
 WRKSRC=	${WRKDIR}/herbe-1.0.0
 
-.include "../../mk/bsd.pkg.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/herbe/PLIST b/herbe/PLIST
index 92ba51a2d7..26344544e3 100644
--- a/herbe/PLIST
+++ b/herbe/PLIST
@@ -1,4 +1,2 @@
 @comment $NetBSD$
-@comment TODO: to fill this file with the file listing:
-@comment TODO: 1. run "/usr/bin/make package"
-@comment TODO: 2. run "/usr/bin/make print-PLIST"
+bin/herbe
diff --git a/herbe/distinfo b/herbe/distinfo
index 226063b978..378bb6c5eb 100644
--- a/herbe/distinfo
+++ b/herbe/distinfo
@@ -3,4 +3,4 @@ $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) = ca9b213b4b9a8d9fe2b756764fa6f5aff39cd0d1
+SHA1 (patch-Makefile) = e5eb2dc188594e1ce51fed02b112c347de6d59f6
diff --git a/herbe/patches/patch-Makefile b/herbe/patches/patch-Makefile
index b9d2335321..462ab05cb0 100644
--- a/herbe/patches/patch-Makefile
+++ b/herbe/patches/patch-Makefile
@@ -2,10 +2,14 @@ $NetBSD$
 
 --- Makefile.orig	2020-08-23 11:35:19.000000000 +0000
 +++ Makefile
-@@ -1,4 +1,5 @@
+@@ -1,6 +1,7 @@
 -CFLAGS = -Wall -Wextra -pedantic -lX11 -lXft -I/usr/include/freetype2 -pthread
-+CFLAGS = -Wall -Wextra -pedantic -I/usr/X11R7/include -L/usr/X11R7/lib \
-+-lX11 -lXft -I/usr/X11R7/include/freetype2 -pthread
++CFLAGS += -Wall -Wextra -pedantic -I${X11BASE}/include -L${X11BASE}/lib \
++-lX11 -lXft -I${X11BASE}/include/freetype2 -pthread $(LDFLAGS)
  
- PREFIX ?= /usr/local
- CC ?= cc
+-PREFIX ?= /usr/local
++PREFIX ?= ${PREFIX}
+-CC ?= cc
++CC ?= ${CC:Q}
+ 
+ all: herbe