Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Apr 2012 14:03:38 GMT
From:      Mihail Krutov <neko@takino.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/167330: graphics/zathura ports update
Message-ID:  <201204261403.q3QE3c4D027559@red.freebsd.org>
Resent-Message-ID: <201204261410.q3QEABMB038174@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         167330
>Category:       ports
>Synopsis:       graphics/zathura ports update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 26 14:10:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Mihail Krutov
>Release:        FreeBSD 8.0
>Organization:
>Environment:
FreeBSD takino.org 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Jan 16 09:56:47 MSK 2012     neko@takino.org:/usr/obj/amd64z/usr/src/sys/TAKINO  amd64

>Description:
zathura is a highly customizable and functional PDF viewer based on the poppler
rendering library and the gtk+ toolkit. The idea behind zathura is an
application that provides a minimalistic and space saving interface as well as
an easy usage that mainly focuses on keyboard interaction.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -rupN zathura/Makefile zathura____/Makefile
--- zathura/Makefile	2012-04-26 17:56:28.000000000 +0400
+++ zathura____/Makefile	2012-04-26 17:39:18.000000000 +0400
@@ -6,18 +6,32 @@
 #
 
 PORTNAME=	zathura
-PORTVERSION=	0.0.8.4
+PORTVERSION=	0.1.2
 PORTREVISION=	2
 CATEGORIES=	graphics print
-MASTER_SITES=	http://pwmt.org/download/
+MASTER_SITES=	http://pwmt.org/projects/zathura/download/
 
 MAINTAINER=	acieroid@awesom.eu
 COMMENT=	Customizable lightweight pdf viewer
 
 LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
-		cairo.2:${PORTSDIR}/graphics/cairo
+		cairo.2:${PORTSDIR}/graphics/cairo \
+		girara-gtk2.0:${PORTSDIR}/x11-toolkits/girara
+
+OPTIONS=	POPPLERPDF 	"Poppler PDF Viewer Plugin" On \
+		MUPDF		"MuPDF Viewer Plugin" Off
+
+.include <bsd.port.options.mk>
+.if defined (WITH_POPPLERPDF) && !defined(WITH_MUPDF)
+RUN_DEPENDS+=	${LOCALBASE}/lib/zathura/pdf.so:${PORTSDIR}/graphics/zathura-pdf-poppler
+.endif
+
+.if defined (WITH_MUPDF) && !defined(WITH_POPPLERPDF)
+RUN_DEPENDS+=	${LOCALBASE}/lib/zathura/pdf.so:${PORTSDIR}/graphics/zathura-pdf-mupdf
+.endif
 
 USE_GNOME=	glib20 gtk20
+USE_GMAKE=	yes
 FETCH_ARGS=	-Fpr
 
 MAN1=		zathura.1
@@ -26,23 +40,17 @@ PLIST_FILES=	bin/zathura	\
 		share/applications/zathura.desktop
 PLIST_DIRSTRY=	share/applications
 
+
+
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
 MAN5+=		zathurarc.5
 .endif
 
 post-patch:	.SILENT
-	${REINPLACE_CMD} -e 's|man[15]|man/&|g' \
-		-e '/CC/s/$${SFLAGS}/${STRIP} /' \
-		-e '/CFLAGS/!s/$${LDFLAGS}/$${CFLAGS} &/' \
-		-e 's/{DFLAGS/{DEBUG_FLAGS/g' \
+		${REINPLACE_CMD} -e 's|man[15]|man/&|g' \
 		-e 's/755/${BINMODE}/' \
 		-e 's/644/${MANMODE}/' \
-		-e '/echo[[:space:]]CC/d' \
-		-e '/echo/!s/^\([[:space:]]*\)@/\1/' \
-		-e '/^all:/s/options//' \
-		-e 's/cp[[:space:]]$$</cp $$>/' \
-		-e 's/\(include\)[[:space:]]\(.*\)/.\1 "\2"/' \
 		${WRKSRC}/Makefile
 .if defined(NOPORTDOCS)
 	${REINPLACE_CMD} 's|which rst2man|${FALSE}|' ${WRKSRC}/Makefile
@@ -50,10 +58,11 @@ post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
 		-e 's/-lpthread/${PTHREAD_LIBS}/' \
 		-e 's/-lc//' \
-		-e 's/$$(shell[[:space:]]\(.*\))/`\1`/' \
+		-e 's/DL_LIB /#&/' \
 		${WRKSRC}/config.mk
 	${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \
-		${WRKSRC}/config.def.h \
+		${WRKSRC}/config.h \
 		${WRKSRC}/zathurarc.5.rst
 
 .include <bsd.port.mk>
+
diff -rupN zathura/distinfo zathura____/distinfo
--- zathura/distinfo	2012-04-26 17:56:43.000000000 +0400
+++ zathura____/distinfo	2012-04-23 14:39:08.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (zathura-0.0.8.4.tar.gz) = 168b13b95c6689dcc3b0cc0f1758bf3877c7a81b4b8985e8c033bfbb8e35380e
-SIZE (zathura-0.0.8.4.tar.gz) = 37542
+SHA256 (zathura-0.1.2.tar.gz) = a496c25071e54f675b65ee5eab02fd002c04c2d7d5cf4aa8a1cb517cc13beaef
+SIZE (zathura-0.1.2.tar.gz) = 65875
diff -rupN zathura/files/patch-document.c zathura____/files/patch-document.c
--- zathura/files/patch-document.c	1970-01-01 04:00:00.000000000 +0400
+++ zathura____/files/patch-document.c	2012-04-23 15:04:10.000000000 +0400
@@ -0,0 +1,10 @@
+--- document.c.orig	2012-03-25 00:57:24.000000000 +0400
++++ document.c	2012-04-23 15:02:51.000000000 +0400
+@@ -12,6 +12,7 @@
+ #include <errno.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
++#include <sys/wait.h>
+ 
+ #include "document.h"
+ #include "utils.h"


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204261403.q3QE3c4D027559>