4 files changed, 12 insertions, 32 deletions

diff --git a/x11-toolkits/girara/Makefile b/x11-toolkits/girara/Makefile
index 854a8a69bf64..064f9152c6d2 100644
--- a/x11-toolkits/girara/Makefile
+++ b/x11-toolkits/girara/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	girara
-PORTVERSION=	0.2.8
-PORTREVISION=	1
+PORTVERSION=	0.2.9
 CATEGORIES=	x11-toolkits graphics
 MASTER_SITES=	https://pwmt.org/projects/girara/download/ \
 		http://www.madpilot.net/~mad/pwmt.org/
@@ -11,14 +10,11 @@ MASTER_SITES=	https://pwmt.org/projects/girara/download/ \
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	GTK3 Interface Library for Zathura PDF Viewer
 
-USES=		gmake pathfix pkgconfig
+USES=		meson pathfix pkgconfig tar:xz
 PATHFIX_MAKEFILEIN=	Makefile
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30
 USE_LDCONFIG=	yes
-USE_CSTD=	gnu99
 LIBDIR=		${PREFIX}/lib
-MAKE_ENV+=	SFLAGS=${STRIP} \
-		VERBOSE=1
 
 OPTIONS_DEFINE=		JSONC NLS NOTIFY
 OPTIONS_DEFAULT=	NOTIFY
@@ -27,19 +23,15 @@ JSONC_DESC=		Support json configuration dump
 OPTIONS_SUB=		yes
 
 JSONC_LIB_DEPENDS=	libjson-c.so:devel/json-c
-JSONC_MAKE_ENV_OFF=		WITH_JSON=0
+JSONC_MESON_TRUE=	enable-json
 
 NLS_USES=		gettext
 
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
-NOTIFY_MAKE_ENV_OFF=	WITH_LIBNOTIFY=0
-
-post-patch:	.SILENT
-	${REINPLACE_CMD} -e 's|^\(CFLAGS +=\) -std=c11|\1|' \
-		${WRKSRC}/config.mk
+NOTIFY_MESON_TRUE=	enable-notify
 
 post-patch-NLS-off: .SILENT
-	${REINPLACE_CMD} -e '/-C po/d' \
-		${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e "/subdir('po')/d" \
+		${WRKSRC}/meson.build
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/girara/distinfo b/x11-toolkits/girara/distinfo
index fd59539dbc0e..85754d2b61ff 100644
--- a/x11-toolkits/girara/distinfo
+++ b/x11-toolkits/girara/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514021128
-SHA256 (girara-0.2.8.tar.gz) = 285905e35375ecbdfe418c6b7735e373d780f76a5b6c90c08db28da9f4d09aa3
-SIZE (girara-0.2.8.tar.gz) = 73646
+TIMESTAMP = 1523953769
+SHA256 (girara-0.2.9.tar.xz) = a81f3e94c71a2ff92bf52295b402ede8175f82fbad1a27f29c1c05a4accb7d52
+SIZE (girara-0.2.9.tar.xz) = 57816
diff --git a/x11-toolkits/girara/files/patch-Makefile b/x11-toolkits/girara/files/patch-Makefile
deleted file mode 100644
index c7506ecbab61..000000000000
--- a/x11-toolkits/girara/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2016-04-18 20:35:34 UTC
-+++ Makefile
-@@ -265,7 +265,7 @@ install-static: static
- install-shared: shared
- 	$(call colorecho,INSTALL,"Install shared library")
- 	$(QUIET)mkdir -m 755 -p ${DESTDIR}${LIBDIR}
--	$(QUIET)install -m 644 ${BUILDDIR_RELEASE}/${BINDIR}/${SOVERSIONFILE} ${DESTDIR}${LIBDIR}
-+	$(QUIET)install ${SFLAGS} -m 644 ${BUILDDIR_RELEASE}/${BINDIR}/${SOVERSIONFILE} ${DESTDIR}${LIBDIR}
- 	$(QUIET)ln -sf ${SOVERSIONFILE} ${DESTDIR}${LIBDIR}/${SOMAJORFILE} || \
- 		echo "Failed to create ${SOMAJORFILE}. Please check if it exists and points to the correct version of ${SOFILE}."
- 	$(QUIET)ln -sf ${SOVERSIONFILE} ${DESTDIR}${LIBDIR}/${SOFILE} || \
diff --git a/x11-toolkits/girara/pkg-plist b/x11-toolkits/girara/pkg-plist
index ef9c2600031f..6c58865fb6c3 100644
--- a/x11-toolkits/girara/pkg-plist
+++ b/x11-toolkits/girara/pkg-plist
@@ -2,9 +2,9 @@ include/girara/callbacks.h
 include/girara/commands.h
 include/girara/completion.h
 include/girara/config.h
-include/girara/css-definitions.h
 include/girara/datastructures.h
 include/girara/entry.h
+include/girara/girara-version.h
 include/girara/girara.h
 include/girara/input-history.h
 include/girara/log.h
@@ -16,11 +16,9 @@ include/girara/statusbar.h
 include/girara/template.h
 include/girara/types.h
 include/girara/utils.h
-include/girara/version.h
-lib/libgirara-gtk3.a
 lib/libgirara-gtk3.so
 lib/libgirara-gtk3.so.3
-lib/libgirara-gtk3.so.3.0
+lib/libgirara-gtk3.so.3.1
 libdata/pkgconfig/girara-gtk3.pc
 %%NLS%%share/locale/de/LC_MESSAGES/libgirara-gtk3-3.mo
 %%NLS%%share/locale/el/LC_MESSAGES/libgirara-gtk3-3.mo
@@ -29,6 +27,7 @@ libdata/pkgconfig/girara-gtk3.pc
 %%NLS%%share/locale/fr/LC_MESSAGES/libgirara-gtk3-3.mo
 %%NLS%%share/locale/he/LC_MESSAGES/libgirara-gtk3-3.mo
 %%NLS%%share/locale/it/LC_MESSAGES/libgirara-gtk3-3.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libgirara-gtk3-3.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libgirara-gtk3-3.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/libgirara-gtk3-3.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/libgirara-gtk3-3.mo