Responsible Changed From-To: freebsd-ports-bugs->madpilot I'll take it.
Hi, While testing your patch I noticed that the FETCH_ARGS=-Fpr line is not needed anymore. The port fetches successfully without it. Here is a modified patch which removes such line, can you approve this change? Thanks in advance. -- Guido Falsi <madpilot@FreeBSD.org>
On Tue, Jan 22, 2013 at 09:40:05PM +0100, Guido Falsi wrote: > Hi, > > While testing your patch I noticed that the FETCH_ARGS=-Fpr line is not > needed anymore. The port fetches successfully without it. > > Here is a modified patch which removes such line, can you approve this > change? > > Thanks in advance. > > -- > Guido Falsi <madpilot@FreeBSD.org> It's ok. Thanks.
Author: madpilot Date: Wed Jan 23 19:32:29 2013 New Revision: 310886 URL: http://svnweb.freebsd.org/changeset/ports/310886 Log: - Update zathura [1], zathura-djvu [2] and zathura-pdf-poppler [3] to 0.2.2 - Remove ABI version number from LIB_DEPENDS [1] - Remove unneeded FETCH_ARGS [4] - Convert graphics/zathura to new options framework [5] - Remove reference to non existent port in zathura pkg-message [5] PR: ports/175506 - ports/175515 [2], ports/175513 [1] [5], ports/175516 [3] Submitted by: Alexander <alexander.4mail@gmail.com> (maintainer of graphics/zathura-djvu) Quentin Stievenart <acieroid@awesom.eu> (maintainer of graphics/zathura) Approved by: Alexander <alexander.4mail@gmail.com> [4], Quentin Stievenart <acieroid@awesom.eu> [5] Added: head/graphics/zathura/files/ head/graphics/zathura/files/patch-render.c (contents, props changed) Modified: head/graphics/zathura-djvu/Makefile head/graphics/zathura-djvu/distinfo head/graphics/zathura-pdf-poppler/Makefile head/graphics/zathura-pdf-poppler/distinfo head/graphics/zathura/Makefile head/graphics/zathura/distinfo head/graphics/zathura/pkg-message (contents, props changed) Modified: head/graphics/zathura-djvu/Makefile ============================================================================== --- head/graphics/zathura-djvu/Makefile Wed Jan 23 19:17:33 2013 (r310885) +++ head/graphics/zathura-djvu/Makefile Wed Jan 23 19:32:29 2013 (r310886) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zathura-djvu -PORTVERSION= 0.2.1 +PORTVERSION= 0.2.2 CATEGORIES= graphics MASTER_SITES= http://pwmt.org/projects/zathura/plugins/download/ @@ -15,7 +15,6 @@ RUN_DEPENDS= zathura:${PORTSDIR}/graphic USE_GNOME= glib20 gtk20 USE_GMAKE= yes -FETCH_ARGS= -Fpr PLIST_FILES= lib/zathura/djvu.so PLIST_DIRSTRY= lib/zathura Modified: head/graphics/zathura-djvu/distinfo ============================================================================== --- head/graphics/zathura-djvu/distinfo Wed Jan 23 19:17:33 2013 (r310885) +++ head/graphics/zathura-djvu/distinfo Wed Jan 23 19:32:29 2013 (r310886) @@ -1,2 +1,2 @@ -SHA256 (zathura-djvu-0.2.1.tar.gz) = d8bb3c9e30244a0733e49740ee2dd099ce39fa16f2c320af27a0c09d9a25bcc3 -SIZE (zathura-djvu-0.2.1.tar.gz) = 10412 +SHA256 (zathura-djvu-0.2.2.tar.gz) = 9c0accf68be79df63f16337b7cef66bfb199f4ff296ae5a1bc8de220f1af2691 +SIZE (zathura-djvu-0.2.2.tar.gz) = 10473 Modified: head/graphics/zathura-pdf-poppler/Makefile ============================================================================== --- head/graphics/zathura-pdf-poppler/Makefile Wed Jan 23 19:17:33 2013 (r310885) +++ head/graphics/zathura-pdf-poppler/Makefile Wed Jan 23 19:32:29 2013 (r310886) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zathura-pdf-poppler -PORTVERSION= 0.2.1 +PORTVERSION= 0.2.2 CATEGORIES= graphics MASTER_SITES= http://pwmt.org/projects/zathura/plugins/download/ @@ -15,7 +15,6 @@ RUN_DEPENDS= zathura:${PORTSDIR}/graphic USE_GNOME= glib20 gtk20 USE_GMAKE= yes -FETCH_ARGS= -Fpr PLIST_FILES= lib/zathura/pdf.so PLIST_DIRSTRY= lib/zathura Modified: head/graphics/zathura-pdf-poppler/distinfo ============================================================================== --- head/graphics/zathura-pdf-poppler/distinfo Wed Jan 23 19:17:33 2013 (r310885) +++ head/graphics/zathura-pdf-poppler/distinfo Wed Jan 23 19:32:29 2013 (r310886) @@ -1,2 +1,2 @@ -SHA256 (zathura-pdf-poppler-0.2.1.tar.gz) = 1c162ea887e52f48d6dc80f8427a773768f2df2e37242dab7efddeb3d2e361cd -SIZE (zathura-pdf-poppler-0.2.1.tar.gz) = 8158 +SHA256 (zathura-pdf-poppler-0.2.2.tar.gz) = 87115a2535e2108911dbc900f5d0db879bc6d9f731b161454a6955bb804ba55f +SIZE (zathura-pdf-poppler-0.2.2.tar.gz) = 8153 Modified: head/graphics/zathura/Makefile ============================================================================== --- head/graphics/zathura/Makefile Wed Jan 23 19:17:33 2013 (r310885) +++ head/graphics/zathura/Makefile Wed Jan 23 19:32:29 2013 (r310886) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= zathura -PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTVERSION= 0.2.2 CATEGORIES= graphics print MASTER_SITES= http://pwmt.org/projects/zathura/download/ @@ -11,32 +10,31 @@ MAINTAINER= acieroid@awesom.eu COMMENT= Customizable lightweight pdf viewer LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ - girara-gtk2.1:${PORTSDIR}/x11-toolkits/girara + girara-gtk2:${PORTSDIR}/x11-toolkits/girara USE_GNOME= glib20 gtk20 USE_GMAKE= yes MAKE_ENV= SFLAGS="${STRIP}" -FETCH_ARGS= -Fpr -OPTIONS= SQLITE "Support sqlite database backend" off +OPTIONS_DEFINE= DOCS NLS SQLITE .include <bsd.port.options.mk> -.if !defined(WITHOUT_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 MAKE_ENV+= WITH_SQLITE=1 .else MAKE_ENV+= WITH_SQLITE=0 .endif -.if !defined(NOPORTDOCS) +.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 !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else @@ -49,13 +47,13 @@ post-patch: .SILENT ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's|PLUGINDIR ?= .*$$|PLUGINDIR ?= ${PREFIX}/lib/zathura|'\ ${WRKSRC}/config.mk -.if defined(NOPORTDOCS) +.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 defined(WITHOUT_NLS) +.if ! ${PORT_OPTIONS:MNLS} ${REINPLACE_CMD} -e '/-C po/d'\ ${WRKSRC}/Makefile .endif Modified: head/graphics/zathura/distinfo ============================================================================== --- head/graphics/zathura/distinfo Wed Jan 23 19:17:33 2013 (r310885) +++ head/graphics/zathura/distinfo Wed Jan 23 19:32:29 2013 (r310886) @@ -1,2 +1,2 @@ -SHA256 (zathura-0.2.1.tar.gz) = 075b9def201c77ca738dc9e15b252bc23c085b7c4671a1810d1d962e8d0bd790 -SIZE (zathura-0.2.1.tar.gz) = 95179 +SHA256 (zathura-0.2.2.tar.gz) = 6506237ba76ce1611dc24ddd870853d753b5e70e5200d75d2a2257ff7c9242c9 +SIZE (zathura-0.2.2.tar.gz) = 108240 Added: head/graphics/zathura/files/patch-render.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/zathura/files/patch-render.c Wed Jan 23 19:32:29 2013 (r310886) @@ -0,0 +1,36 @@ +--- 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); + } Modified: head/graphics/zathura/pkg-message ============================================================================== --- head/graphics/zathura/pkg-message Wed Jan 23 19:17:33 2013 (r310885) +++ head/graphics/zathura/pkg-message Wed Jan 23 19:32:29 2013 (r310886) @@ -2,7 +2,6 @@ In order to read documents, zathura need at least one plugin. Such plugins are in graphics/zathura-* ports. If you want to read pdf files, - install the graphics/zathura-pdf-poppler or graphics/zathura-pdf-mupdf - port. + install the graphics/zathura-pdf-poppler port. =============================================================================== _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!