Bug 178335

Summary:	[PATCH] net-mgmt/wifimgr Fix WITHOUT_NLS case
Product:	Ports & Packages	Reporter:	Chris Rees <crees>
Component:	Individual Port(s)	Assignee:	Chris Rees <crees>
Status:	Closed FIXED
Severity:	Affects Only Me
Priority:	Normal
Version:	Latest
Hardware:	Any
OS:	Any

Description Chris Rees freebsd_committer

2013-05-04 13:20:00 UTC

	Leftovers when WITHOUT_NLS is set.

	http://www.bayofrum.net/medusa/tinderlogs/10-local-20130503100553/wifimgr-1.10_1.log

Fix: Update to OPTIONSng while here.



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.--Vm8EHVT1Z777wOkxERhFf41Gd59O9DlLAUF9kXIG46Ky2Y7H
Content-Type: text/plain; name="patch.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="patch.txt"

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@opal.com>
-#
+# Created by: J.R. Oldroyd <fbsd@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 \

Comment 1 Edwin Groothuis freebsd_committer

2013-05-04 13:20:07 UTC

Maintainer of net-mgmt/wifimgr,

Please note that PR ports/178335 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/178335

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org

Comment 2 Edwin Groothuis freebsd_committer

2013-05-04 13:20:08 UTC

State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)

Comment 3 Chris Rees freebsd_committer

2013-05-04 13:31:41 UTC

Responsible Changed
From-To: freebsd-ports-bugs->crees

I'll take it.

Comment 4 dfilter service freebsd_committer

2013-05-20 21:16:12 UTC

Author: crees
Date: Mon May 20 20:16:03 2013
New Revision: 318625
URL: http://svnweb.freebsd.org/changeset/ports/318625

Log:
  net-mgmt/wifimgr: Unbreak when NLS unset
  
  PR:		ports/178335
  Approved by:	maintainer timeout (fbsd@opal.com, 16 days)

Added:
  head/net-mgmt/wifimgr/files/
  head/net-mgmt/wifimgr/files/patch-src-Makefile   (contents, props changed)
Modified:
  head/net-mgmt/wifimgr/Makefile

Modified: head/net-mgmt/wifimgr/Makefile
==============================================================================
--- head/net-mgmt/wifimgr/Makefile	Mon May 20 20:13:53 2013	(r318624)
+++ head/net-mgmt/wifimgr/Makefile	Mon May 20 20:16:03 2013	(r318625)
@@ -20,11 +20,12 @@ INSTALLS_ICONS=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
+USES+=		gettext pkgconfig
 PLIST_SUB+=	NLS=""
 .else
 CFLAGS+=	-DWITHOUT_NLS
 PLIST_SUB+=	NLS="@comment "
+MAKE_ENV+=	WITHOUT_NLS=${WITHOUT_NLS}
 .endif
 
 MAN8=		wifimgr.8

Added: head/net-mgmt/wifimgr/files/patch-src-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/wifimgr/files/patch-src-Makefile	Mon May 20 20:16:03 2013	(r318625)
@@ -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 \
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"

Comment 5 Chris Rees freebsd_committer

2013-05-20 21:20:26 UTC

State Changed
From-To: feedback->closed

Committed.