From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 13 22:34:23 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D29F16A518 for ; Mon, 13 Nov 2006 22:34:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61FBB43E60 for ; Mon, 13 Nov 2006 22:30:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kADMU2bQ057858 for ; Mon, 13 Nov 2006 22:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kADMU2ES057857; Mon, 13 Nov 2006 22:30:02 GMT (envelope-from gnats) Resent-Date: Mon, 13 Nov 2006 22:30:02 GMT Resent-Message-Id: <200611132230.kADMU2ES057857@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 633E716A532 for ; 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 ; 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" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/105495: [UPDATE] games/scourge: integrate completely with bsd.wx.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Nov 2006 22:34:23 -0000 >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@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: