Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Jan 2017 15:33:27 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432924 - in head/graphics/hsetroot: . files
Message-ID:  <201701311533.v0VFXRnm021583@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Tue Jan 31 15:33:27 2017
New Revision: 432924
URL: https://svnweb.freebsd.org/changeset/ports/432924

Log:
  Unbreak and undeprecate by switching to GitHub repo which contains version
  1.0.2 source code with the following changes:
  
     - Autotools got replaced by a simple Makefile (still had to be patched)
     - Includes patches from Debian, written by Martin Suchanek
     - Fix a segmentation fault when no display is present
     - Add the `-extend' and `-cover' image rendering options (modes)
     - Reintroduced the screen mask `-screens' option from earlier versions
  
  WWW: https://github.com/himdel/hsetroot

Added:
  head/graphics/hsetroot/files/patch-Makefile   (contents, props changed)
  head/graphics/hsetroot/files/patch-outputs__xrandr.c   (contents, props changed)
Deleted:
  head/graphics/hsetroot/files/patch-src-hsetroot.c
Modified:
  head/graphics/hsetroot/Makefile
  head/graphics/hsetroot/distinfo
  head/graphics/hsetroot/pkg-descr

Modified: head/graphics/hsetroot/Makefile
==============================================================================
--- head/graphics/hsetroot/Makefile	Tue Jan 31 15:33:24 2017	(r432923)
+++ head/graphics/hsetroot/Makefile	Tue Jan 31 15:33:27 2017	(r432924)
@@ -3,9 +3,8 @@
 
 PORTNAME=	hsetroot
 PORTVERSION=	1.0.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
-MASTER_SITES=	http://cdn.thegraveyard.org/releases/hsetroot/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Wallpaper manipulation utility for X11
@@ -14,13 +13,20 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
-BROKEN=		unfetchable (apparently abandoned upstream)
+USE_GITHUB=	yes
+GH_ACCOUNT=	himdel
+GH_TAGNAME=	47d887b
 
-GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		pkgconfig
 USE_XORG=	x11
-LDFLAGS+=	-L${LOCALBASE}/lib -lX11
 
 PLIST_FILES=	bin/hsetroot
+PORTDOCS=	README.md
+
+OPTIONS_DEFINE=	DOCS
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/graphics/hsetroot/distinfo
==============================================================================
--- head/graphics/hsetroot/distinfo	Tue Jan 31 15:33:24 2017	(r432923)
+++ head/graphics/hsetroot/distinfo	Tue Jan 31 15:33:27 2017	(r432924)
@@ -1,2 +1,3 @@
-SHA256 (hsetroot-1.0.2.tar.gz) = d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7
-SIZE (hsetroot-1.0.2.tar.gz) = 125535
+TIMESTAMP = 1455408551
+SHA256 (himdel-hsetroot-1.0.2-47d887b_GH0.tar.gz) = 5d84b6f34e9c6d2e33a6bbe7a41be5b3100782603b1a4b07e8705a204b39d9be
+SIZE (himdel-hsetroot-1.0.2-47d887b_GH0.tar.gz) = 5827

Added: head/graphics/hsetroot/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/hsetroot/files/patch-Makefile	Tue Jan 31 15:33:27 2017	(r432924)
@@ -0,0 +1,28 @@
+--- Makefile.orig	2016-02-14 00:09:11 UTC
++++ Makefile
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ 
+ CFLAGS?=-g -O2 -Wall
+ LDFLAGS?=
+@@ -9,14 +9,17 @@ LDFLAGS+=`pkg-config x11 --libs`
+ CFLAGS+=`pkg-config imlib2 --cflags`
+ LDFLAGS+=`pkg-config imlib2 --libs`
+ 
++all: hsetroot
++
+ hsetroot: hsetroot.o outputs_xrandr.o
++	$(CC) $(LDFLAGS) -o $@ $>
+ 
+ hsetroot.o: hsetroot.c outputs.h
+ 
+-outputs.o: outputs.c outputs.h
++outputs_xrandr.o: outputs_xrandr.c outputs.h
+ 
+ install: hsetroot
+-	install -st /usr/local/bin/ hsetroot
++	$(BSD_INSTALL_PROGRAM) $> $(DESTDIR)$(PREFIX)/bin
+ 
+ clean:
+ 	rm -f hsetroot *.o

Added: head/graphics/hsetroot/files/patch-outputs__xrandr.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/hsetroot/files/patch-outputs__xrandr.c	Tue Jan 31 15:33:27 2017	(r432924)
@@ -0,0 +1,12 @@
+--- outputs_xrandr.c.orig	2016-02-14 00:09:11 UTC
++++ outputs_xrandr.c
+@@ -31,7 +31,8 @@ OutputInfo
+     close(pipefd[0]);
+     dup2(pipefd[1], STDOUT_FILENO);
+ 
+-    system("xrandr | grep ' connected' | sed -e 's/^.*\\s\\+\\([0-9]\\+x[0-9]\\+[-+][0-9]\\+[-+][0-9]\\+\\)\\s\\+.*$/\\1/'");
++    //system("xrandr | grep ' connected' | gsed -e 's/^.*\\s\\+\\([0-9]\\+x[0-9]\\+[-+][0-9]\\+[-+][0-9]\\+\\)\\s\\+.*$/\\1/'");
++    system("xrandr | grep ' connected' | sed -E -e 's/^.*[[:blank:]]+([0-9]+x[0-9]+[-+][0-9]+[-+][0-9]+)[[:blank:]]+.*$/\\1/'");
+ 
+     close(pipefd[1]);
+     _exit(0);

Modified: head/graphics/hsetroot/pkg-descr
==============================================================================
--- head/graphics/hsetroot/pkg-descr	Tue Jan 31 15:33:24 2017	(r432923)
+++ head/graphics/hsetroot/pkg-descr	Tue Jan 31 15:33:27 2017	(r432924)
@@ -13,4 +13,4 @@ diagonally, vertically) it also allows y
 and gamma-level.  hsetroot also supports alpha-channels when rendering
 things.
 
-WWW: http://thegraveyard.org/hsetroot.php
+WWW: https://github.com/himdel/hsetroot



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701311533.v0VFXRnm021583>