FLIF-git: update for upstream changes.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Apr 25 13:22:46 2016 +0200
Changeset:	2747ef7a0e9b2954c54de19e7c68db0571b57944

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

Log Message:
FLIF-git: update for upstream changes.

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

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

diffstat:
 FLIF-git/PLIST                      |  2 +-
 FLIF-git/distinfo                   |  2 +-
 FLIF-git/patches/patch-src_Makefile | 37 ++++++-------------------------------
 3 files changed, 8 insertions(+), 33 deletions(-)

diffs:
diff --git a/FLIF-git/PLIST b/FLIF-git/PLIST
index db82821..c20b5c9 100644
--- a/FLIF-git/PLIST
+++ b/FLIF-git/PLIST
@@ -3,6 +3,6 @@ bin/apng2flif
 bin/flif
 bin/gif2flif
 bin/viewflif
+lib/libflif.so
 lib/libflif.so.0
-lib/libflif_dec.so.0
 man/man1/flif.1
diff --git a/FLIF-git/distinfo b/FLIF-git/distinfo
index 493a074..7113f07 100644
--- a/FLIF-git/distinfo
+++ b/FLIF-git/distinfo
@@ -3,4 +3,4 @@ $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) = 705cacc4dfaa0275794ebe42728bebab213ecad5
+SHA1 (patch-src_Makefile) = 03e2a2eec20030b083eacbcbf7440c0c95ecea3c
diff --git a/FLIF-git/patches/patch-src_Makefile b/FLIF-git/patches/patch-src_Makefile
index dc0463f..d4ec741 100644
--- a/FLIF-git/patches/patch-src_Makefile
+++ b/FLIF-git/patches/patch-src_Makefile
@@ -2,7 +2,7 @@ $NetBSD$
 
 Make use of DESTDIR and MANDIR.
 
---- src/Makefile.orig	2016-04-03 11:38:14.000000000 +0000
+--- src/Makefile.orig	2016-04-21 13:40:29.000000000 +0000
 +++ src/Makefile
 @@ -1,4 +1,5 @@
 -PREFIX := $(DESTDIR)/usr
@@ -11,21 +11,19 @@ Make use of DESTDIR and MANDIR.
  CXXFLAGS := $(shell pkg-config --cflags zlib libpng)
  LDFLAGS := $(shell pkg-config --libs libpng)
  
-@@ -65,30 +66,30 @@ viewflif: libflif_dec$(LIBEXT) viewflif.
+@@ -60,16 +61,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_dec$(LIBEXT).* $(PREFIX)/lib
--	install -s -m 755 libflif$(LIBEXT).* $(PREFIX)/lib
+-	install -s -m 755 libflif$(LIBEXT)* $(PREFIX)/lib
 -	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_dec$(LIBEXT).* $(DESTDIR)$(PREFIX)/lib
-+	install -s -m 755 libflif$(LIBEXT).* $(DESTDIR)$(PREFIX)/lib
++	install -s -m 755 libflif$(LIBEXT)* $(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
@@ -36,28 +34,5 @@ Make use of DESTDIR and MANDIR.
 +	install -d $(DESTDIR)$(PREFIX)/include
 +	install -m 644 library/*.h $(DESTDIR)$(PREFIX)/include
  
- magic:
- 	if ! grep -q FLIF /etc/magic; then cat ../doc/flif.magic >> /etc/magic; fi
- 
- uninstall:
--	rm -f $(PREFIX)/bin/flif
--	rm -f $(PREFIX)/bin/viewflif
--	rm -f $(PREFIX)/bin/gif2flif
--	rm -f $(PREFIX)/bin/apng2flif
--	rm -f $(PREFIX)/lib/libflif$(LIBEXT)
--	rm -f $(PREFIX)/lib/libflif_dec$(LIBEXT)
--	rm -f $(PREFIX)/lib/libflif$(LIBEXT).0
--	rm -f $(PREFIX)/lib/libflif_dec$(LIBEXT).0
--	rm -f $(PREFIX)/share/man/man1/flif.1
-+	rm -f $(DESTDIR)$(PREFIX)/bin/flif
-+	rm -f $(DESTDIR)$(PREFIX)/bin/viewflif
-+	rm -f $(DESTDIR)$(PREFIX)/bin/gif2flif
-+	rm -f $(DESTDIR)$(PREFIX)/bin/apng2flif
-+	rm -f $(DESTDIR)$(PREFIX)/lib/libflif$(LIBEXT)
-+	rm -f $(DESTDIR)$(PREFIX)/lib/libflif_dec$(LIBEXT)
-+	rm -f $(DESTDIR)$(PREFIX)/lib/libflif$(LIBEXT).0
-+	rm -f $(DESTDIR)$(PREFIX)/lib/libflif_dec$(LIBEXT).0
-+	rm -f $(DESTDIR)$(MANDIR)/man1/flif.1
- 
- clean:
- 	rm -f flif dflif libflif*$(LIBEXT)* viewflif flif.asan flif.dbg flif.prof flif.stats test-interface
+ install-decoder: decoder
+ 	install -s -m 755 dflif $(PREFIX)/bin