From alepulver@FreeBSD.org  Mon Nov 13 22:22:50 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 633E716A532
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Nov 2006 22:22:50 +0000 (UTC)
	(envelope-from alepulver@FreeBSD.org)
Received: from relay00.pair.com (relay00.pair.com [209.68.5.9])
	by mx1.FreeBSD.org (Postfix) with SMTP id 80F7143F49
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 13 Nov 2006 22:20:41 +0000 (GMT)
	(envelope-from alepulver@FreeBSD.org)
Received: (qmail 10464 invoked from network); 13 Nov 2006 22:20:35 -0000
Received: from unknown (HELO phobos.mars.bsd) (unknown)
  by unknown with SMTP; 13 Nov 2006 22:20:35 -0000
Message-Id: <1163456432.36023@phobos.mars.bsd>
Date: Mon, 13 Nov 2006 19:20:32 -0300
From: "Alejandro Pulver" <alepulver@FreeBSD.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [UPDATE] games/scourge: integrate completely with bsd.wx.mk
X-Send-Pr-Version: gtk-send-pr 0.4.7 
X-GNATS-Notify:

>Number:         105495
>Category:       ports
>Synopsis:       [UPDATE] games/scourge: integrate completely with bsd.wx.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    acm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 13 22:30:01 GMT 2006
>Closed-Date:    Fri Dec 01 14:16:43 GMT 2006
>Last-Modified:  Fri Dec  1 14:20:26 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:


- Use provided WX_CONFIG instead of local WXCONFIG.
- Use WANT_UNICODE instead of WX_UNICODE since it can be compiled with the non-Unicode version.
- Use ARCH instead of MACHINE_ARCH to possibly allow cross-compiling.


>How-To-Repeat:





>Fix:


--- scourge.diff begins here ---
Index: scourge/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/scourge/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- scourge/Makefile	20 Sep 2006 11:21:25 -0000	1.8
+++ scourge/Makefile	13 Nov 2006 22:12:05 -0000
@@ -26,7 +26,7 @@
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_LIBS}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CONFIGURE_ARGS=	--with-data-dir=${DATADIR}
@@ -34,7 +34,6 @@
 SUB_FILES=	pkg-message
 PLIST_FILES=	bin/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}
-WXCONFIG=	wxgtk2${_WX_UC}-${_WX_VER}-config
 
 OPTIONS=	DEBUG	"Produce an executable with debugging symbols"	off \
 		EDITOR	"Install scourge editor"	on
@@ -52,7 +51,7 @@
 .if !defined(WITHOUT_EDITOR)
 USE_WX=		2.6+
 WX_COMPS=	wx contrib
-WX_UNICODE=	yes
+WANT_UNICODE=	yes
 PLIST_FILES+=	bin/${PORTNAME}-editor
 HAVE_EDITOR=	true
 .else
@@ -60,7 +59,7 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|wx-config|${WXCONFIG} |g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG:T} |g' ${WRKSRC}/configure
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/
--- scourge.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->acm 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Nov 13 22:34:32 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105495 
State-Changed-From-To: open->closed 
State-Changed-By: alepulver 
State-Changed-When: Fri Dec 1 14:16:41 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/105495: commit references a PR
Date: Fri,  1 Dec 2006 14:16:17 +0000 (UTC)

 alepulver    2006-12-01 14:15:53 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/scourge        Makefile 
   Log:
   - Use provided WX_CONFIG instead of local WXCONFIG.
   - Use WANT_UNICODE instead of WX_UNICODE since it can be compiled with the
     non-Unicode version.
   - Use ARCH instead of MACHINE_ARCH to possibly allow cross-compiling.
   
   PR:             ports/105495
   Submitted by:   alepulver (myself)
   Approved by:    maintainer (timeout)
   
   Revision  Changes    Path
   1.9       +3 -4      ports/games/scourge/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:
