summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordanfe <danfe@FreeBSD.org>2017-01-31 15:33:27 +0000
committerdanfe <danfe@FreeBSD.org>2017-01-31 15:33:27 +0000
commit40922576eb13cb685d35d2f508258ac1564891ef (patch)
tree18ec30580d55705eb9d25936f858b1379327cb5a
parent99d6fb951e1ff2f89252cab7484a00d6e837717b (diff)
downloadFreeBSD-ports-40922576eb13cb685d35d2f508258ac1564891ef.zip
FreeBSD-ports-40922576eb13cb685d35d2f508258ac1564891ef.tar.gz
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
-rw-r--r--graphics/hsetroot/Makefile18
-rw-r--r--graphics/hsetroot/distinfo5
-rw-r--r--graphics/hsetroot/files/patch-Makefile28
-rw-r--r--graphics/hsetroot/files/patch-outputs__xrandr.c12
-rw-r--r--graphics/hsetroot/files/patch-src-hsetroot.c18
-rw-r--r--graphics/hsetroot/pkg-descr2
6 files changed, 56 insertions, 27 deletions
diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile
index efd7a95..cfde756 100644
--- a/graphics/hsetroot/Makefile
+++ b/graphics/hsetroot/Makefile
@@ -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>
diff --git a/graphics/hsetroot/distinfo b/graphics/hsetroot/distinfo
index b584384..a085282 100644
--- a/graphics/hsetroot/distinfo
+++ b/graphics/hsetroot/distinfo
@@ -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
diff --git a/graphics/hsetroot/files/patch-Makefile b/graphics/hsetroot/files/patch-Makefile
new file mode 100644
index 0000000..042418f
--- /dev/null
+++ b/graphics/hsetroot/files/patch-Makefile
@@ -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
diff --git a/graphics/hsetroot/files/patch-outputs__xrandr.c b/graphics/hsetroot/files/patch-outputs__xrandr.c
new file mode 100644
index 0000000..ffa443d
--- /dev/null
+++ b/graphics/hsetroot/files/patch-outputs__xrandr.c
@@ -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);
diff --git a/graphics/hsetroot/files/patch-src-hsetroot.c b/graphics/hsetroot/files/patch-src-hsetroot.c
deleted file mode 100644
index 3057899..0000000
--- a/graphics/hsetroot/files/patch-src-hsetroot.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/hsetroot.c.bak Sun Nov 30 19:39:51 2003
-+++ src/hsetroot.c Sun Nov 30 19:37:08 2003
-@@ -179,11 +179,13 @@
- if (alpha < 255)
- {
- // Create alpha-override mask
-- imlib_image_set_has_alpha (1);
- Imlib_Color_Modifier modifier = imlib_create_color_modifier ();
-+ DATA8 red[256], green[256], blue[256], alph[256];
-+
-+
-+ imlib_image_set_has_alpha (1);
- 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;
diff --git a/graphics/hsetroot/pkg-descr b/graphics/hsetroot/pkg-descr
index 087b999..4f5e7c4 100644
--- a/graphics/hsetroot/pkg-descr
+++ b/graphics/hsetroot/pkg-descr
@@ -13,4 +13,4 @@ diagonally, vertically) it also allows you to adjust brightness, contrast
and gamma-level. hsetroot also supports alpha-channels when rendering
things.
-WWW: http://thegraveyard.org/hsetroot.php
+WWW: https://github.com/himdel/hsetroot
OpenPOWER on IntegriCloud