pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

FLIF-git: Update a patch



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Wed Oct 18 22:03:48 2017 +0200
Changeset:	3748e0f5142a1553dbcb9ec6f0d24e6e71e707c6

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

Log Message:
FLIF-git: Update a patch

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

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

diffstat:
 FLIF-git/distinfo                   |  2 +-
 FLIF-git/patches/patch-src_Makefile | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs:
diff --git a/FLIF-git/distinfo b/FLIF-git/distinfo
index bbc2c9a1bb..17afca4109 100644
--- a/FLIF-git/distinfo
+++ b/FLIF-git/distinfo
@@ -1,3 +1,3 @@
 $NetBSD$
 
-SHA1 (patch-src_Makefile) = 4cd4ab742ba0d37cbd804749f54ef870ff93cb5a
+SHA1 (patch-src_Makefile) = 224f6aa8691974fa400c6e10b968c7cdcb570c66
diff --git a/FLIF-git/patches/patch-src_Makefile b/FLIF-git/patches/patch-src_Makefile
index 107071df03..c510b681c4 100644
--- a/FLIF-git/patches/patch-src_Makefile
+++ b/FLIF-git/patches/patch-src_Makefile
@@ -2,14 +2,14 @@ $NetBSD$
 
 Make use of DESTDIR and MANDIR.
 
---- src/Makefile.orig	2017-07-10 21:19:04.000000000 +0000
+--- src/Makefile.orig	2017-10-16 18:25:09.000000000 +0000
 +++ src/Makefile
 @@ -1,4 +1,5 @@
  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)
+ CXXFLAGS := $(CXXFLAGS) $(shell pkg-config --cflags zlib libpng) -DLODEPNG_NO_COMPILE_PNG -DLODEPNG_NO_COMPILE_DISK
+ CFLAGS := $(CFLAGS) $(shell pkg-config --cflags zlib libpng) -DLODEPNG_NO_COMPILE_PNG -DLODEPNG_NO_COMPILE_DISK
+ LDFLAGS := $(LDFLAGS) $(shell pkg-config --libs libpng)
 @@ -76,10 +77,10 @@ libpixbufloader-flif$(LIBEXT): libflif$(
  pixbufloader: libpixbufloader-flif$(LIBEXT)
  
@@ -23,7 +23,7 @@ Make use of DESTDIR and MANDIR.
  	install -m 755 ../tools/gif2flif $(PREFIX)/bin
  	install -m 755 ../tools/apng2flif $(PREFIX)/bin
  
-@@ -129,7 +130,7 @@ uninstall:
+@@ -130,7 +131,7 @@ uninstall:
  	rm -f $(PREFIX)/lib/libflif_dec$(LIBEXT)
  	rm -f $(PREFIX)/lib/libflif$(LIBEXTV)
  	rm -f $(PREFIX)/lib/libflif_dec$(LIBEXTV)


Home | Main Index | Thread Index | Old Index