From alepulver@FreeBSD.org  Mon Nov 13 21:25:39 2006
Return-Path: <alepulver@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2176E16A415
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Nov 2006 21:25:39 +0000 (UTC)
	(envelope-from alepulver@FreeBSD.org)
Received: from relay03.pair.com (relay03.pair.com [209.68.5.17])
	by mx1.FreeBSD.org (Postfix) with SMTP id DEF1243D95
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Nov 2006 21:25:14 +0000 (GMT)
	(envelope-from alepulver@FreeBSD.org)
Received: (qmail 90005 invoked from network); 13 Nov 2006 21:25:11 -0000
Received: from unknown (HELO phobos.mars.bsd) (unknown)
  by unknown with SMTP; 13 Nov 2006 21:25:11 -0000
Message-Id: <1163453109.73018@phobos.mars.bsd>
Date: Mon, 13 Nov 2006 18:25:09 -0300
From: "Alejandro Pulver" <alepulver@FreeBSD.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [UPDATE] databases/flamerobin: integrate completely with bsd.wx.mk
X-Send-Pr-Version: gtk-send-pr 0.4.7 
X-GNATS-Notify: dindin@FreeBSD.org.ua

>Number:         105492
>Category:       ports
>Synopsis:       [UPDATE] databases/flamerobin: integrate completely with bsd.wx.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    alepulver
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 13 21:30:08 GMT 2006
>Closed-Date:    Tue Nov 14 18:04:07 GMT 2006
>Last-Modified:  Tue Nov 14 18:10:10 GMT 2006
>Originator:     Alejandro Pulver
>Release:        FreeBSD 6.1-RELEASE-p1 i386
>Organization:
>Environment:


System: FreeBSD 6.1-RELEASE-p1 #3: Mon Jun 19 14:49:35 ART 2006
    root@phobos.mars.bsd:/usr/obj/usr/src/sys/ATHLON-PHOBOS



>Description:


- Integrate completely with bsd.wx.mk.
- Use ARCH instead of MACHINE_ARCH (will possibly allow cross-compilation).
- Rename local WX_VERSION since it is a variable defined in bsd.wx.mk.
- Remove BROKEN for 4.x since bsd.wx.mk takes care of it when WX_UNICODE is defined.


>How-To-Repeat:





>Fix:


--- flamerobin.diff begins here ---
Index: flamerobin/Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/flamerobin/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- flamerobin/Makefile	17 Sep 2006 09:48:49 -0000	1.4
+++ flamerobin/Makefile	13 Nov 2006 21:19:16 -0000
@@ -19,28 +19,22 @@
 
 USE_WX=		2.6
 WX_COMPS=	wx contrib
+WX_CONF_ARGS=	absolute
+WX_PREMK=	yes
 WX_UNICODE=	yes
 
-GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
-
-WX_CONFIG=	${X11BASE}/bin/wxgtk2u-2.6-config
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
 
 SUB_FILES=	pkg-message
 MAN1=		flamerobin.1
 
-.if exists(${WX_CONFIG})
-WX_VERSION!=	${WX_CONFIG} --release
-PLIST_SUB+=	WX_VERSION=${WX_VERSION}
-.endif
-
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
-
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on FreeBSD 4.x
+.if exists(${WX_CONFIG})
+WX_VER_STR!=	${WX_CONFIG} --release
+PLIST_SUB+=	WX_VERSION=${WX_VER_STR}
 .endif
 
 post-install:
--- flamerobin.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->alepulver 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Nov 13 21:38:06 UTC 2006 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105492 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Nov 13 21:38:14 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

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

From: Denis Barov <dindin@dindin.ru>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/105492: [UPDATE] databases/flamerobin: integrate completely
 with bsd.wx.mk
Date: Tue, 14 Nov 2006 09:08:11 +0300

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Edwin Groothuis wrote:
 > Maintainer of databases/flamerobin,
 > 
 > Please note that PR ports/105492 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/105492
 > 
 Works fine. I agree.
 
 Best regards, Denis Barov
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (FreeBSD)
 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
 
 iQCVAwUBRVldS7QNqrxww2yeAQLzcwQAnqz8o6hyTz5YiD/D9xp34UggdQGuqtsC
 WWDr4v2Iv/e7nVzv6Lyr0BM8FGg84uk2rPjRkwMJafPMfrq4ac6sm5tdY3uNQeav
 iua3nr7R7wGgTA9BUkE4WL2M/Z5x49oLRcgZY9yfInK7W/ZOenHSv1un/LiR4opO
 p8gx5ubEcek=
 =onLh
 -----END PGP SIGNATURE-----
State-Changed-From-To: feedback->closed 
State-Changed-By: alepulver 
State-Changed-When: Tue Nov 14 18:04:05 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/105492: commit references a PR
Date: Tue, 14 Nov 2006 18:03:55 +0000 (UTC)

 alepulver    2006-11-14 18:03:41 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/flamerobin Makefile 
   Log:
   - Integrate completely with bsd.wx.mk.
   - Use ARCH instead of MACHINE_ARCH (will possibly allow cross-compilation).
   - Rename local WX_VERSION since it is a variable defined in bsd.wx.mk.
   - Remove BROKEN for 4.x since bsd.wx.mk takes care of it when WX_UNICODE is
     defined.
   
   PR:             ports/105492
   Submitted by:   alepulver
   Approved by:    Denis Barov <dindin@dindin.ru> (maintainer)
   
   Revision  Changes    Path
   1.5       +7 -13     ports/databases/flamerobin/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
