ports/156977: [UPDATE] deskutils/xchm: update to 1.20

[Ruslan Mahmatkhanov]

>Number:         156977
>Category:       ports
>Synopsis:       [UPDATE] deskutils/xchm: update to 1.20
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 12 11:40:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Ruslan Mahmatkhanov
>Release:        9.0-CURRENT
>Organization:
>Environment:
9.0-CURRENT i386 with wxgtk2 2.8.12
>Description:
- update to 1.20
- add WITHOUT_NLS

changelog are:
 - improving non-Latin files support
 - many crash and bug fixes

There is portlint warnings like this, when i set WITHOUT_NLS=yes in make.conf:
"""
WARN: /usr/ports/deskutils/xchm/pkg-plist: [2]: installing gettext translation files, please define USE_GETTEXT as appropriate
"""
But it seems like porlint don't know hot to handle conditional installing of nls.

Also there is portlint error:
"""
FATAL: Makefile: CPPFLAGS is already passed in CONFIGURE_ENV via bsd.gcc.mk.  If you need to override the default value, alter CPPFLAGS in the Makefile instead with CPPFLAGS=...
"""
I don't know how i should change it properly, but i think it's valid until it's not forbidden in Porters Handbook. 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruNa xchm.orig/Makefile xchm/Makefile
--- xchm.orig/Makefile	2011-01-26 16:31:35.000000000 +0300
+++ xchm/Makefile	2011-05-12 15:18:06.000000000 +0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xchm
-PORTVERSION=	1.18
+PORTVERSION=	1.20
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/xCHM/${PORTNAME}-${PORTVERSION}
 
@@ -26,4 +26,12 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|@REZ_COMMAND@||' ${WRKSRC}/src/Makefile.in
 
+.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 -ruNa xchm.orig/distinfo xchm/distinfo
--- xchm.orig/distinfo	2011-01-26 16:31:35.000000000 +0300
+++ xchm/distinfo	2011-05-12 14:47:46.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (xchm-1.18.tar.gz) = fc9527ca22b848f5e97691a06c8eb8b572c9d5ec77936e48346cc8baf0f77bf3
-SIZE (xchm-1.18.tar.gz) = 403698
+SHA256 (xchm-1.20.tar.gz) = 76c717074ed178abae63692cfa843083922e6d6e3052207d8a3d9d2e8b8db627
+SIZE (xchm-1.20.tar.gz) = 409976
diff -ruNa xchm.orig/pkg-plist xchm/pkg-plist
--- xchm.orig/pkg-plist	2008-02-07 22:31:30.000000000 +0300
+++ xchm/pkg-plist	2011-05-12 15:11:32.000000000 +0400
@@ -1,23 +1,23 @@
 bin/xchm
-share/locale/be/LC_MESSAGES/xchm.mo
-share/locale/bg/LC_MESSAGES/xchm.mo
-share/locale/cs/LC_MESSAGES/xchm.mo
-share/locale/de/LC_MESSAGES/xchm.mo
-share/locale/es/LC_MESSAGES/xchm.mo
-share/locale/fr/LC_MESSAGES/xchm.mo
-share/locale/hu/LC_MESSAGES/xchm.mo
-share/locale/it/LC_MESSAGES/xchm.mo
-share/locale/lv/LC_MESSAGES/xchm.mo
-share/locale/pl/LC_MESSAGES/xchm.mo
-share/locale/pt_BR/LC_MESSAGES/xchm.mo
-share/locale/pt_PT/LC_MESSAGES/xchm.mo
-share/locale/ro/LC_MESSAGES/xchm.mo
-share/locale/ru/LC_MESSAGES/xchm.mo
-share/locale/sk/LC_MESSAGES/xchm.mo
-share/locale/sv/LC_MESSAGES/xchm.mo
-share/locale/uk/LC_MESSAGES/xchm.mo
-share/locale/zh_CN/LC_MESSAGES/xchm.mo
-share/locale/zh_TW/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xchm.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xchm.mo
 share/pixmaps/xchm-128.xpm
 share/pixmaps/xchm-16.xpm
 share/pixmaps/xchm-32.xpm


>Release-Note:
>Audit-Trail:
>Unformatted: