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

(-)graphics/zathura/Makefile (-25 / +10 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	zathura
4
PORTNAME=	zathura
5
PORTVERSION=	0.2.2
5
PORTVERSION=	0.2.5
6
CATEGORIES=	graphics print
6
CATEGORIES=	graphics print
7
MASTER_SITES=	http://pwmt.org/projects/zathura/download/
7
MASTER_SITES=	http://pwmt.org/projects/zathura/download/
8
8
Lines 9-40 Link Here
9
MAINTAINER=	acieroid@awesom.eu
9
MAINTAINER=	acieroid@awesom.eu
10
COMMENT=	Customizable lightweight pdf viewer
10
COMMENT=	Customizable lightweight pdf viewer
11
11
12
LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
12
LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
13
		girara-gtk2:${PORTSDIR}/x11-toolkits/girara
13
		libgirara-gtk3.so:${PORTSDIR}/x11-toolkits/girara
14
BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
14
15
15
USE_GNOME=	glib20 gtk20
16
USE_GNOME=	glib20 gtk30
16
USES=		gmake pkgconfig
17
USES=		gmake pkgconfig
17
MAKE_ENV=	SFLAGS="${STRIP}"
18
MAKE_ENV=	SFLAGS="${STRIP}" \
19
		RSTTOMAN=${LOCALBASE}/bin/rst2man
18
20
19
OPTIONS_DEFINE=	DOCS NLS SQLITE
21
OPTIONS_DEFINE=	NLS SQLITE
20
22
21
NO_STAGE=	yes
22
.include <bsd.port.options.mk>
23
.include <bsd.port.options.mk>
23
24
24
.if ${PORT_OPTIONS:MSQLITE}
25
.if ${PORT_OPTIONS:MSQLITE}
25
LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
26
LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
26
MAKE_ENV+=	WITH_SQLITE=1
27
MAKE_ENV+=	WITH_SQLITE=1
27
.else
28
.else
28
MAKE_ENV+=	WITH_SQLITE=0
29
MAKE_ENV+=	WITH_SQLITE=0
29
.endif
30
.endif
30
31
31
.if ${PORT_OPTIONS:MDOCS}
32
BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
33
MAN1+=		zathura.1
34
MAN5+=		zathurarc.5
35
MAKE_ENV+=	RSTTOMAN=${LOCALBASE}/bin/rst2man
36
.endif
37
38
.if ${PORT_OPTIONS:MNLS}
32
.if ${PORT_OPTIONS:MNLS}
39
USES+=		gettext
33
USES+=		gettext
40
PLIST_SUB+=	NLS=""
34
PLIST_SUB+=	NLS=""
Lines 48-59 Link Here
48
		${WRKSRC}/Makefile
42
		${WRKSRC}/Makefile
49
	${REINPLACE_CMD} -e 's|PLUGINDIR ?= .*$$|PLUGINDIR ?= ${PREFIX}/lib/zathura|'\
43
	${REINPLACE_CMD} -e 's|PLUGINDIR ?= .*$$|PLUGINDIR ?= ${PREFIX}/lib/zathura|'\
50
		${WRKSRC}/config.mk
44
		${WRKSRC}/config.mk
51
.if ! ${PORT_OPTIONS:MDOCS}
52
	${REINPLACE_CMD} -e 's|install-manpages$$||'\
53
		${WRKSRC}/Makefile
54
	${REINPLACE_CMD} -e 's|RSTTOMAN ?= /usr/bin/rst2man|RSTTOMAN ?= ""|'\
55
		${WRKSRC}/config.mk
56
.endif
57
.if ! ${PORT_OPTIONS:MNLS}
45
.if ! ${PORT_OPTIONS:MNLS}
58
	${REINPLACE_CMD} -e '/-C po/d'\
46
	${REINPLACE_CMD} -e '/-C po/d'\
59
		${WRKSRC}/Makefile
47
		${WRKSRC}/Makefile
Lines 66-74 Link Here
66
	${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \
54
	${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \
67
		${WRKSRC}/config.h \
55
		${WRKSRC}/config.h \
68
		${WRKSRC}/zathurarc.5.rst
56
		${WRKSRC}/zathurarc.5.rst
69
	(cd ${WRKSRC}; ${RM} -f ${MAN1} ${MAN5})
57
	(cd ${WRKSRC}; ${RM} -f zathura.1 zathurarc.5)
70
58
71
post-install:
72
	@${CAT} ${PKGMESSAGE}
73
74
.include <bsd.port.mk>
59
.include <bsd.port.mk>
(-)graphics/zathura/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (zathura-0.2.2.tar.gz) = 6506237ba76ce1611dc24ddd870853d753b5e70e5200d75d2a2257ff7c9242c9
1
SHA256 (zathura-0.2.5.tar.gz) = d901805efa7e18575008e97187a406adc6ac911b493f0e0dfaa69f453ac089d3
2
SIZE (zathura-0.2.2.tar.gz) = 108240
2
SIZE (zathura-0.2.5.tar.gz) = 133895
(-)graphics/zathura/files/patch-render.c (-36 lines)
Lines 1-36 Link Here
1
--- render.c.orig	2013-01-22 17:23:39.000000000 +0100
2
+++ render.c	2013-01-22 17:23:03.000000000 +0100
3
@@ -19,7 +19,7 @@
4
 
5
 struct render_thread_s {
6
   GThreadPool* pool; /**< Pool of threads */
7
-  GMutex mutex; /**< Render lock */
8
+  GStaticMutex mutex; /**< Render lock */
9
   bool about_to_close; /**< Render thread is to be freed */
10
 };
11
 
12
@@ -51,7 +51,7 @@
13
 
14
   render_thread->about_to_close = false;
15
   g_thread_pool_set_sort_function(render_thread->pool, render_thread_sort, zathura);
16
-  g_mutex_init(&render_thread->mutex);
17
+  g_static_mutex_init(&render_thread->mutex);
18
 
19
   return render_thread;
20
 
21
@@ -328,7 +328,7 @@
22
     return;
23
   }
24
 
25
-  g_mutex_lock(&render_thread->mutex);
26
+  g_static_mutex_lock(&render_thread->mutex);
27
 }
28
 
29
 void
30
@@ -338,5 +338,5 @@
31
     return;
32
   }
33
 
34
-  g_mutex_unlock(&render_thread->mutex);
35
+  g_static_mutex_unlock(&render_thread->mutex);
36
 }
(-)graphics/zathura/pkg-plist (+10 lines)
Lines 7-22 Link Here
7
include/zathura/types.h
7
include/zathura/types.h
8
include/zathura/version.h
8
include/zathura/version.h
9
libdata/pkgconfig/zathura.pc
9
libdata/pkgconfig/zathura.pc
10
man/man1/zathura.1.gz
11
man/man5/zathurarc.5.gz
10
share/applications/zathura.desktop
12
share/applications/zathura.desktop
13
%%NLS%%share/locale/ca/LC_MESSAGES/zathura.mo
11
%%NLS%%share/locale/cs/LC_MESSAGES/zathura.mo
14
%%NLS%%share/locale/cs/LC_MESSAGES/zathura.mo
12
%%NLS%%share/locale/de/LC_MESSAGES/zathura.mo
15
%%NLS%%share/locale/de/LC_MESSAGES/zathura.mo
16
%%NLS%%share/locale/el/LC_MESSAGES/zathura.mo
13
%%NLS%%share/locale/eo/LC_MESSAGES/zathura.mo
17
%%NLS%%share/locale/eo/LC_MESSAGES/zathura.mo
14
%%NLS%%share/locale/es/LC_MESSAGES/zathura.mo
18
%%NLS%%share/locale/es/LC_MESSAGES/zathura.mo
15
%%NLS%%share/locale/es_CL/LC_MESSAGES/zathura.mo
19
%%NLS%%share/locale/es_CL/LC_MESSAGES/zathura.mo
16
%%NLS%%share/locale/et/LC_MESSAGES/zathura.mo
20
%%NLS%%share/locale/et/LC_MESSAGES/zathura.mo
17
%%NLS%%share/locale/fr/LC_MESSAGES/zathura.mo
21
%%NLS%%share/locale/fr/LC_MESSAGES/zathura.mo
22
%%NLS%%share/locale/he/LC_MESSAGES/zathura.mo
23
%%NLS%%share/locale/hr/LC_MESSAGES/zathura.mo
24
%%NLS%%share/locale/id_ID/LC_MESSAGES/zathura.mo
18
%%NLS%%share/locale/it/LC_MESSAGES/zathura.mo
25
%%NLS%%share/locale/it/LC_MESSAGES/zathura.mo
19
%%NLS%%share/locale/pl/LC_MESSAGES/zathura.mo
26
%%NLS%%share/locale/pl/LC_MESSAGES/zathura.mo
27
%%NLS%%share/locale/pt_BR/LC_MESSAGES/zathura.mo
20
%%NLS%%share/locale/ru/LC_MESSAGES/zathura.mo
28
%%NLS%%share/locale/ru/LC_MESSAGES/zathura.mo
21
%%NLS%%share/locale/ta_IN/LC_MESSAGES/zathura.mo
29
%%NLS%%share/locale/ta_IN/LC_MESSAGES/zathura.mo
22
%%NLS%%share/locale/tr/LC_MESSAGES/zathura.mo
30
%%NLS%%share/locale/tr/LC_MESSAGES/zathura.mo
Lines 24-29 Link Here
24
@dirrm include/zathura
32
@dirrm include/zathura
25
@dirrmtry share/locale/es_CL/LC_MESSAGES
33
@dirrmtry share/locale/es_CL/LC_MESSAGES
26
@dirrmtry share/locale/es_CL
34
@dirrmtry share/locale/es_CL
35
@dirrmtry share/locale/id_ID/LC_MESSAGES
36
@dirrmtry share/locale/id_ID
27
@dirrmtry share/locale/ta_IN/LC_MESSAGES
37
@dirrmtry share/locale/ta_IN/LC_MESSAGES
28
@dirrmtry share/locale/ta_IN
38
@dirrmtry share/locale/ta_IN
29
@dirrmtry share/locale/uk_UA/LC_MESSAGES
39
@dirrmtry share/locale/uk_UA/LC_MESSAGES
(-)graphics/zathura-djvu/Makefile (-6 / +6 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	zathura-djvu
4
PORTNAME=	zathura-djvu
5
PORTVERSION=	0.2.2
5
PORTVERSION=	0.2.3
6
CATEGORIES=	graphics
6
CATEGORIES=	graphics
7
MASTER_SITES=	http://pwmt.org/projects/zathura/plugins/download/
7
MASTER_SITES=	http://pwmt.org/projects/zathura/plugins/download/
8
8
Lines 9-23 Link Here
9
MAINTAINER=	alexander.4mail@gmail.com
9
MAINTAINER=	alexander.4mail@gmail.com
10
COMMENT=	The zathura-djvu plugin adds DjVu support to zathura
10
COMMENT=	The zathura-djvu plugin adds DjVu support to zathura
11
11
12
LIB_DEPENDS=	djvulibre:${PORTSDIR}/graphics/djvulibre
12
LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
13
BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
13
BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
14
RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
14
RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
15
15
16
USE_GNOME=	glib20 gtk20
16
USE_GNOME=	glib20 gtk30
17
USES=		gmake pkgconfig
17
USES=		desktop-file-utils gmake pkgconfig
18
18
19
PLIST_FILES=	lib/zathura/djvu.so
19
PLIST_FILES=	lib/zathura/djvu.so \
20
		share/applications/zathura-djvu.desktop
20
PLIST_DIRSTRY=	lib/zathura
21
PLIST_DIRSTRY=	lib/zathura
21
22
22
NO_STAGE=	yes
23
.include <bsd.port.mk>
23
.include <bsd.port.mk>
(-)graphics/zathura-djvu/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (zathura-djvu-0.2.2.tar.gz) = 9c0accf68be79df63f16337b7cef66bfb199f4ff296ae5a1bc8de220f1af2691
1
SHA256 (zathura-djvu-0.2.3.tar.gz) = c16e82d525012b788fd01c4189df93708fcffffb7dd34ca09db55005d644ed89
2
SIZE (zathura-djvu-0.2.2.tar.gz) = 10473
2
SIZE (zathura-djvu-0.2.3.tar.gz) = 11181
(-)graphics/zathura-djvu/files/patch-config.mk (-22 lines)
Lines 1-22 Link Here
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}
(-)graphics/zathura-pdf-poppler/Makefile (-1 / +1 lines)
Lines 13-19 Link Here
13
BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
13
BUILD_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
14
RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
14
RUN_DEPENDS=	zathura:${PORTSDIR}/graphics/zathura
15
15
16
USE_GNOME=	glib20 gtk20
16
USE_GNOME=	glib20 gtk30
17
USES=		desktop-file-utils gmake pkgconfig
17
USES=		desktop-file-utils gmake pkgconfig
18
18
19
PLIST_FILES=	lib/zathura/pdf.so \
19
PLIST_FILES=	lib/zathura/pdf.so \
(-)graphics/zathura-pdf-poppler/files/patch-config.mk (-22 lines)
Lines 1-22 Link Here
1
--- config.mk.orig	2013-05-12 23:21:06.000000000 +0200
2
+++ config.mk	2013-06-21 13:16:15.646661467 +0200
3
@@ -12,7 +12,7 @@
4
 
5
 # paths
6
 PREFIX ?= /usr
7
-LIBDIR ?= ${PREFIX}/lib
8
+LIBDIR = ${PREFIX}/lib
9
 DESKTOPPREFIX ?= ${PREFIX}/share/applications
10
 
11
 # libs
12
@@ -26,10 +26,7 @@
13
 GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk${ZATHURA_GTK_VERSION})
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 = ${CAIRO_INC} ${PDF_INC} ${ZATHURA_INC} ${GIRARA_INC}
22
 LIBS = ${GIRARA_LIB} ${CAIRO_LIB} ${PDF_LIB}
(-)x11-toolkits/girara/Makefile (-3 / +3 lines)
Lines 2-15 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	girara
4
PORTNAME=	girara
5
PORTVERSION=	0.1.7
5
PORTVERSION=	0.1.8
6
CATEGORIES=	x11-toolkits graphics
6
CATEGORIES=	x11-toolkits graphics
7
MASTER_SITES=	http://pwmt.org/projects/girara/download/
7
MASTER_SITES=	http://pwmt.org/projects/girara/download/
8
8
9
MAINTAINER=	madpilot@FreeBSD.org
9
MAINTAINER=	madpilot@FreeBSD.org
10
COMMENT=	GTK2 Interface Library for Zathura PDF Viewer
10
COMMENT=	GTK3 Interface Library for Zathura PDF Viewer
11
11
12
USE_GNOME=	glib20 gtk20
12
USE_GNOME=	glib20 gtk30
13
USES=		compiler:c11 gmake pkgconfig
13
USES=		compiler:c11 gmake pkgconfig
14
USE_LDCONFIG=	yes
14
USE_LDCONFIG=	yes
15
LIBDIR=		${PREFIX}/lib
15
LIBDIR=		${PREFIX}/lib
(-)x11-toolkits/girara/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (girara-0.1.7.tar.gz) = 2374b8951d1276638dfca9f6d7570ce12313c8af482426a9a057a0227ea01c8e
1
SHA256 (girara-0.1.8.tar.gz) = 4861274fe93e7e6a8878a14eaac45868b351c58cf12b680ebaa4e5d42fec2d33
2
SIZE (girara-0.1.7.tar.gz) = 82277
2
SIZE (girara-0.1.8.tar.gz) = 82671
(-)x11-toolkits/girara/pkg-plist (-16 / +16 lines)
Lines 15-34 Link Here
15
include/girara/types.h
15
include/girara/types.h
16
include/girara/utils.h
16
include/girara/utils.h
17
include/girara/version.h
17
include/girara/version.h
18
lib/libgirara-gtk2.a
18
lib/libgirara-gtk3.a
19
lib/libgirara-gtk2.so
19
lib/libgirara-gtk3.so
20
lib/libgirara-gtk2.so.1
20
lib/libgirara-gtk3.so.1
21
lib/libgirara-gtk2.so.1.1
21
lib/libgirara-gtk3.so.1.1
22
libdata/pkgconfig/girara-gtk2.pc
22
libdata/pkgconfig/girara-gtk3.pc
23
%%NLS%%share/locale/de/LC_MESSAGES/libgirara-gtk2-1.mo
23
%%NLS%%share/locale/de/LC_MESSAGES/libgirara-gtk3-1.mo
24
%%NLS%%share/locale/el/LC_MESSAGES/libgirara-gtk2-1.mo
24
%%NLS%%share/locale/el/LC_MESSAGES/libgirara-gtk3-1.mo
25
%%NLS%%share/locale/eo/LC_MESSAGES/libgirara-gtk2-1.mo
25
%%NLS%%share/locale/eo/LC_MESSAGES/libgirara-gtk3-1.mo
26
%%NLS%%share/locale/es/LC_MESSAGES/libgirara-gtk2-1.mo
26
%%NLS%%share/locale/es/LC_MESSAGES/libgirara-gtk3-1.mo
27
%%NLS%%share/locale/fr/LC_MESSAGES/libgirara-gtk2-1.mo
27
%%NLS%%share/locale/fr/LC_MESSAGES/libgirara-gtk3-1.mo
28
%%NLS%%share/locale/he/LC_MESSAGES/libgirara-gtk2-1.mo
28
%%NLS%%share/locale/he/LC_MESSAGES/libgirara-gtk3-1.mo
29
%%NLS%%share/locale/it/LC_MESSAGES/libgirara-gtk2-1.mo
29
%%NLS%%share/locale/it/LC_MESSAGES/libgirara-gtk3-1.mo
30
%%NLS%%share/locale/pl/LC_MESSAGES/libgirara-gtk2-1.mo
30
%%NLS%%share/locale/pl/LC_MESSAGES/libgirara-gtk3-1.mo
31
%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgirara-gtk2-1.mo
31
%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgirara-gtk3-1.mo
32
%%NLS%%share/locale/ru/LC_MESSAGES/libgirara-gtk2-1.mo
32
%%NLS%%share/locale/ru/LC_MESSAGES/libgirara-gtk3-1.mo
33
%%NLS%%share/locale/tr/LC_MESSAGES/libgirara-gtk2-1.mo
33
%%NLS%%share/locale/tr/LC_MESSAGES/libgirara-gtk3-1.mo
34
@dirrm include/girara
34
@dirrm include/girara

Return to bug 183842