Dmitrij D. Czarkoff said: > Joerg Jung said: > > please find below an update for x11/bgs to 0.7.1. > > WANTLIB needs fixing - bgs now needs libm. Otherwise OK czarkoff@.
And now HOMEPAGE should probably go. -- Dmitrij D. Czarkoff Index: Makefile =================================================================== RCS file: /var/cvs/ports/x11/bgs/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile 2 Nov 2013 13:03:33 -0000 1.13 +++ Makefile 23 May 2015 11:00:13 -0000 @@ -2,19 +2,20 @@ COMMENT = simple background setter -VERSION = 0.5 -DISTNAME = bgs-${VERSION} -REVISION= 3 +VERSION = 0.7.1 +DISTNAME = ${GH_PROJECT}-${VERSION} CATEGORIES = x11 graphics MAINTAINER = Michael Erdely <merd...@openbsd.org> -HOMEPAGE = https://github.com/Gottox/bgs -MASTER_SITES = https://github.com/downloads/Gottox/bgs/ # MIT/X PERMIT_PACKAGE_CDROM = Yes -WANTLIB = X11 Xinerama c Imlib2 +WANTLIB += Imlib2 X11 Xinerama c m + +GH_ACCOUNT = Gottox +GH_PROJECT = bgs +GH_TAGNAME = v${VERSION} LIB_DEPENDS = graphics/imlib2 Index: distinfo =================================================================== RCS file: /var/cvs/ports/x11/bgs/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 18 Jan 2015 03:15:52 -0000 1.3 +++ distinfo 22 May 2015 22:37:38 -0000 @@ -1,2 +1,2 @@ -SHA256 (bgs-0.5.tar.gz) = nAnWu9yKhxD0P9+lupDHpL+5QNhsLanfu5Jb/IRJg6w= -SIZE (bgs-0.5.tar.gz) = 4619 +SHA256 (bgs-0.7.1.tar.gz) = iIPjVAYRRjL0CYqMR6xP+lr9eV2Qh9Crz5181dII9c0= +SIZE (bgs-0.7.1.tar.gz) = 5160 Index: patches/patch-bgs_1 =================================================================== RCS file: /var/cvs/ports/x11/bgs/patches/patch-bgs_1,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-bgs_1 --- patches/patch-bgs_1 16 Jul 2008 16:16:14 -0000 1.1.1.1 +++ patches/patch-bgs_1 22 May 2015 22:37:38 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-bgs_1,v 1.1.1.1 2008/07/16 16:16:14 merdely Exp $ ---- bgs.1.orig Wed Jul 16 11:00:21 2008 -+++ bgs.1 Wed Jul 16 11:00:33 2008 +--- bgs.1.orig Tue May 12 11:09:52 2015 ++++ bgs.1 Fri May 22 21:50:45 2015 @@ -1,4 +1,4 @@ -.TH BGS 1 bgs\-VERSION +.TH BGS 1 bgs\-${VERSION} .SH NAME - bgs \- back ground setter + bgs \- background setter .SH SYNOPSIS Index: patches/patch-bgs_c =================================================================== RCS file: /var/cvs/ports/x11/bgs/patches/patch-bgs_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-bgs_c --- patches/patch-bgs_c 8 Feb 2009 20:41:22 -0000 1.1 +++ patches/patch-bgs_c 22 May 2015 22:37:38 -0000 @@ -1,27 +1,18 @@ $OpenBSD: patch-bgs_c,v 1.1 2009/02/08 20:41:22 merdely Exp $ ---- bgs.c.orig Sun Feb 8 15:14:04 2009 -+++ bgs.c Sun Feb 8 15:16:44 2009 -@@ -87,17 +87,19 @@ drawbg(void) { - } +--- bgs.c.orig Tue May 12 11:09:52 2015 ++++ bgs.c Fri May 22 21:32:54 2015 +@@ -94,10 +94,10 @@ drawbg(void) { imlib_context_set_image(buffer); - if(center) { + switch(mode) { + case ModeCenter: - nw = (monitors[i].w - w) / 2; - nh = (monitors[i].h - h) / 2; +- nx = monitors[i].x + (monitors[i].w - nw) / 2; +- ny = monitors[i].y + (monitors[i].h - nh) / 2; + nw = w; + nh = h; + nx = (monitors[i].w - w) / 2; + ny = (monitors[i].h - h) / 2; - } - else { - factor = MAX((double)w / monitors[i].w, - (double)h / monitors[i].h); - nw = w / factor; - nh = h / factor; -+ nx = monitors[i].x + (monitors[i].w - nw) / 2; -+ ny = monitors[i].y + (monitors[i].h - nh) / 2; - } -- nx = monitors[i].x + (monitors[i].w - nw) / 2; -- ny = monitors[i].y + (monitors[i].h - nh) / 2; - imlib_blend_image_onto_image(tmpimg, 0, 0, 0, w, h, - nx, ny, nw, nh); - imlib_context_set_image(tmpimg); + break; + case ModeZoom: + nw = monitors[i].w; Index: patches/patch-config_mk =================================================================== RCS file: /var/cvs/ports/x11/bgs/patches/patch-config_mk,v retrieving revision 1.2 diff -u -p -r1.2 patch-config_mk --- patches/patch-config_mk 8 Feb 2009 20:41:22 -0000 1.2 +++ patches/patch-config_mk 22 May 2015 22:37:38 -0000 @@ -1,14 +1,14 @@ $OpenBSD: patch-config_mk,v 1.2 2009/02/08 20:41:22 merdely Exp $ ---- config.mk.orig Wed Jan 21 06:06:04 2009 -+++ config.mk Sun Feb 8 15:13:56 2009 -@@ -4,31 +4,28 @@ VERSION = 0.5 +--- config.mk.orig Tue May 12 11:09:52 2015 ++++ config.mk Fri May 22 21:49:42 2015 +@@ -4,22 +4,19 @@ VERSION = 0.7.1 # Customize below to fit your system # paths -PREFIX = /usr/local -MANPREFIX = ${PREFIX}/share/man +#PREFIX = /usr/local -+MANPREFIX = ${PREFIX}/man ++#MANPREFIX = ${PREFIX}/share/man -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib @@ -23,23 +23,10 @@ $OpenBSD: patch-config_mk,v 1.2 2009/02/ XINERAMAFLAGS = -DXINERAMA # includes and libs --INCS = -I. -I/usr/include -I${X11INC} -I ${IMLIB2INC} --LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS} -L${IMLIB2LIB} -lImlib2 +-INCS = -I${X11INC} -I ${IMLIB2INC} +-LIBS = -lm -L${X11LIB} -lX11 ${XINERAMALIBS} -L${IMLIB2LIB} -lImlib2 -lm +INCS = -I${X11INC} -I${LOCALBASE}/include +LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} -L${LOCALBASE}/lib -lImlib2 # flags --CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} --LDFLAGS = -s ${LIBS} -+CPPFLAGS += -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -+CFLAGS += ${INCS} ${CPPFLAGS} -+LDFLAGS += -s ${LIBS} - - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+CC ?= cc + CFLAGS += -std=c99 -pedantic -Wall ${INCS} -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}