Hello ports@

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).

diff --git Makefile Makefile
index 8d499d1ad33..1b49fcc3fa1 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
 
 COMMENT =      lossless, uncompressed graphics format
-DISTNAME =     farbfeld-3
+DISTNAME =     farbfeld-4
 CATEGORIES =   graphics converters
 
 HOMEPAGE =     https://tools.suckless.org/farbfeld
@@ -19,7 +19,6 @@ LIB_DEPENDS = graphics/png \
 
 RUN_DEPENDS =  graphics/ImageMagick
 
-USE_GMAKE =    Yes
 MAKE_ENV =     CC="${CC}"
 
 NO_TEST =      Yes
diff --git distinfo distinfo
index c632a202e9e..a5f2d6668be 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (farbfeld-3.tar.gz) = W5U7hqctP+rt9iaYUyyIiOX24vY2MZOkzIzuDjjDeK0=
-SIZE (farbfeld-3.tar.gz) = 10169
+SHA256 (farbfeld-4.tar.gz) = x99ZIe3RIcpdWxz2+wHkMK/5sxJCJi5PaQ069yzL5yo=
+SIZE (farbfeld-4.tar.gz) = 10340
diff --git patches/patch-Makefile patches/patch-Makefile
index c42275f1f20..bb3b6daad0e 100644
--- patches/patch-Makefile
+++ patches/patch-Makefile
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah 
Exp $
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -38,15 +38,12 @@ dist:
+@@ -51,15 +51,12 @@ dist:
        rm -rf "farbfeld-$(VERSION)"
  
  install: all
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
  
  # 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

Reply via email to