ports/178335: [PATCH] net-mgmt/wifimgr Fix WITHOUT_NLS case

[Chris Rees]

>Number:         178335
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/wifimgr Fix WITHOUT_NLS case
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 04 12:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Chris Rees
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD pegasus.bayofrum.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r247189: Sat Feb 23 15:20:18 GMT 2013 root at pegasus.bayofrum.net:/usr/obj/usr/home/crees/workspace/src/stable/9/sys/PEGASUS amd64


	
>Description:
	Leftovers when WITHOUT_NLS is set.

	http://www.bayofrum.net/medusa/tinderlogs/10-local-20130503100553/wifimgr-1.10_1.log
>How-To-Repeat:
	
>Fix:

	Update to OPTIONSng while here.

--- patch.txt begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 317309)
+++ Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	wifimgr
-# Date created:				2009 November 10
-# Whom:					J.R. Oldroyd <fbsd at opal.com>
-#
+# Created by: J.R. Oldroyd <fbsd at opal.com>
 # $FreeBSD$
-#
 
 PORTNAME=	wifimgr
 PORTVERSION=	1.10
@@ -20,12 +16,15 @@
 USE_GNOME=	gtk20 pkgconfig
 INSTALLS_ICONS=	yes
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CFLAGS+=	-DWITHOUT_NLS
 PLIST_SUB+=	NLS="@comment "
+MAKE_ENV+=	WITHOUT_NLS=${WITHOUT_NLS}
 .endif
 
 MAN8=		wifimgr.8
Index: files/patch-src-Makefile
===================================================================
--- files/patch-src-Makefile	(revision 0)
+++ files/patch-src-Makefile	(working copy)
@@ -0,0 +1,17 @@
+--- src/Makefile.orig	2013-05-04 10:02:37.072273048 +0100
++++ src/Makefile	2013-05-04 10:02:40.231274484 +0100
+@@ -49,12 +49,14 @@
+ 		${PREFIX}/share/icons/hicolor/64x64/apps/wifimgr.png \
+ 		${PREFIX}/share/icons/hicolor/scalable/apps/wifimgr.svg
+ 
++.ifndef WITHOUT_NLS
+ langs =		${PREFIX}/share/locale/bg/LC_MESSAGES/wifimgr.mo \
+ 		${PREFIX}/share/locale/de/LC_MESSAGES/wifimgr.mo \
+ 		${PREFIX}/share/locale/fr/LC_MESSAGES/wifimgr.mo \
+ 		${PREFIX}/share/locale/ja/LC_MESSAGES/wifimgr.mo \
+ 		${PREFIX}/share/locale/nl/LC_MESSAGES/wifimgr.mo \
+ 		${PREFIX}/share/locale/ru/LC_MESSAGES/wifimgr.mo
++.endif
+ 
+ installed =	${PREFIX}/bin/wifimgr \
+ 		${PREFIX}/libexec/wifimgrsu \
--- patch.txt ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

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