Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Dec 2013 22:42:15 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r336032 - in head/graphics/viewnior: . files
Message-ID:  <201312092242.rB9MgFE7023956@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Mon Dec  9 22:42:15 2013
New Revision: 336032
URL: http://svnweb.freebsd.org/changeset/ports/336032

Log:
  - Fix NLS
  - USES pathfix instead of REINPLACE_CMD
  - Add patch
  
  Approved by:	pawel / wg (mentors, implicit)

Added:
  head/graphics/viewnior/files/
  head/graphics/viewnior/files/patch-src__vnr-properties-dialog.c   (contents, props changed)
Modified:
  head/graphics/viewnior/Makefile

Modified: head/graphics/viewnior/Makefile
==============================================================================
--- head/graphics/viewnior/Makefile	Mon Dec  9 20:34:13 2013	(r336031)
+++ head/graphics/viewnior/Makefile	Mon Dec  9 22:42:15 2013	(r336032)
@@ -12,7 +12,8 @@ COMMENT=	Fast and simple image viewer
 
 LICENSE=	GPLv3
 
-USES=		gmake pkgconfig shared-mime-info
+USES=		gmake pathfix pkgconfig shared-mime-info
+PATHFIX_MAKEFILEIN=	Makefile.in.in
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20
@@ -23,12 +24,14 @@ PORTDOCS=	AUTHORS ChangeLog NEWS README 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
-NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${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
+.endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/

Added: head/graphics/viewnior/files/patch-src__vnr-properties-dialog.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/viewnior/files/patch-src__vnr-properties-dialog.c	Mon Dec  9 22:42:15 2013	(r336032)
@@ -0,0 +1,11 @@
+--- ./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);
+ 



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