FLIF-git: Update wip/FLIF-git to 0.3

[Mateusz Poszwa <old4%o2.pl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Thu Jul 13 00:10:09 2017 +0200
Changeset:	3c2c1425749224c02164b5e8ba21c30d57af0ca4

Modified Files:
	FLIF-git/Makefile
	FLIF-git/PLIST
	FLIF-git/distinfo
	FLIF-git/patches/patch-src_Makefile

Log Message:
FLIF-git: Update wip/FLIF-git to 0.3

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

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

diffstat:
 FLIF-git/Makefile                   | 12 +++++-----
 FLIF-git/PLIST                      |  1 -
 FLIF-git/distinfo                   |  5 +---
 FLIF-git/patches/patch-src_Makefile | 48 +++++++++++++++++--------------------
 4 files changed, 29 insertions(+), 37 deletions(-)

diffs:
diff --git a/FLIF-git/Makefile b/FLIF-git/Makefile
index efd1b4da7a..c4bb5d0438 100644
--- a/FLIF-git/Makefile
+++ b/FLIF-git/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	FLIF-0.1alpha
+DISTNAME=	FLIF-0.3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=FLIF-hub/}
 
@@ -11,14 +11,14 @@ WRKSRC=			${WRKDIR}/flif
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://flif.info/
 COMMENT=	Free Lossless Image Format
-LICENSE=	gnu-lgpl-v3
+LICENSE=	gnu-lgpl-v3 AND apache-2.0
 
-BUILD_DIRS=	src
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake pkg-config
-MAKE_ENV+=	MANDIR=${PREFIX}/${PKGMANDIR}
+
+INSTALL_MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../devel/SDL2/buildlink3.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/FLIF-git/PLIST b/FLIF-git/PLIST
index c20b5c9214..fe102197d1 100644
--- a/FLIF-git/PLIST
+++ b/FLIF-git/PLIST
@@ -2,7 +2,6 @@
 bin/apng2flif
 bin/flif
 bin/gif2flif
-bin/viewflif
 lib/libflif.so
 lib/libflif.so.0
 man/man1/flif.1
diff --git a/FLIF-git/distinfo b/FLIF-git/distinfo
index 2342a77d78..bbc2c9a1bb 100644
--- a/FLIF-git/distinfo
+++ b/FLIF-git/distinfo
@@ -1,6 +1,3 @@
 $NetBSD$
 
-SHA1 (FLIF-0.1alpha.tar.gz) = 55ddb13397a2fa6ff6b786a65a40237d15559d56
-RMD160 (FLIF-0.1alpha.tar.gz) = 0872bca3ea9d33da51b9fb935ece37e6124083f5
-Size (FLIF-0.1alpha.tar.gz) = 1543110 bytes
-SHA1 (patch-src_Makefile) = 643a03c5e6f20a0e2697dcabc687721f487c555e
+SHA1 (patch-src_Makefile) = 4cd4ab742ba0d37cbd804749f54ef870ff93cb5a
diff --git a/FLIF-git/patches/patch-src_Makefile b/FLIF-git/patches/patch-src_Makefile
index cc83a20ccb..107071df03 100644
--- a/FLIF-git/patches/patch-src_Makefile
+++ b/FLIF-git/patches/patch-src_Makefile
@@ -2,37 +2,33 @@ $NetBSD$
 
 Make use of DESTDIR and MANDIR.
 
---- src/Makefile.orig	2016-08-26 20:56:57.000000000 +0000
+--- src/Makefile.orig	2017-07-10 21:19:04.000000000 +0000
 +++ src/Makefile
 @@ -1,4 +1,5 @@
--PREFIX := $(DESTDIR)/usr
-+PREFIX ?= $(DESTDIR)/usr
-+MANDIR ?= $(PREFIX)/share/man
+ PREFIX := $(DESTDIR)/usr/local
++MANDIR := $(PREFIX)/share/man
  CXXFLAGS := $(shell pkg-config --cflags zlib libpng) -DLODEPNG_NO_COMPILE_PNG -DLODEPNG_NO_COMPILE_DISK
+ CFLAGS := $(shell pkg-config --cflags zlib libpng) -DLODEPNG_NO_COMPILE_PNG -DLODEPNG_NO_COMPILE_DISK
  LDFLAGS := $(shell pkg-config --libs libpng)
+@@ -76,10 +77,10 @@ libpixbufloader-flif$(LIBEXT): libflif$(
+ pixbufloader: libpixbufloader-flif$(LIBEXT)
  
-@@ -63,16 +64,16 @@ viewflif: libflif$(LIBEXT) viewflif.c
- 
- 
- install: all
--	install -d $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/share/man/man1
--	install -s -m 755 flif viewflif $(PREFIX)/bin
--	install -s -m 755 libflif$(LIBEXT) libflif$(LIBEXTV) $(PREFIX)/lib
+ install: flif libflif$(LIBEXT) install-libflif$(LIBEXT)
+-	install -d $(PREFIX)/bin $(PREFIX)/share/man/man1
++	install -d $(PREFIX)/bin $(MANDIR)/man1
+ 	install -m 755 flif $(PREFIX)/bin
+ 	strip -x $(PREFIX)/bin/flif
 -	install -m 644 ../doc/flif.1 $(PREFIX)/share/man/man1
--	install -m 755 ../tools/gif2flif $(PREFIX)/bin
--	install -m 755 ../tools/apng2flif $(PREFIX)/bin
-+	install -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/lib $(DESTDIR)$(MANDIR)/man1
-+	install -s -m 755 flif viewflif $(DESTDIR)$(PREFIX)/bin
-+	install -s -m 755 libflif$(LIBEXT) libflif$(LIBEXTV) $(DESTDIR)$(PREFIX)/lib
-+	install -m 644 ../doc/flif.1 $(DESTDIR)$(MANDIR)/man1
-+	install -m 755 ../tools/gif2flif $(DESTDIR)$(PREFIX)/bin
-+	install -m 755 ../tools/apng2flif $(DESTDIR)$(PREFIX)/bin
++	install -m 644 ../doc/flif.1 $(MANDIR)/man1
+ 	install -m 755 ../tools/gif2flif $(PREFIX)/bin
+ 	install -m 755 ../tools/apng2flif $(PREFIX)/bin
  
- install-dev:
--	install -d $(PREFIX)/include
--	install -m 644 library/*.h $(PREFIX)/include
-+	install -d $(DESTDIR)$(PREFIX)/include
-+	install -m 644 library/*.h $(DESTDIR)$(PREFIX)/include
+@@ -129,7 +130,7 @@ uninstall:
+ 	rm -f $(PREFIX)/lib/libflif_dec$(LIBEXT)
+ 	rm -f $(PREFIX)/lib/libflif$(LIBEXTV)
+ 	rm -f $(PREFIX)/lib/libflif_dec$(LIBEXTV)
+-	rm -f $(PREFIX)/share/man/man1/flif.1
++	rm -f $(MANDIR)/man1/flif.1
+ 	rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-flif$(LIBEXT)
  
- install-decoder: decoder
- 	install -s -m 755 dflif $(PREFIX)/bin
+ clean: