Re: UPDATE: graphics/farbfeld 3 -> 4

On Fri, Apr 13, 2018 at 11:09:07PM +0100, Kaashif Hymabaccus wrote:
> On Thu, Apr 12, 2018 at 10:23:56AM +0200, Klemens Nanni wrote:
> > On Thu, Apr 12, 2018 at 01:52:48AM +0100, Kaashif Hymabaccus wrote:
> > > This is an update to graphics/farbfeld. The main change to the port is
> > > that USE_GMAKE isn't needed any more.
> > >
> > > Works fine for me on amd64 (converted some images to ff and back,
> > > still seems to work).
> > Can you provide a simple do-install and drop patch-Makefile instead?
> > This was recently done for x11/{dmenu,st} as well. This would be
> > reasonably simpler and keep suckless ports somewhat consistent across
> > the tree.
>
> Thanks for the suggestion, the updated diff is below.
Looks good to me, OK kn with with the following comments fixed.

> diff --git patches/patch-config_mk patches/patch-config_mk
> index b27e187cb51..f660d82096f 100644
> --- patches/patch-config_mk
> +++ patches/patch-config_mk
> @@ -3,13 +3,14 @@ $OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
> Index: config.mk
> --- config.mk.orig
> +++ config.mk
> -@@ -4,15 +4,15 @@ VERSION = 3
> +@@ -4,15 +4,15 @@ VERSION = 4
> # Customize below to fit your system
>
> # paths
> -PREFIX = /usr/local
> +-MANPREFIX = $(PREFIX)/share/man
> +PREFIX ?= /usr/local
> - MANPREFIX = ${PREFIX}/man
> ++MANPREFIX = $(PREFIX)/man
Now that you're rolling your own do-install, this hunk is obsolete.

> # flags
> CPPFLAGS = -D_DEFAULT_SOURCE
> @@ -17,8 +18,8 @@ Index: config.mk
> -LDFLAGS = -s
> +CFLAGS += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
> +LDFLAGS += -s -L${LOCALBASE}/lib
> - PNG-LDFLAGS = -lpng
> - JPG-LDFLAGS = -ljpeg
> + PNG-LDLIBS = -lpng
> + JPG-LDLIBS = -ljpeg
>
> # compiler and linker
> -CC = cc
CC is already passed in MAKE_ENV, this can go, too.