hsetroot: Update to 1.0.5

Changes:

- Adds -root parameter, to treat the whole desktop as one display, applying the image over the whole, instead of per each display.
- finding the details of xrandr outputs no longer uses grep and sed to parse the xrandr command line output, using libxinerama instead
- using XParseColor to parse color names - supports things like "black" or "#000" in addition to the exisitng formats
- add an (optional) hsr-outputs tool, to output output sizes and position as text, csv or json

4 files changed, 17 insertions, 34 deletions

diff --git a/x11/hsetroot/Makefile b/x11/hsetroot/Makefile
index 872a359c466..ab10ddef934 100644
--- a/x11/hsetroot/Makefile
+++ b/x11/hsetroot/Makefile
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.25 2017/09/19 08:21:10 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2020/05/17 14:40:29 nia Exp $
 
-DISTNAME=	hsetroot-1.0.2
-PKGREVISION=	14
+DISTNAME=	hsetroot-1.0.5
 CATEGORIES=	x11
-MASTER_SITES=	http://thegraveyard.org/files/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=himdel/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/himdel/hsetroot
 COMMENT=	Allows you to compose wallpapers for X
 LICENSE=	gnu-gpl-v2
 
-MAKE_JOBS_SAFE=		no
+USE_TOOLS+=	gmake pkg-config
 
-GNU_CONFIGURE=	yes
+INSTALLATION_DIRS+=	bin
 
-LDFLAGS.SunOS+=	-lX11
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/hsetroot ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/hsr-outputs ${DESTDIR}${PREFIX}/bin
 
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/hsetroot/PLIST b/x11/hsetroot/PLIST
index 7d22b1c54ee..96356d36032 100644
--- a/x11/hsetroot/PLIST
+++ b/x11/hsetroot/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/05/22 09:16:28 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/05/17 14:40:29 nia Exp $
 bin/hsetroot
+bin/hsr-outputs
diff --git a/x11/hsetroot/distinfo b/x11/hsetroot/distinfo
index 62575e0a379..9f2237943dd 100644
--- a/x11/hsetroot/distinfo
+++ b/x11/hsetroot/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 03:28:33 agc Exp $
+$NetBSD: distinfo,v 1.4 2020/05/17 14:40:29 nia Exp $
 
-SHA1 (hsetroot-1.0.2.tar.gz) = a39e0fff11eb17e5432761aabcd8b68242210bb5
-RMD160 (hsetroot-1.0.2.tar.gz) = 0aadf0308ec0068525babca338a35cc3899c1dc9
-SHA512 (hsetroot-1.0.2.tar.gz) = 51788a6b579b82368ef5e11255ff56e2db978a02f7ad752ba64ec33c56ae5f27c1f0ef3452725d1c7bdb9d97b8a3a5b64422031c9c75a7279c407b8772d5edc3
-Size (hsetroot-1.0.2.tar.gz) = 125535 bytes
-SHA1 (patch-aa) = 72abcf8b764bd9b9109915da7da3a370f274bdf3
+SHA1 (hsetroot-1.0.5.tar.gz) = b24b1a24fe93b67f886ebe5a9cda7bf547ab2886
+RMD160 (hsetroot-1.0.5.tar.gz) = 270b15a8a89204a7194d928e052830401c9afe3b
+SHA512 (hsetroot-1.0.5.tar.gz) = b43f7cd75886e72cb6134446d383d7d9a684c818f2d8a0f829670c8dfca5eaaa1eb6c25f30dda41f3483609b25e8a44a3a3cb3a969bba7f77a9b9df712fa2167
+Size (hsetroot-1.0.5.tar.gz) = 12878 bytes
diff --git a/x11/hsetroot/patches/patch-aa b/x11/hsetroot/patches/patch-aa
deleted file mode 100644
index b03d5b74fe1..00000000000
--- a/x11/hsetroot/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/07/25 03:14:09 kristerw Exp $
-
---- src/hsetroot.c.orig	Mon Jul 25 04:56:26 2005
-+++ src/hsetroot.c	Mon Jul 25 04:57:46 2005
-@@ -179,11 +179,12 @@
-   if (alpha < 255)
-     {
-       // Create alpha-override mask
-+      Imlib_Color_Modifier modifier;
-+      DATA8 red[256], green[256], blue[256], alph[256];
-       imlib_image_set_has_alpha (1);
--      Imlib_Color_Modifier modifier = imlib_create_color_modifier ();
-+      modifier = imlib_create_color_modifier ();
-       imlib_context_set_color_modifier (modifier);
- 
--      DATA8 red[256], green[256], blue[256], alph[256];
-       imlib_get_color_modifier_tables (red, green, blue, alph);
-       for (o = 0; o < 256; o++)
- 	alph[o] = (DATA8) alpha;