From nobody@FreeBSD.org  Fri Mar 22 18:27:25 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id E914049A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 22 Mar 2013 18:27:25 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id C125B88C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 22 Mar 2013 18:27:25 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2MIRPlh059420
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 22 Mar 2013 18:27:25 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r2MIRPmw059419;
	Fri, 22 Mar 2013 18:27:25 GMT
	(envelope-from nobody)
Message-Id: <201303221827.r2MIRPmw059419@red.freebsd.org>
Date: Fri, 22 Mar 2013 18:27:25 GMT
From: Tommy Scheunemann <net@arrishq.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: x11-wm/wmconfig port update to version 1.3.8
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         177242
>Category:       ports
>Synopsis:       x11-wm/wmconfig port update to version 1.3.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lme
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 22 18:30:00 UTC 2013
>Closed-Date:    Fri May 10 20:45:19 UTC 2013
>Last-Modified:  Fri May 10 20:45:19 UTC 2013
>Originator:     Tommy Scheunemann
>Release:        9.1
>Organization:
>Environment:
FreeBSD deimos.arrishq.local 9.1-RELEASE FreeBSD 9.1-RELEASE #1: Mon Feb 18 10:51:58 CET 2013 root@deimos.arrishq.local:/usr/obj/usr/src/sys/DEIMOS amd64
>Description:
Update to version 1.3.8 for port x11-wm/wmconfig
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN wmconfig_old/Makefile wmconfig/Makefile
--- wmconfig_old/Makefile	2013-02-02 18:18:03.000000000 +0100
+++ wmconfig/Makefile	2013-03-22 19:04:34.000000000 +0100
@@ -2,7 +2,7 @@
 # $FreeBSD: head/x11-wm/wmconfig/Makefile 311084 2013-01-27 22:57:09Z rakuco $
 
 PORTNAME=	wmconfig
-PORTVERSION=	1.3.7
+PORTVERSION=	1.3.8
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.arrishq.net/files/
 
@@ -18,6 +18,19 @@
 
 PORTDOCS=	AUTHORS ChangeLog COPYING README TODO
 
+OPTIONS=	NLS "Native Language Support with gettext" On
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB=	NLS="@comment "
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff -ruN wmconfig_old/distinfo wmconfig/distinfo
--- wmconfig_old/distinfo	2013-02-02 18:18:03.000000000 +0100
+++ wmconfig/distinfo	2013-03-22 19:03:31.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (wmconfig-1.3.7.tar.bz2) = 2c9adc8ea1d63436fed85a311bbb9f4c0072fb081e08b0604ed3e2de076b86cb
-SIZE (wmconfig-1.3.7.tar.bz2) = 136598
+SHA256 (wmconfig-1.3.8.tar.bz2) = 7b284ccbf664416ceef9d34095fe97794730eab6345922cc9e6a62f5c3551e5f
+SIZE (wmconfig-1.3.8.tar.bz2) = 222738
diff -ruN wmconfig_old/pkg-plist wmconfig/pkg-plist
--- wmconfig_old/pkg-plist	2012-12-30 21:36:27.000000000 +0100
+++ wmconfig/pkg-plist	2013-03-22 19:04:20.000000000 +0100
@@ -17,3 +17,6 @@
 etc/wmconfig/System
 etc/wmconfig/Utilities
 @dirrm etc/wmconfig
+%%NLS%%share/locale/de/LC_MESSAGES/wmconfig.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/wmconfig.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/wmconfig.mo


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Sat Mar 23 09:46:00 UTC 2013 
State-Changed-Why:  
please convert to the new optionsNG 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177242 

From: Tommy Scheunemann <net@arrishq.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177242: x11-wm/wmconfig port update to version 1.3.8
Date: Wed, 27 Mar 2013 10:43:45 +0100 (CET)

 Hello,
 
 new diff file attached.
 
 Kind regards,
 
 Tommy Scheunemann

From: Tommy Scheunemann <net@arrishq.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177242: x11-wm/wmconfig port update to version 1.3.8
Date: Mon, 15 Apr 2013 09:30:31 +0200 (CEST)

 Hello,
 
 sorry for the late reply. It's uploaded at:
 
 http://www.arrishq.net/files/patch
 
 Kind regards,
 
 Tommy
 
 On Wed, 27 Mar 2013, Mark Linimon wrote:
 
 > On Wed, Mar 27, 2013 at 01:50:01PM +0000, Tommy Scheunemann wrote:
 >>  Hello,
 >>
 >>  new diff file attached.
 >>
 >>  Kind regards,
 >>
 >>  Tommy Scheunemann
 >
 > it didn't make it.
 >
 > mcl
Responsible-Changed-From-To: freebsd-ports-bugs->lme 
Responsible-Changed-By: lme 
Responsible-Changed-When: Fri May 10 19:14:52 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177242 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177242: commit references a PR
Date: Fri, 10 May 2013 20:11:28 +0000 (UTC)

 Author: lme
 Date: Fri May 10 20:11:20 2013
 New Revision: 317838
 URL: http://svnweb.freebsd.org/changeset/ports/317838
 
 Log:
   - Update to 1.3.8 [1]
   - Convert to OptionsNG [1]
   - Fix build with clang
   
   PR:		ports/177242 [1]
   Submitted by:	maintainer
 
 Added:
   head/x11-wm/wmconfig/files/
   head/x11-wm/wmconfig/files/patch-package.c   (contents, props changed)
 Modified:
   head/x11-wm/wmconfig/Makefile   (contents, props changed)
   head/x11-wm/wmconfig/distinfo   (contents, props changed)
   head/x11-wm/wmconfig/pkg-plist   (contents, props changed)
 
 Modified: head/x11-wm/wmconfig/Makefile
 ==============================================================================
 --- head/x11-wm/wmconfig/Makefile	Fri May 10 19:39:58 2013	(r317837)
 +++ head/x11-wm/wmconfig/Makefile	Fri May 10 20:11:20 2013	(r317838)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	wmconfig
 -PORTVERSION=	1.3.7
 +PORTVERSION=	1.3.8
  CATEGORIES=	x11-wm
  MASTER_SITES=	http://www.arrishq.net/files/
  
 @@ -18,8 +18,24 @@ MAN1=		wmconfig.1x
  
  PORTDOCS=	AUTHORS ChangeLog COPYING README TODO
  
 +OPTIONS_DEFINE=	NLS DOCS
 +OPTIONS_DEFAULT=	NLS DOCS
 +
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MNLS}
 +USE_GETTEXT=	yes
 +CONFIGURE_ARGS+=--enable-nls
 +CPPFLAGS+=	-I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib
 +PLIST_SUB+=	NLS=""
 +.else
 +CONFIGURE_ARGS+=--disable-nls
 +PLIST_SUB=	NLS="@comment "
 +.endif
 +
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}
  .for i in ${PORTDOCS}
  	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 
 Modified: head/x11-wm/wmconfig/distinfo
 ==============================================================================
 --- head/x11-wm/wmconfig/distinfo	Fri May 10 19:39:58 2013	(r317837)
 +++ head/x11-wm/wmconfig/distinfo	Fri May 10 20:11:20 2013	(r317838)
 @@ -1,2 +1,2 @@
 -SHA256 (wmconfig-1.3.7.tar.bz2) = 2c9adc8ea1d63436fed85a311bbb9f4c0072fb081e08b0604ed3e2de076b86cb
 -SIZE (wmconfig-1.3.7.tar.bz2) = 136598
 +SHA256 (wmconfig-1.3.8.tar.bz2) = 7b284ccbf664416ceef9d34095fe97794730eab6345922cc9e6a62f5c3551e5f
 +SIZE (wmconfig-1.3.8.tar.bz2) = 222738
 
 Added: head/x11-wm/wmconfig/files/patch-package.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/x11-wm/wmconfig/files/patch-package.c	Fri May 10 20:11:20 2013	(r317838)
 @@ -0,0 +1,26 @@
 +--- ./package.c.orig	2013-05-10 21:55:40.000000000 +0200
 ++++ ./package.c	2013-05-10 21:56:27.000000000 +0200
 +@@ -228,17 +228,18 @@
 +     return;
 + }
 + 
 ++static char *w_getenv(const char *envname) {
 ++	char *envvalue;
 ++	if (! (envvalue = getenv (envname) )) return 0;
 ++	return strdup(envvalue);
 ++}
 ++
 + /*
 +  * Mark packages, which are deemed not to exist, to be skipped.
 +  */
 + 
 + static int package_exists(struct package *pkg)
 + {
 +-	char *w_getenv(const char *envname) {
 +-		char *envvalue;
 +-		if (! (envvalue = getenv (envname) )) return 0;
 +-		return strdup(envvalue);
 +-	}
 +         char *buf, *cmd, *p, *b, *c;
 +         char *PATH = w_getenv("PATH");
 +         int len;
 
 Modified: head/x11-wm/wmconfig/pkg-plist
 ==============================================================================
 --- head/x11-wm/wmconfig/pkg-plist	Fri May 10 19:39:58 2013	(r317837)
 +++ head/x11-wm/wmconfig/pkg-plist	Fri May 10 20:11:20 2013	(r317838)
 @@ -17,3 +17,6 @@ etc/wmconfig/Shells
  etc/wmconfig/System
  etc/wmconfig/Utilities
  @dirrm etc/wmconfig
 +%%NLS%%share/locale/de/LC_MESSAGES/wmconfig.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/wmconfig.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/wmconfig.mo
 _______________________________________________
 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"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: lme 
State-Changed-When: Fri May 10 20:45:18 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177242 
>Unformatted:
