aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadpilot <madpilot@FreeBSD.org>2013-11-29 05:08:38 +0800
committermadpilot <madpilot@FreeBSD.org>2013-11-29 05:08:38 +0800
commit075768c951bc34ccf6fee6d6c48339c635e8528b (patch)
tree023e84304f7ebcdf46e155419ac76232f6de9a01
parent053ccf771900de119e0fa414d5ac5a885571ac91 (diff)
downloadfreebsd-ports-gnome-075768c951bc34ccf6fee6d6c48339c635e8528b.tar.gz
freebsd-ports-gnome-075768c951bc34ccf6fee6d6c48339c635e8528b.tar.zst
freebsd-ports-gnome-075768c951bc34ccf6fee6d6c48339c635e8528b.zip
- x11-toolkits/girara update to 0.1.9
- graphics/zathura update to 0.2.5 - gaphics/zathura-djvu update to 0.2.3 - Convert to new LIB_DEPENDS format - Girara now defaults to gtk3, modify depending ports accordingly - Convert to staging - Always install man pages - Remove uneeded patches PR: ports/183842 Submitted by: myself Approved by: Alexander <alexander.4mail@gmail.com> (maintainer of zathura-djvu) Approved by: maintainer timeout (for graphics/zathura)
-rw-r--r--graphics/zathura-djvu/Makefile12
-rw-r--r--graphics/zathura-djvu/distinfo4
-rw-r--r--graphics/zathura-djvu/files/patch-config.mk22
-rw-r--r--graphics/zathura-pdf-poppler/Makefile2
-rw-r--r--graphics/zathura-pdf-poppler/files/patch-config.mk22
-rw-r--r--graphics/zathura/Makefile35
-rw-r--r--graphics/zathura/distinfo4
-rw-r--r--graphics/zathura/files/patch-render.c36
-rw-r--r--graphics/zathura/pkg-plist10
-rw-r--r--x11-toolkits/girara/Makefile6
-rw-r--r--x11-toolkits/girara/distinfo4
-rw-r--r--x11-toolkits/girara/pkg-plist32
12 files changed, 52 insertions, 137 deletions
diff --git a/graphics/zathura-djvu/Makefile b/graphics/zathura-djvu/Makefile
index 0aaf985d7b39..468abd586f1e 100644
--- a/graphics/zathura-djvu/Makefile
+++ b/graphics/zathura-djvu/Makefile
@@ -2,22 +2,22 @@
# $FreeBSD$
PORTNAME= zathura-djvu
-PORTVERSION= 0.2.2
+PORTVERSION= 0.2.3
CATEGORIES= graphics
MASTER_SITES= http://pwmt.org/projects/zathura/plugins/download/
MAINTAINER= alexander.4mail@gmail.com
COMMENT= The zathura-djvu plugin adds DjVu support to zathura
-LIB_DEPENDS= djvulibre:${PORTSDIR}/graphics/djvulibre
+LIB_DEPENDS= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
BUILD_DEPENDS= zathura:${PORTSDIR}/graphics/zathura
RUN_DEPENDS= zathura:${PORTSDIR}/graphics/zathura
-USE_GNOME= glib20 gtk20
-USES= gmake pkgconfig
+USE_GNOME= glib20 gtk30
+USES= desktop-file-utils gmake pkgconfig
-PLIST_FILES= lib/zathura/djvu.so
+PLIST_FILES= lib/zathura/djvu.so \
+ share/applications/zathura-djvu.desktop
PLIST_DIRSTRY= lib/zathura
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/graphics/zathura-djvu/distinfo b/graphics/zathura-djvu/distinfo
index d0f4943d955b..7ef3894ae6eb 100644
--- a/graphics/zathura-djvu/distinfo
+++ b/graphics/zathura-djvu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zathura-djvu-0.2.2.tar.gz) = 9c0accf68be79df63f16337b7cef66bfb199f4ff296ae5a1bc8de220f1af2691
-SIZE (zathura-djvu-0.2.2.tar.gz) = 10473
+SHA256 (zathura-djvu-0.2.3.tar.gz) = c16e82d525012b788fd01c4189df93708fcffffb7dd34ca09db55005d644ed89
+SIZE (zathura-djvu-0.2.3.tar.gz) = 11181
diff --git a/graphics/zathura-djvu/files/patch-config.mk b/graphics/zathura-djvu/files/patch-config.mk
deleted file mode 100644
index cc9cb879b310..000000000000
--- a/graphics/zathura-djvu/files/patch-config.mk
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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}
diff --git a/graphics/zathura-pdf-poppler/Makefile b/graphics/zathura-pdf-poppler/Makefile
index 234828bc81d7..a3476bfcabfd 100644
--- a/graphics/zathura-pdf-poppler/Makefile
+++ b/graphics/zathura-pdf-poppler/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS= libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
BUILD_DEPENDS= zathura:${PORTSDIR}/graphics/zathura
RUN_DEPENDS= zathura:${PORTSDIR}/graphics/zathura
-USE_GNOME= glib20 gtk20
+USE_GNOME= glib20 gtk30
USES= desktop-file-utils gmake pkgconfig
PLIST_FILES= lib/zathura/pdf.so \
diff --git a/graphics/zathura-pdf-poppler/files/patch-config.mk b/graphics/zathura-pdf-poppler/files/patch-config.mk
deleted file mode 100644
index f07cd290ef1c..000000000000
--- a/graphics/zathura-pdf-poppler/files/patch-config.mk
+++ /dev/null
@@ -1,22 +0,0 @@
---- config.mk.orig 2013-05-12 23:21:06.000000000 +0200
-+++ config.mk 2013-06-21 13:16:15.646661467 +0200
-@@ -12,7 +12,7 @@
-
- # paths
- PREFIX ?= /usr
--LIBDIR ?= ${PREFIX}/lib
-+LIBDIR = ${PREFIX}/lib
- DESKTOPPREFIX ?= ${PREFIX}/share/applications
-
- # libs
-@@ -26,10 +26,7 @@
- GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk${ZATHURA_GTK_VERSION})
-
- ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
--PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)
--ifeq (,${PLUGINDIR})
- PLUGINDIR = ${LIBDIR}/zathura
--endif
-
- INCS = ${CAIRO_INC} ${PDF_INC} ${ZATHURA_INC} ${GIRARA_INC}
- LIBS = ${GIRARA_LIB} ${CAIRO_LIB} ${PDF_LIB}
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index 03c8984a0eaa..cee8f1eb445e 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -2,39 +2,33 @@
# $FreeBSD$
PORTNAME= zathura
-PORTVERSION= 0.2.2
+PORTVERSION= 0.2.5
CATEGORIES= graphics print
MASTER_SITES= http://pwmt.org/projects/zathura/download/
MAINTAINER= acieroid@awesom.eu
COMMENT= Customizable lightweight pdf viewer
-LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
- girara-gtk2:${PORTSDIR}/x11-toolkits/girara
+LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
+ libgirara-gtk3.so:${PORTSDIR}/x11-toolkits/girara
+BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils
-USE_GNOME= glib20 gtk20
+USE_GNOME= glib20 gtk30
USES= gmake pkgconfig
-MAKE_ENV= SFLAGS="${STRIP}"
+MAKE_ENV= SFLAGS="${STRIP}" \
+ RSTTOMAN=${LOCALBASE}/bin/rst2man
-OPTIONS_DEFINE= DOCS NLS SQLITE
+OPTIONS_DEFINE= NLS SQLITE
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSQLITE}
-LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3
MAKE_ENV+= WITH_SQLITE=1
.else
MAKE_ENV+= WITH_SQLITE=0
.endif
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils
-MAN1+= zathura.1
-MAN5+= zathurarc.5
-MAKE_ENV+= RSTTOMAN=${LOCALBASE}/bin/rst2man
-.endif
-
.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
@@ -48,12 +42,6 @@ post-patch: .SILENT
${WRKSRC}/Makefile
${REINPLACE_CMD} -e 's|PLUGINDIR ?= .*$$|PLUGINDIR ?= ${PREFIX}/lib/zathura|'\
${WRKSRC}/config.mk
-.if ! ${PORT_OPTIONS:MDOCS}
- ${REINPLACE_CMD} -e 's|install-manpages$$||'\
- ${WRKSRC}/Makefile
- ${REINPLACE_CMD} -e 's|RSTTOMAN ?= /usr/bin/rst2man|RSTTOMAN ?= ""|'\
- ${WRKSRC}/config.mk
-.endif
.if ! ${PORT_OPTIONS:MNLS}
${REINPLACE_CMD} -e '/-C po/d'\
${WRKSRC}/Makefile
@@ -66,9 +54,6 @@ post-patch: .SILENT
${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \
${WRKSRC}/config.h \
${WRKSRC}/zathurarc.5.rst
- (cd ${WRKSRC}; ${RM} -f ${MAN1} ${MAN5})
-
-post-install:
- @${CAT} ${PKGMESSAGE}
+ (cd ${WRKSRC}; ${RM} -f zathura.1 zathurarc.5)
.include <bsd.port.mk>
diff --git a/graphics/zathura/distinfo b/graphics/zathura/distinfo
index efc81c1d7d58..32d0689f6a04 100644
--- a/graphics/zathura/distinfo
+++ b/graphics/zathura/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zathura-0.2.2.tar.gz) = 6506237ba76ce1611dc24ddd870853d753b5e70e5200d75d2a2257ff7c9242c9
-SIZE (zathura-0.2.2.tar.gz) = 108240
+SHA256 (zathura-0.2.5.tar.gz) = d901805efa7e18575008e97187a406adc6ac911b493f0e0dfaa69f453ac089d3
+SIZE (zathura-0.2.5.tar.gz) = 133895
diff --git a/graphics/zathura/files/patch-render.c b/graphics/zathura/files/patch-render.c
deleted file mode 100644
index 3475f7b1b9d3..000000000000
--- a/graphics/zathura/files/patch-render.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- render.c.orig 2013-01-22 17:23:39.000000000 +0100
-+++ render.c 2013-01-22 17:23:03.000000000 +0100
-@@ -19,7 +19,7 @@
-
- struct render_thread_s {
- GThreadPool* pool; /**< Pool of threads */
-- GMutex mutex; /**< Render lock */
-+ GStaticMutex mutex; /**< Render lock */
- bool about_to_close; /**< Render thread is to be freed */
- };
-
-@@ -51,7 +51,7 @@
-
- render_thread->about_to_close = false;
- g_thread_pool_set_sort_function(render_thread->pool, render_thread_sort, zathura);
-- g_mutex_init(&render_thread->mutex);
-+ g_static_mutex_init(&render_thread->mutex);
-
- return render_thread;
-
-@@ -328,7 +328,7 @@
- return;
- }
-
-- g_mutex_lock(&render_thread->mutex);
-+ g_static_mutex_lock(&render_thread->mutex);
- }
-
- void
-@@ -338,5 +338,5 @@
- return;
- }
-
-- g_mutex_unlock(&render_thread->mutex);
-+ g_static_mutex_unlock(&render_thread->mutex);
- }
diff --git a/graphics/zathura/pkg-plist b/graphics/zathura/pkg-plist
index fed4be41c8d6..d73fe6b81b8b 100644
--- a/graphics/zathura/pkg-plist
+++ b/graphics/zathura/pkg-plist
@@ -7,16 +7,24 @@ include/zathura/plugin-api.h
include/zathura/types.h
include/zathura/version.h
libdata/pkgconfig/zathura.pc
+man/man1/zathura.1.gz
+man/man5/zathurarc.5.gz
share/applications/zathura.desktop
+%%NLS%%share/locale/ca/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/cs/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/de/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/el/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/eo/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/es/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/es_CL/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/et/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/fr/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/he/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/it/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/pl/LC_MESSAGES/zathura.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/ru/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/ta_IN/LC_MESSAGES/zathura.mo
%%NLS%%share/locale/tr/LC_MESSAGES/zathura.mo
@@ -24,6 +32,8 @@ share/applications/zathura.desktop
@dirrm include/zathura
@dirrmtry share/locale/es_CL/LC_MESSAGES
@dirrmtry share/locale/es_CL
+@dirrmtry share/locale/id_ID/LC_MESSAGES
+@dirrmtry share/locale/id_ID
@dirrmtry share/locale/ta_IN/LC_MESSAGES
@dirrmtry share/locale/ta_IN
@dirrmtry share/locale/uk_UA/LC_MESSAGES
diff --git a/x11-toolkits/girara/Makefile b/x11-toolkits/girara/Makefile
index f45ff2fea019..91fdfa0be53e 100644
--- a/x11-toolkits/girara/Makefile
+++ b/x11-toolkits/girara/Makefile
@@ -2,14 +2,14 @@
# $FreeBSD$
PORTNAME= girara
-PORTVERSION= 0.1.7
+PORTVERSION= 0.1.9
CATEGORIES= x11-toolkits graphics
MASTER_SITES= http://pwmt.org/projects/girara/download/
MAINTAINER= madpilot@FreeBSD.org
-COMMENT= GTK2 Interface Library for Zathura PDF Viewer
+COMMENT= GTK3 Interface Library for Zathura PDF Viewer
-USE_GNOME= glib20 gtk20
+USE_GNOME= glib20 gtk30
USES= compiler:c11 gmake pkgconfig
USE_LDCONFIG= yes
LIBDIR= ${PREFIX}/lib
diff --git a/x11-toolkits/girara/distinfo b/x11-toolkits/girara/distinfo
index 12f1be75fc61..e360f0369eaf 100644
--- a/x11-toolkits/girara/distinfo
+++ b/x11-toolkits/girara/distinfo
@@ -1,2 +1,2 @@
-SHA256 (girara-0.1.7.tar.gz) = 2374b8951d1276638dfca9f6d7570ce12313c8af482426a9a057a0227ea01c8e
-SIZE (girara-0.1.7.tar.gz) = 82277
+SHA256 (girara-0.1.9.tar.gz) = e0f43d322e74cf5d853c7e3d00bbbb8b54afd7ac33832d153cc05f4b5503a2cd
+SIZE (girara-0.1.9.tar.gz) = 82798
diff --git a/x11-toolkits/girara/pkg-plist b/x11-toolkits/girara/pkg-plist
index cdd11b902154..fdb5084f3309 100644
--- a/x11-toolkits/girara/pkg-plist
+++ b/x11-toolkits/girara/pkg-plist
@@ -15,20 +15,20 @@ include/girara/tabs.h
include/girara/types.h
include/girara/utils.h
include/girara/version.h
-lib/libgirara-gtk2.a
-lib/libgirara-gtk2.so
-lib/libgirara-gtk2.so.1
-lib/libgirara-gtk2.so.1.1
-libdata/pkgconfig/girara-gtk2.pc
-%%NLS%%share/locale/de/LC_MESSAGES/libgirara-gtk2-1.mo
-%%NLS%%share/locale/el/LC_MESSAGES/libgirara-gtk2-1.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/libgirara-gtk2-1.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libgirara-gtk2-1.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libgirara-gtk2-1.mo
-%%NLS%%share/locale/he/LC_MESSAGES/libgirara-gtk2-1.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libgirara-gtk2-1.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libgirara-gtk2-1.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgirara-gtk2-1.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libgirara-gtk2-1.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libgirara-gtk2-1.mo
+lib/libgirara-gtk3.a
+lib/libgirara-gtk3.so
+lib/libgirara-gtk3.so.1
+lib/libgirara-gtk3.so.1.1
+libdata/pkgconfig/girara-gtk3.pc
+%%NLS%%share/locale/de/LC_MESSAGES/libgirara-gtk3-1.mo
+%%NLS%%share/locale/el/LC_MESSAGES/libgirara-gtk3-1.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/libgirara-gtk3-1.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libgirara-gtk3-1.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libgirara-gtk3-1.mo
+%%NLS%%share/locale/he/LC_MESSAGES/libgirara-gtk3-1.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libgirara-gtk3-1.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libgirara-gtk3-1.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgirara-gtk3-1.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libgirara-gtk3-1.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libgirara-gtk3-1.mo
@dirrm include/girara