5 files changed, 28 insertions, 33 deletions

diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile
index 066d81b5b073..3831723b52f1 100644
--- a/graphics/gpicview/Makefile
+++ b/graphics/gpicview/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gpicview
-PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTVERSION=	0.1.9
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	lxde
@@ -17,5 +16,16 @@ COMMENT=	A Simple and Fast Image Viewer for X
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/gpicview/distinfo b/graphics/gpicview/distinfo
index 765d5fc56b5d..3da45f780679 100644
--- a/graphics/gpicview/distinfo
+++ b/graphics/gpicview/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpicview-0.1.5.tar.gz) = 5c484ea089f5a6455265e1e1f472240e
-SHA256 (gpicview-0.1.5.tar.gz) = 7663e1849f3b1f2225a3310f907f86068d7ac5c8957d68fc4a684059b49211ca
-SIZE (gpicview-0.1.5.tar.gz) = 363712
+MD5 (gpicview-0.1.9.tar.gz) = c37161f93676e4c2cc60965c878bdc68
+SHA256 (gpicview-0.1.9.tar.gz) = 3a05649a53adb838d355154c32870f7964a43fed10e99d97386df330bc14712e
+SIZE (gpicview-0.1.9.tar.gz) = 397457
diff --git a/graphics/gpicview/files/patch-src_Makefile.am b/graphics/gpicview/files/patch-src_Makefile.am
deleted file mode 100644
index 3d932dddb66b..000000000000
--- a/graphics/gpicview/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.am.orig
-+++ src/Makefile.am
-@@ -18,7 +18,7 @@
- 
- # the library search path.
- # use -nodefaultlibs to prevent linking libstdc++
--gpicview_LDFLAGS = $(all_libraries) -nodefaultlibs -lc
-+gpicview_LDFLAGS = $(all_libraries) -lc
- gpicview_LDADD = @PACKAGE_LIBS@
- gpicview_CXXFLAGS = -fno-rtti -fno-exceptions
- 
diff --git a/graphics/gpicview/files/patch-src_Makefile.in b/graphics/gpicview/files/patch-src_Makefile.in
deleted file mode 100644
index 21b5294e56ba..000000000000
--- a/graphics/gpicview/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -225,7 +225,7 @@
- 
- # the library search path.
- # use -nodefaultlibs to prevent linking libstdc++
--gpicview_LDFLAGS = $(all_libraries) -nodefaultlibs -lc
-+gpicview_LDFLAGS = $(all_libraries) -lc
- gpicview_LDADD = @PACKAGE_LIBS@
- gpicview_CXXFLAGS = -fno-rtti -fno-exceptions
- noinst_HEADERS = \
diff --git a/graphics/gpicview/pkg-plist b/graphics/gpicview/pkg-plist
index edd060e5bde7..6587a9f84378 100644
--- a/graphics/gpicview/pkg-plist
+++ b/graphics/gpicview/pkg-plist
@@ -1,5 +1,16 @@
 bin/gpicview
 share/applications/gpicview.desktop
+%%NLS%%share/locale/cs/LC_MESSAGES/gpicview.mo
+%%NLS%%share/locale/de_DE/LC_MESSAGES/gpicview.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gpicview.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gpicview.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/gpicview.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gpicview.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gpicview.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gpicview.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/gpicview.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gpicview.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/gpicview.mo
 %%DATADIR%%/pixmaps/clockwise.png
 %%DATADIR%%/pixmaps/counterclockwise.png
 %%DATADIR%%/pixmaps/fullscreen.png
@@ -9,3 +20,5 @@ share/pixmaps/gpicview.png
 @dirrm %%DATADIR%%
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de_DE