farbfeld: Update wip/farbfeld to farbfeld-3

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Thu Jan 4 00:29:33 2018 +0100
Changeset:	6330941126c9fe2d86c2a7a5386e4bfd8648c2c7

Modified Files:
	farbfeld/Makefile
	farbfeld/PLIST
	farbfeld/buildlink3.mk
	farbfeld/distinfo
Removed Files:
	farbfeld/patches/patch-config.mk

Log Message:
farbfeld: Update wip/farbfeld to farbfeld-3

pkgsrc changes:
 - Clean up a bit the pkgsrc Makefile and buildlink3.mk
 - Use MAKE_FLAGS to inject variables and delete patches/patch-config.mk

Changes (from email announcements):
farbfeld-3:
The main focus of this release was stability and code refactorizations.
Fortunately, it all worked out very well and across the board you can
count on these tools not to fail on you.
The build system was revamped, heavily simplified and is with one small
exception POSIX compliant. I also reworked the invert.c example filter
to reflect the larger focus on hardening the tools.
I fixed quite a few subtle edge-cases in the tools and the scripts, and
now they should all work flawlessly. If not, please feel free to report
bugs!

farbfeld-2:
 - 75+% speed improvement in the conversion tools
   by handling row buffers instead of each channel
   individually with atomic writes.
 - Use convert instead of xconvert in 2ff(1) to
   actually not error out when we hit anything other
   than png and jpg.
 - Major code cleanup and documentation improvement.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6330941126c9fe2d86c2a7a5386e4bfd8648c2c7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 farbfeld/Makefile                | 19 ++++++++++++++-----
 farbfeld/PLIST                   |  6 ++++++
 farbfeld/buildlink3.mk           | 22 +++-------------------
 farbfeld/distinfo                |  8 ++++----
 farbfeld/patches/patch-config.mk | 23 -----------------------
 5 files changed, 27 insertions(+), 51 deletions(-)

diffs:
diff --git a/farbfeld/Makefile b/farbfeld/Makefile
index f5fb66f8d8..2fe52c6651 100644
--- a/farbfeld/Makefile
+++ b/farbfeld/Makefile
@@ -1,14 +1,23 @@
 # $NetBSD$
 
-DISTNAME=	farbfeld-1
-MASTER_SITES=	http://dl.suckless.org/farbfeld/
+DISTNAME=	farbfeld-3
 CATEGORIES=	graphics
-LICENSE=	isc
+MASTER_SITES=	http://dl.suckless.org/farbfeld/
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 COMMENT=	Suckless image format with conversion tools
+LICENSE=	isc
 
 USE_TOOLS+=	gmake
-NO_CONFIGURE=	yes
 
-.include "../../graphics/jpeg/buildlink3.mk"
+MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	MANPREFIX=${PREFIX}/${PKGMANDIR}
+
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
+
+USE_LANGUAGES=	c99
+
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/farbfeld/PLIST b/farbfeld/PLIST
index dac1df541e..9489dc2481 100644
--- a/farbfeld/PLIST
+++ b/farbfeld/PLIST
@@ -1,10 +1,16 @@
 @comment $NetBSD$
 bin/2ff
+bin/ff2jpg
+bin/ff2pam
 bin/ff2png
+bin/ff2ppm
 bin/jpg2ff
 bin/png2ff
 man/man1/2ff.1
+man/man1/ff2jpg.1
+man/man1/ff2pam.1
 man/man1/ff2png.1
+man/man1/ff2ppm.1
 man/man1/jpg2ff.1
 man/man1/png2ff.1
 man/man5/farbfeld.5
diff --git a/farbfeld/buildlink3.mk b/farbfeld/buildlink3.mk
index bdde374487..6898d6a409 100644
--- a/farbfeld/buildlink3.mk
+++ b/farbfeld/buildlink3.mk
@@ -1,14 +1,4 @@
 # $NetBSD$
-# XXX
-# XXX This file was created automatically using createbuildlink-3.17.
-# XXX After this file has been verified as correct, the comment lines
-# XXX beginning with "XXX" should be removed.  Please do not commit
-# XXX unverified buildlink3.mk files.
-# XXX
-# XXX Packages that only install static libraries or headers should
-# XXX include the following line:
-# XXX
-# XXX	BUILDLINK_DEPMETHOD.farbfeld?=	build
 
 BUILDLINK_TREE+=	farbfeld
 
@@ -16,16 +6,10 @@ BUILDLINK_TREE+=	farbfeld
 FARBFELD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.farbfeld+=	farbfeld>=1
-BUILDLINK_PKGSRCDIR.farbfeld?=	../../wip/farbfeld
+BUILDLINK_PKGSRCDIR.farbfeld?=		../../wip/farbfeld
 
-# XXX
-# XXX Uncomment and keep only the buildlink3 lines below which are directly
-# XXX needed for dependencies to compile, link, and run.  If this package
-# XXX provides a wrappered API or otherwise does not expose the APIs of the
-# XXX buildlink3 lines below to dependencies, remove them.
-# XXX
-#.include "../../graphics/jpeg/buildlink3.mk"
-#.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .endif	# FARBFELD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-farbfeld
diff --git a/farbfeld/distinfo b/farbfeld/distinfo
index 718aa80433..9cf40e6dc6 100644
--- a/farbfeld/distinfo
+++ b/farbfeld/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (farbfeld-1.tar.gz) = 06ad65ddf43f3b86174ab0de7316ac5580f9b9fe
-RMD160 (farbfeld-1.tar.gz) = 478fb4bc4ed81071634ac8c301ae56664ecff54d
-Size (farbfeld-1.tar.gz) = 6770 bytes
-SHA1 (patch-config.mk) = b3121df9e7ecacd3bda45eb1c725577288f0bc8c
+SHA1 (farbfeld-3.tar.gz) = d5ffa3d6941ae0672191f3a81dbf25c9c44f78d7
+RMD160 (farbfeld-3.tar.gz) = db2f83af421218bd09e5b26bf6ce8952734fa9f4
+SHA512 (farbfeld-3.tar.gz) = 4f1e44282810bd2724f78857bcde401b82945375c5472b31e39250d660efffd425e0a2da5aecf0133ad3d414c31214d073d00f519bc83960b5bbfd53df3b1c49
+Size (farbfeld-3.tar.gz) = 10169 bytes
diff --git a/farbfeld/patches/patch-config.mk b/farbfeld/patches/patch-config.mk
deleted file mode 100644
index 09229fd827..0000000000
--- a/farbfeld/patches/patch-config.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
---- ./config.mk.orig	2016-01-06 09:48:12.000000000 -0800
-+++ ./config.mk	2016-01-15 19:41:38.000000000 -0800
-@@ -4,14 +4,13 @@
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
--MANPREFIX = ${PREFIX}/man
-+MANPREFIX = ${PREFIX}/${PKGMANDIR}
- 
--PNGLIB = /usr/local/lib
--PNGINC = /usr/local/include
-+PNGLIB = ${PREFIX}/lib
-+PNGINC = ${PREFIX}/include
- 
--JPGLIB = /usr/local/lib
--JPGINC = /usr/local/include
-+JPGLIB = ${PREFIX}/lib
-+JPGINC = ${PREFIX}/include
- 
- INCS = -I${PNGINC} -I${JPGINC}
- LIBS = -L${PNGLIB} -L${JPGLIB} -lpng -ljpeg