Attachment #202232 for bug #235916

View | Details | Raw Unified | Return to bug 235916
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sxiv	4	PORTNAME= sxiv
5	PORTVERSION= 24	5	PORTVERSION= 25
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8		8

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1513085280	1	TIMESTAMP = 1550750972
2	SHA256 (muennich-sxiv-v24_GH0.tar.gz) = 511dc45d12962af9c31c3068ce6bca4b832a6263946b27befea49a48cf019110	2	SHA256 (muennich-sxiv-v25_GH0.tar.gz) = 16d1aca1a179e1c0875844efe2e51cfa396a4403467c389f7e9221a733ae5e26
3	SIZE (muennich-sxiv-v24_GH0.tar.gz) = 47148	3	SIZE (muennich-sxiv-v25_GH0.tar.gz) = 48814




--- Makefile.orig	2019-01-26 13:54:40 UTC
+++ Makefile
@@ -3,11 +3,11 @@ version = 25
 srcdir = .
 VPATH = $(srcdir)
 

+PREFIX ?= /usr/local
+MANPREFIX = $(PREFIX)/man
 
-CC = cc
-DEF_CFLAGS = -std=c99 -Wall -pedantic
+DEF_CFLAGS = -std=c99 -Wall -pedantic $$(pkg-config --cflags xft)
 DEF_CPPFLAGS = -I/usr/include/freetype2
 
 # autoreload backend: inotify/nop
-AUTORELOAD = inotify
+AUTORELOAD = nop

 
 # enable features requiring giflib (-lgif)
 HAVE_GIFLIB = 1
@@ -17,7 +17,7 @@ HAVE_LIBEXIF = 1
 
 cflags = -std=c99 -Wall -pedantic $(CFLAGS)
 cppflags = -I. $(CPPFLAGS) -D_XOPEN_SOURCE=700 -DHAVE_GIFLIB=$(HAVE_GIFLIB) \
-  -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) -I/usr/include/freetype2
+  -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) $$(pkg-config --cflags xft)
 
 lib_exif_0 =
 lib_exif_1 = -lexif

Return to bug 235916

Lines 1-6 Link Here

(-)files/patch-Makefile (-7 / +11 lines)
1	--- Makefile.orig 2017-10-27 15:25:56 UTC	1	--- Makefile.orig 2019-01-26 13:54:40 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -3,15 +3,14 @@ VERSION = 24	3	@@ -3,11 +3,11 @@ version = 25
4	srcdir = .	4	srcdir = .
5	VPATH = $(srcdir)	5	VPATH = $(srcdir)
6		6
Lines 9-19 Link Here
9	+PREFIX ?= /usr/local	9	+PREFIX ?= /usr/local
10	+MANPREFIX = $(PREFIX)/man	10	+MANPREFIX = $(PREFIX)/man
11		11
12	-CC = cc
13	-DEF_CFLAGS = -std=c99 -Wall -pedantic
14	+DEF_CFLAGS = -std=c99 -Wall -pedantic $$(pkg-config --cflags xft)
15	DEF_CPPFLAGS = -I/usr/include/freetype2
16
17	# autoreload backend: inotify/nop	12	# autoreload backend: inotify/nop
18	-AUTORELOAD = inotify	13	-AUTORELOAD = inotify
19	+AUTORELOAD = nop	14	+AUTORELOAD = nop
Lines 20-22 Link Here
20		15
21	# enable features requiring giflib (-lgif)	16	# enable features requiring giflib (-lgif)
22	HAVE_GIFLIB = 1	17	HAVE_GIFLIB = 1
		18	@@ -17,7 +17,7 @@ HAVE_LIBEXIF = 1
		19
		20	cflags = -std=c99 -Wall -pedantic $(CFLAGS)
		21	cppflags = -I. $(CPPFLAGS) -D_XOPEN_SOURCE=700 -DHAVE_GIFLIB=$(HAVE_GIFLIB) \
		22	- -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) -I/usr/include/freetype2
		23	+ -DHAVE_LIBEXIF=$(HAVE_LIBEXIF) $$(pkg-config --cflags xft)
		24
		25	lib_exif_0 =
		26	lib_exif_1 = -lexif