Date: Sat, 17 Feb 2007 14:37:02 +0100 (CET) From: trasz <trasz@pin.if.uz.zgora.pl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/109256: [MAINTAINER] emulators/nonpareil: fix build. Message-ID: <20070217133702.CBFDF39DBA@pin.if.uz.zgora.pl> Resent-Message-ID: <200702171340.l1HDe6Np034162@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070217133702.CBFDF39DBA>