From vasallia@ukr.net  Fri Jun  4 10:29:05 2004
Return-Path: <vasallia@ukr.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2931016A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  4 Jun 2004 10:29:05 -0700 (PDT)
Received: from mx0.rambler.ru (mx0.rambler.ru [81.19.66.47])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8AA6743D54
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  4 Jun 2004 10:29:04 -0700 (PDT)
	(envelope-from vasallia@ukr.net)
Received: from mailc.rambler.ru (mailc.rambler.ru [81.19.66.27])
	by mx0.rambler.ru (Postfix) with ESMTP id 9546D42F4E0;
	Fri,  4 Jun 2004 21:29:01 +0400 (MSD)
Received: from santinel.home.ua (225-54.dialup.alkar.net [212.86.225.54])
	(authenticated bits=0)
	by mailc.rambler.ru (8.12.10/8.12.10) with ESMTP id i54HSvxB052342;
	Fri, 4 Jun 2004 21:29:00 +0400 (MSD)
Received: from anray by santinel.home.ua with local (Exim 4.34; FreeBSD)
	id 1BWHSa-00034p-1M; Fri, 04 Jun 2004 19:22:24 +0300
Message-Id: <E1BWHSa-00034p-1M@santinel.home.ua>
Date: Fri, 04 Jun 2004 19:22:24 +0300
From: Andrey Slusar <vasallia@ukr.net>
Reply-To: Andrey Slusar <vasallia@ukr.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: anthony.ginepro@laposte.net
Subject: [PATCH] x11-wm/ion-2: add option WITH_MULTIBYTE
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         67577
>Category:       ports
>Synopsis:       [PATCH] x11-wm/ion-2: add option WITH_MULTIBYTE
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 04 10:30:13 PDT 2004
>Closed-Date:    Sat Jun 05 04:29:55 PDT 2004
>Last-Modified:  Sat Jun 05 04:29:55 PDT 2004
>Originator:     Andrey Slusar
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Tue Jun 1 12:02:59 EEST 2004 root@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386
>Description:
	Mainteiner CC'ed.
	Without MB_SUPPORT ion-2 not working international menus - only english support:
	ion -i18n not working. Add define WITH_MULTIBYTE to port
>How-To-Repeat:
	N/A
>Fix:

--- ion-2.diff begins here ---
diff -ru ion-2/Makefile ion-2.new/Makefile
--- ion-2/Makefile	Wed Jun  2 08:06:01 2004
+++ ion-2.new/Makefile	Fri Jun  4 19:04:46 2004
@@ -22,11 +22,18 @@
 USE_LIBTOOL_VER=15
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+.if defined(WITH_MULTIBYTE)
+USE_REINPLACE=	yes
+.endif
 
 MAN1=		ion.1 pwm.1
 DOCSDIR=	share/doc/ion
 
 # NO, I don't want to use configure but ion's author system.mk
 do-configure:
+.if defined(WITH_MULTIBYTE)
+	@${REINPLACE_CMD} -e 's|DEFINES += -DCF_NO_MB_SUPPORT|#DEFINES += -DCF_NO_MB_SUPPORT|g' \
+	    ${WRKSRC}/system.mk
+.endif
 
 .include <bsd.port.mk>
--- ion-2.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Fri Jun 4 16:49:10 PDT 2004 
State-Changed-Why:  
Asked maintainer for approval. I'd be really happier 
if people would run patches thru maintainers first. 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Fri Jun 4 16:49:10 PDT 2004 
Responsible-Changed-Why:  
Take care. 

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

From: Pav Lucistnik <pav@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, vasallia@ukr.net,
	anthony.ginepro@laposte.net
Cc:  
Subject: Re: ports/67577: [PATCH] x11-wm/ion-2: add option WITH_MULTIBYTE
Date: Sat, 05 Jun 2004 01:49:10 +0200

 Dear maintainer of FreeBSD port x11-wm/ion-2, please take a look at
 
 http://www.freebsd.org/cgi/query-pr.cgi?q=67577
 
 Do you approve this change?
 
 (i'll change the inline patching to a change to already existing
 patching of system.mk)
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 Sun couldn't care less about Linux other than it now being necessary
 in order to be buzzword compliant.
   -- Al Dente

From: Anthony Ginepro <anthony.ginepro@laposte.net>
To: Pav Lucistnik <pav@freebsd.org>
Cc: freebsd-gnats-submit@freebsd.org, vasallia@ukr.net
Subject: Re: ports/67577: [PATCH] x11-wm/ion-2: add option WITH_MULTIBYTE
Date: Sat, 5 Jun 2004 09:34:09 +0200

 On 06/05/04 01:49, Pav Lucistnik wrote:
 > Dear maintainer of FreeBSD port x11-wm/ion-2, please take a look at
 > 
 > http://www.freebsd.org/cgi/query-pr.cgi?q=67577
 > 
 > Do you approve this change?
 
 Sure, I'm perfectly fine with this ion-2 patch. I just compiled ion though
 as I don't need as much internationalisation as Andrey Slusar.
 
 However I would like some "generic way" of playing with DEFINES from port's
 Makefile. After playing a bit I came up with lines like these : 
 
 ---
 .if !defined(WITH_MULTIBYTE)
 IONDEFINES+=    -DCF_NO_MB_SUPPORT
 .endif
 MAKE_ENV=       DEFINES="${IONDEFINES}"
 ---
 
 Now it's much easier to add or remove DEFINES this way rather than patching
 system.mk. Of course, in order for MULTIBYTE to work it would be needed to 
 comment the corresponding line in system.mk.
 
 Finally, If you're ready to patch Makefile, could you change the first line :
 # New ports collection makefile for:   ion-devel
 to
 # New ports collection makefile for:   ion-2
 
 > (i'll change the inline patching to a change to already existing
 > patching of system.mk)
 
 I'm interested to know your way of conditional patching so that I could
 reactivate C99 compilation on 5.x system.
 
 Thanks,
 Anthony.
  
 > -- 
 > Pav Lucistnik <pav@oook.cz>
 >               <pav@FreeBSD.org>
 > 
 > Sun couldn't care less about Linux other than it now being necessary
 > in order to be buzzword compliant.
 >   -- Al Dente
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Sat Jun 5 04:29:44 PDT 2004 
State-Changed-Why:  
Committed, thanks! 

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