5 files changed, 37 insertions, 24 deletions

diff --git a/graphics/viewnior/Makefile b/graphics/viewnior/Makefile
index 4dd1b905123c..9a2a53dfc8d4 100644
--- a/graphics/viewnior/Makefile
+++ b/graphics/viewnior/Makefile
@@ -2,23 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	viewnior
-PORTVERSION=	1.3
-PORTREVISION=	2
+PORTVERSION=	1.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://cloud.github.com/downloads/xsisqox/Viewnior/
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Fast and simple image viewer
 
 LICENSE=	GPLv3
 
-USES=		gmake pkgconfig shared-mime-info
-USE_AUTOTOOLS=	autoconf
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
+		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	xsisqox
+GH_PROJECT=	Viewnior
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	6953b29
+
+USES=		desktop-file-utils gmake pkgconfig
 USE_GNOME=	glib20 gtk20
+USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
+AUTOMAKE_ARGS=	--add-missing --force
+GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
-PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+PORTDOCS=	AUTHORS ChangeLog-20090517 NEWS README
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
@@ -28,16 +37,16 @@ NLS_USES=	gettext
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$(prefix)/$$(DATADIRNAME)/locale|$$(datarootdir)/locale|' \
+	@${REINPLACE_CMD} -e \
+		's|$$(prefix)/$$(DATADIRNAME)/locale|$$(datarootdir)/locale|' \
 		${WRKSRC}/po/Makefile.in.in
 
 .if ! ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's|install: install-data|install:|' ${WRKSRC}/po/Makefile.in.in
+	@${REINPLACE_CMD} -e 's|install: install-data|install:|' \
+		${WRKSRC}/po/Makefile.in.in
 .endif
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
-
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/graphics/viewnior/distinfo b/graphics/viewnior/distinfo
index 5fe1470d8926..99799a981e10 100644
--- a/graphics/viewnior/distinfo
+++ b/graphics/viewnior/distinfo
@@ -1,2 +1,2 @@
-SHA256 (viewnior-1.3.tar.gz) = 46c97c1a85361519b42fe008cfb8911e66f709f3a3a988c11047ab3726889f10
-SIZE (viewnior-1.3.tar.gz) = 525015
+SHA256 (viewnior-1.4.tar.gz) = 5f6d8e29f5eacbc545fb1d8d7d9d484cd20087d53e7b3150cecbb6815ca0be2c
+SIZE (viewnior-1.4.tar.gz) = 164129
diff --git a/graphics/viewnior/files/patch-Makefile.am b/graphics/viewnior/files/patch-Makefile.am
new file mode 100644
index 000000000000..6f0ef0261c0c
--- /dev/null
+++ b/graphics/viewnior/files/patch-Makefile.am
@@ -0,0 +1,10 @@
+--- ./Makefile.am.orig	2014-02-07 20:51:43.000000000 +0000
++++ ./Makefile.am	2014-02-25 16:48:13.431401892 +0000
+@@ -1,5 +1,7 @@
+ SUBDIRS = src data po man
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ EXTRA_DIST = intltool-extract.in \
+ 			 intltool-merge.in \
+ 			 intltool-update.in\
diff --git a/graphics/viewnior/files/patch-src__vnr-properties-dialog.c b/graphics/viewnior/files/patch-src__vnr-properties-dialog.c
deleted file mode 100644
index 1675633d40a6..000000000000
--- a/graphics/viewnior/files/patch-src__vnr-properties-dialog.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/vnr-properties-dialog.c.orig	2012-02-25 12:51:26.000000000 +0100
-+++ ./src/vnr-properties-dialog.c	2013-12-09 19:13:38.000000000 +0100
-@@ -251,7 +251,7 @@
-     }
- 
- 
--    filesize_str = g_format_size_for_display (filesize);
-+    filesize_str = g_format_size (filesize);
- 
-     filetype_desc = g_content_type_get_description (filetype);
- 
diff --git a/graphics/viewnior/pkg-plist b/graphics/viewnior/pkg-plist
index 41d37553354a..32af4a63c840 100644
--- a/graphics/viewnior/pkg-plist
+++ b/graphics/viewnior/pkg-plist
@@ -7,7 +7,10 @@ share/icons/hicolor/24x24/apps/viewnior.png
 share/icons/hicolor/32x32/apps/viewnior.png
 share/icons/hicolor/48x48/apps/viewnior.png
 share/icons/hicolor/scalable/apps/viewnior.svg
+%%NLS%%share/locale/ar/LC_MESSAGES/viewnior.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/viewnior.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/viewnior.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/viewnior.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/viewnior.mo
 %%NLS%%share/locale/da/LC_MESSAGES/viewnior.mo
 %%NLS%%share/locale/de/LC_MESSAGES/viewnior.mo
@@ -43,3 +46,5 @@ share/icons/hicolor/scalable/apps/viewnior.svg
 @dirrm %%DATADIR%%
 %%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/oc
+%%NLS%%@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca@valencia