Attachment #127006 for bug #170780

Lines 5-11 Link Here

(-)/home/quentin/graphics/zathura-djvu/Makefile (-1 / +1 lines)
5	# $FreeBSD: ports/graphics/zathura-djvu/Makefile,v 1.1 2012/07/09 22:28:45 pawel Exp $	5	# $FreeBSD: ports/graphics/zathura-djvu/Makefile,v 1.1 2012/07/09 22:28:45 pawel Exp $
6		6
7	PORTNAME= zathura-djvu	7	PORTNAME= zathura-djvu
8	PORTVERSION= 0.1.1	8	PORTVERSION= 0.2.0
9	CATEGORIES= graphics	9	CATEGORIES= graphics
10	MASTER_SITES= http://pwmt.org/projects/zathura/plugins/download/	10	MASTER_SITES= http://pwmt.org/projects/zathura/plugins/download/
11		11

Lines 1-2 Link Here

(-)/home/quentin/graphics/zathura-djvu/distinfo (-2 / +2 lines)
1	SHA256 (zathura-djvu-0.1.1.tar.gz) = 04adad7bf1bb392eae4b7b856fe7d40a137f8185ac274289df922758ae827172	1	SHA256 (zathura-djvu-0.2.0.tar.gz) = c276cdb3901fbb8c76f070d69a590181992eea2cb48f09589e4fda9e67e1f813
2	SIZE (zathura-djvu-0.1.1.tar.gz) = 8392	2	SIZE (zathura-djvu-0.2.0.tar.gz) = 10034




--- config.mk.orig	2012-06-09 23:37:36.000000000 +0200
+++ config.mk	2012-08-20 18:26:30.000000000 +0200
@@ -11,7 +11,7 @@
 
 # paths
 PREFIX ?= /usr
-LIBDIR ?= ${PREFIX}/lib
+LIBDIR = ${PREFIX}/lib
 
 # libs
 CAIRO_INC ?= $(shell pkg-config --cflags cairo)
@@ -27,10 +27,7 @@
 GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk2)
 
 ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
-PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)
-ifeq (,${PLUGINDIR})
 PLUGINDIR = ${LIBDIR}/zathura
-endif
 
 INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC}
 LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB}

Return to bug 170780

Line 0 Link Here

(-)/home/quentin/graphics/zathura-djvu/files/patch-config.mk (+22 lines)
	1	--- config.mk.orig 2012-06-09 23:37:36.000000000 +0200
	2	+++ config.mk 2012-08-20 18:26:30.000000000 +0200
	3	@@ -11,7 +11,7 @@
	4
	5	# paths
	6	PREFIX ?= /usr
	7	-LIBDIR ?= ${PREFIX}/lib
	8	+LIBDIR = ${PREFIX}/lib
	9
	10	# libs
	11	CAIRO_INC ?= $(shell pkg-config --cflags cairo)
	12	@@ -27,10 +27,7 @@
	13	GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk2)
	14
	15	ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
	16	-PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)
	17	-ifeq (,${PLUGINDIR})
	18	PLUGINDIR = ${LIBDIR}/zathura
	19	-endif
	20
	21	INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC}
	22	LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB}