pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
FLIF-git: make patch apply again
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sun Aug 28 07:00:45 2016 +0200
Changeset: 1c467f9b16d3b75abf0ef573a88113928a8f8ab8
Modified Files:
FLIF-git/distinfo
FLIF-git/patches/patch-src_Makefile
Log Message:
FLIF-git: make patch apply again
doesn't build due to issue with png
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1c467f9b16d3b75abf0ef573a88113928a8f8ab8
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 | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diffs:
diff --git a/FLIF-git/distinfo b/FLIF-git/distinfo
index a1af3c0..2342a77 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) = 402f1d750c159d60626a3300ac818854500ee263
+SHA1 (patch-src_Makefile) = 643a03c5e6f20a0e2697dcabc687721f487c555e
diff --git a/FLIF-git/patches/patch-src_Makefile b/FLIF-git/patches/patch-src_Makefile
index 54f986b..cc83a20 100644
--- a/FLIF-git/patches/patch-src_Makefile
+++ b/FLIF-git/patches/patch-src_Makefile
@@ -2,16 +2,16 @@ $NetBSD$
Make use of DESTDIR and MANDIR.
---- src/Makefile.orig 2016-04-21 13:40:29.000000000 +0000
+--- src/Makefile.orig 2016-08-26 20:56:57.000000000 +0000
+++ src/Makefile
@@ -1,4 +1,5 @@
-PREFIX := $(DESTDIR)/usr
+PREFIX ?= $(DESTDIR)/usr
+MANDIR ?= $(PREFIX)/share/man
- CXXFLAGS := $(shell pkg-config --cflags zlib libpng)
+ CXXFLAGS := $(shell pkg-config --cflags zlib libpng) -DLODEPNG_NO_COMPILE_PNG -DLODEPNG_NO_COMPILE_DISK
LDFLAGS := $(shell pkg-config --libs libpng)
-@@ -60,16 +61,16 @@ viewflif: libflif$(LIBEXT) viewflif.c
+@@ -63,16 +64,16 @@ viewflif: libflif$(LIBEXT) viewflif.c
install: all
Home |
Main Index |
Thread Index |
Old Index