- Update to version 1.4.0

- Respect WITHOUT_NLS knob

PR:		ports/151210
Submitted by:	"Pawel Pekala" <c0rn@o2.pl> (maintainer)

4 files changed, 55 insertions, 39 deletions

diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 84ccb792a57..4aa292a94f9 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	meld
-PORTVERSION=	1.3.3
+PORTVERSION=	1.4.0
 CATEGORIES=	textproc devel python
 MASTER_SITES=	GNOME
 
@@ -18,13 +18,20 @@ OPTIONS=	PYGNOMEDESKTOP "Code syntax hilighting (many dependencies)" off
 USE_BZIP2=	yes
 USE_GNOME=	pygnome2
 USE_PYTHON=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	prefix=${PREFIX}
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 LICENSE=	GPLv2
 
+.if defined(WITHOUT_NLS)
+EXTRA_PATCHES=	${FILESDIR}/extra-Makefile-without_nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 post-patch:
 .for file in Makefile
 	@${REINPLACE_CMD} -e '/docdir_/d' ${WRKSRC}/${file}
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index 3fb3ea0663a..655517a4cb9 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1,3 +1,2 @@
-MD5 (meld-1.3.3.tar.bz2) = 4326e8492871dbee4d1107943a3c414a
-SHA256 (meld-1.3.3.tar.bz2) = bfdf9a5e33a7ebc5b976fbd2925033e2bbd46e8f632437959b88aac35676d08a
-SIZE (meld-1.3.3.tar.bz2) = 333460
+SHA256 (meld-1.4.0.tar.bz2) = 0edb78d9da2bfe7e630742111eb6d8edc476c8cc91b1f6403d940d072dd75469
+SIZE (meld-1.4.0.tar.bz2) = 333793
diff --git a/textproc/meld/files/extra-Makefile-without_nls b/textproc/meld/files/extra-Makefile-without_nls
new file mode 100644
index 00000000000..3726975507b
--- /dev/null
+++ b/textproc/meld/files/extra-Makefile-without_nls
@@ -0,0 +1,10 @@
+--- Makefile.orig	2010-10-04 19:00:55.000000000 +0200
++++ Makefile	2010-10-04 19:01:41.000000000 +0200
+@@ -94,7 +94,6 @@
+ 		$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/meld.png
+ 	install -m 644 data/icons/48x48/meld.svg \
+ 		$(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps/meld.svg
+-	$(MAKE) -C po install
+ 	$(MAKE) -C help install
+ 
+ meld.desktop: data/meld.desktop.in
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index aa034358fdc..0bb5f472a53 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -167,40 +167,40 @@ share/icons/hicolor/22x22/apps/meld.png
 share/icons/hicolor/32x32/apps/meld.png
 share/icons/hicolor/48x48/apps/meld.png
 share/icons/hicolor/scalable/apps/meld.svg
-share/locale/ar/LC_MESSAGES/meld.mo
-share/locale/bg/LC_MESSAGES/meld.mo
-share/locale/ca/LC_MESSAGES/meld.mo
-share/locale/cs/LC_MESSAGES/meld.mo
-share/locale/de/LC_MESSAGES/meld.mo
-share/locale/dz/LC_MESSAGES/meld.mo
-share/locale/el/LC_MESSAGES/meld.mo
-share/locale/en_CA/LC_MESSAGES/meld.mo
-share/locale/en_GB/LC_MESSAGES/meld.mo
-share/locale/es/LC_MESSAGES/meld.mo
-share/locale/fi/LC_MESSAGES/meld.mo
-share/locale/fr/LC_MESSAGES/meld.mo
-share/locale/gl/LC_MESSAGES/meld.mo
-share/locale/hu/LC_MESSAGES/meld.mo
-share/locale/it/LC_MESSAGES/meld.mo
-share/locale/ja/LC_MESSAGES/meld.mo
-share/locale/ko/LC_MESSAGES/meld.mo
-share/locale/nb/LC_MESSAGES/meld.mo
-share/locale/ne/LC_MESSAGES/meld.mo
-share/locale/nl/LC_MESSAGES/meld.mo
-share/locale/oc/LC_MESSAGES/meld.mo
-share/locale/pa/LC_MESSAGES/meld.mo
-share/locale/pt/LC_MESSAGES/meld.mo
-share/locale/pt_BR/LC_MESSAGES/meld.mo
-share/locale/ru/LC_MESSAGES/meld.mo
-share/locale/rw/LC_MESSAGES/meld.mo
-share/locale/sl/LC_MESSAGES/meld.mo
-share/locale/sq/LC_MESSAGES/meld.mo
-share/locale/sr/LC_MESSAGES/meld.mo
-share/locale/sr@latin/LC_MESSAGES/meld.mo
-share/locale/sv/LC_MESSAGES/meld.mo
-share/locale/vi/LC_MESSAGES/meld.mo
-share/locale/zh_CN/LC_MESSAGES/meld.mo
-share/locale/zh_TW/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/de/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/el/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/es/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/it/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ne/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/meld.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/meld.mo
 share/omf/meld/meld-C.omf
 share/omf/meld/meld-es.omf
 share/omf/meld/meld-fr.omf