Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Nov 2013 21:08:38 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335121 - in head: graphics/zathura graphics/zathura-djvu graphics/zathura-djvu/files graphics/zathura-pdf-poppler graphics/zathura-pdf-poppler/files graphics/zathura/files x11-toolkits...
Message-ID:  <201311282108.rASL8cC6004989@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Thu Nov 28 21:08:38 2013
New Revision: 335121
URL: http://svnweb.freebsd.org/changeset/ports/335121

Log:
  - 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)

Deleted:
  head/graphics/zathura-djvu/files/
  head/graphics/zathura-pdf-poppler/files/
  head/graphics/zathura/files/
Modified:
  head/graphics/zathura-djvu/Makefile
  head/graphics/zathura-djvu/distinfo
  head/graphics/zathura-pdf-poppler/Makefile
  head/graphics/zathura/Makefile
  head/graphics/zathura/distinfo
  head/graphics/zathura/pkg-plist
  head/x11-toolkits/girara/Makefile
  head/x11-toolkits/girara/distinfo
  head/x11-toolkits/girara/pkg-plist

Modified: head/graphics/zathura-djvu/Makefile
==============================================================================
--- head/graphics/zathura-djvu/Makefile	Thu Nov 28 19:35:14 2013	(r335120)
+++ head/graphics/zathura-djvu/Makefile	Thu Nov 28 21:08:38 2013	(r335121)
@@ -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>

Modified: head/graphics/zathura-djvu/distinfo
==============================================================================
--- head/graphics/zathura-djvu/distinfo	Thu Nov 28 19:35:14 2013	(r335120)
+++ head/graphics/zathura-djvu/distinfo	Thu Nov 28 21:08:38 2013	(r335121)
@@ -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

Modified: head/graphics/zathura-pdf-poppler/Makefile
==============================================================================
--- head/graphics/zathura-pdf-poppler/Makefile	Thu Nov 28 19:35:14 2013	(r335120)
+++ head/graphics/zathura-pdf-poppler/Makefile	Thu Nov 28 21:08:38 2013	(r335121)
@@ -13,7 +13,7 @@ LIB_DEPENDS=	libpoppler-glib.so:${PORTSD
 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 \

Modified: head/graphics/zathura/Makefile
==============================================================================
--- head/graphics/zathura/Makefile	Thu Nov 28 19:35:14 2013	(r335120)
+++ head/graphics/zathura/Makefile	Thu Nov 28 21:08:38 2013	(r335121)
@@ -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>

Modified: head/graphics/zathura/distinfo
==============================================================================
--- head/graphics/zathura/distinfo	Thu Nov 28 19:35:14 2013	(r335120)
+++ head/graphics/zathura/distinfo	Thu Nov 28 21:08:38 2013	(r335121)
@@ -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

Modified: head/graphics/zathura/pkg-plist
==============================================================================
--- head/graphics/zathura/pkg-plist	Thu Nov 28 19:35:14 2013	(r335120)
+++ head/graphics/zathura/pkg-plist	Thu Nov 28 21:08:38 2013	(r335121)
@@ -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

Modified: head/x11-toolkits/girara/Makefile
==============================================================================
--- head/x11-toolkits/girara/Makefile	Thu Nov 28 19:35:14 2013	(r335120)
+++ head/x11-toolkits/girara/Makefile	Thu Nov 28 21:08:38 2013	(r335121)
@@ -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

Modified: head/x11-toolkits/girara/distinfo
==============================================================================
--- head/x11-toolkits/girara/distinfo	Thu Nov 28 19:35:14 2013	(r335120)
+++ head/x11-toolkits/girara/distinfo	Thu Nov 28 21:08:38 2013	(r335121)
@@ -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

Modified: head/x11-toolkits/girara/pkg-plist
==============================================================================
--- head/x11-toolkits/girara/pkg-plist	Thu Nov 28 19:35:14 2013	(r335120)
+++ head/x11-toolkits/girara/pkg-plist	Thu Nov 28 21:08:38 2013	(r335121)
@@ -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



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