ports/105495: [UPDATE] games/scourge: integrate completely with bsd.wx.mk

[Alejandro Pulver]

>Number:         105495
>Category:       ports
>Synopsis:       [UPDATE] games/scourge: integrate completely with bsd.wx.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 13 22:30:01 GMT 2006
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: