From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Feb 17 13:40:07 2007 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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4B14E16A402 for ; Sat, 17 Feb 2007 13:40:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 243C113C461 for ; Sat, 17 Feb 2007 13:40:07 +0000 (UTC) (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 l1HDe7I8034163 for ; Sat, 17 Feb 2007 13:40:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1HDe6Np034162; Sat, 17 Feb 2007 13:40:06 GMT (envelope-from gnats) Resent-Date: Sat, 17 Feb 2007 13:40:06 GMT Resent-Message-Id: <200702171340.l1HDe6Np034162@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, trasz Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4118716A406 for ; Sat, 17 Feb 2007 13:31:12 +0000 (UTC) (envelope-from trasz@pin.if.uz.zgora.pl) Received: from pin.if.uz.zgora.pl (pin.if.uz.zgora.pl [212.109.128.251]) by mx1.freebsd.org (Postfix) with ESMTP id 0164413C4AA for ; Sat, 17 Feb 2007 13:31:11 +0000 (UTC) (envelope-from trasz@pin.if.uz.zgora.pl) Received: by pin.if.uz.zgora.pl (Postfix, from userid 1001) id CBFDF39DBA; Sat, 17 Feb 2007 14:37:02 +0100 (CET) Message-Id: <20070217133702.CBFDF39DBA@pin.if.uz.zgora.pl> Date: Sat, 17 Feb 2007 14:37:02 +0100 (CET) From: trasz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/109256: [MAINTAINER] emulators/nonpareil: fix build. 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: Sat, 17 Feb 2007 13:40:07 -0000 >Number: 109256 >Category: ports >Synopsis: [MAINTAINER] emulators/nonpareil: fix build. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Feb 17 13:40:06 GMT 2007 >Closed-Date: >Last-Modified: >Originator: trasz >Release: FreeBSD 6.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD pin.if.uz.zgora.pl 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #0: Wed Nov 15 19:16:30 CET 2006 >Description: Make it build with the new scons. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- nonpareil-0.77_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/emulators/nonpareil/files/patch-src_SConscript /home/trasz/nonpareil/files/patch-src_SConscript --- /usr/ports/emulators/nonpareil/files/patch-src_SConscript Wed Sep 20 13:20:46 2006 +++ /home/trasz/nonpareil/files/patch-src_SConscript Sat Feb 17 14:34:38 2007 @@ -1,11 +1,6 @@ ---- src/SConscript.orig Tue Jun 28 04:53:44 2005 -+++ src/SConscript Wed Jul 26 20:37:54 2006 -@@ -37,20 +37,15 @@ - pkg_config_cmd = 'pkg-config' - pkg_config_cmd += ' --cflags --libs ' - --sdl_pkg_config_cmd = 'sdl-config --cflags --libs' -+sdl_pkg_config_cmd = 'sdl-config --cflags --libs' +--- src/SConscript.orig Tue Jun 28 09:53:44 2005 ++++ src/SConscript Sat Feb 17 14:10:33 2007 +@@ -41,16 +41,11 @@ build_env.Append (CPPPATH = ['.']) build_env.Append (CPPPATH = ['#/build/common']) # generated includes @@ -24,11 +19,10 @@ build_env.Append (CCFLAGS = ['-mms-bitfields']) build_env.Append (CPPPATH = ['/usr/local/gtkwin/include']) # libpng build_env.Append (CPPPATH = ['/usr/local/gtkwin/SDL-1.2.8/include']) -@@ -189,46 +184,6 @@ - native_env.Append (BUILDERS = { 'Assemble': Assemble }, +@@ -190,46 +185,6 @@ UASM = uasm, UASMCOM = "$UASM $UASMFLAGS $SOURCE -o $TARGET -l ${TARGETS[1]}") -- + - -#----------------------------------------------------------------------------- -# prepare graphics @@ -68,6 +62,16 @@ - - native_env.PNG2C (target = '#build/common/lgoose_png.c', - source = 'lgoose.png') - +- #----------------------------------------------------------------------------- # prepare sounds + #----------------------------------------------------------------------------- +@@ -294,7 +249,7 @@ + + csim_env = nonpareil_env.Copy () + if not ming: +- csim_env.Append (CPPDEFINES = {'DEFAULT_PATH': build_env ['libdir']}) ++ csim_env.Append (CPPDEFINES = ['DEFAULT_PATH=' + build_env ['libdir']]) + + if build_env ['target'] == 'win32': + csim_env.Append (CPPDEFINES = {'SHAPE_DEFAULT': "false"}) --- nonpareil-0.77_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: