[42685] trunk/dports/games/ctris
toby at macports.org
toby at macports.org
Sat Nov 29 09:31:03 PST 2008
Revision: 42685
http://trac.macports.org/changeset/42685
Author: toby at macports.org
Date: 2008-11-29 09:31:01 -0800 (Sat, 29 Nov 2008)
Log Message:
-----------
Fix +universal build. Contains an unfortunate workaround for the fact that configure_main must run in order for configure.compiler and related variables to be set.
Modified Paths:
--------------
trunk/dports/games/ctris/Portfile
trunk/dports/games/ctris/files/patch-Makefile.diff
Modified: trunk/dports/games/ctris/Portfile
===================================================================
--- trunk/dports/games/ctris/Portfile 2008-11-29 15:53:35 UTC (rev 42684)
+++ trunk/dports/games/ctris/Portfile 2008-11-29 17:31:01 UTC (rev 42685)
@@ -18,8 +18,12 @@
use_bzip2 yes
checksums md5 035627486d5f767f0c818a17a97bbe0c
-use_configure no
-
patchfiles patch-Makefile.diff
-post-patch { reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/Makefile }
+# lame, but configure.compiler etc aren't set unless configure_main runs
+configure.cmd true
+post-configure {
+ reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/Makefile
+ reinplace "s|__CC__|${configure.cc}|" ${worksrcpath}/Makefile
+ reinplace "s|__CFLAGS__|${configure.cflags}|" ${worksrcpath}/Makefile
+}
Modified: trunk/dports/games/ctris/files/patch-Makefile.diff
===================================================================
--- trunk/dports/games/ctris/files/patch-Makefile.diff 2008-11-29 15:53:35 UTC (rev 42684)
+++ trunk/dports/games/ctris/files/patch-Makefile.diff 2008-11-29 17:31:01 UTC (rev 42685)
@@ -1,14 +1,24 @@
--- Makefile.orig 2005-10-09 13:00:29.000000000 -0700
-+++ Makefile 2008-11-11 01:11:39.000000000 -0800
-@@ -1,6 +1,6 @@
++++ Makefile 2008-11-29 08:45:49.000000000 -0800
+@@ -1,13 +1,13 @@
-MANDIR=$(DESTDIR)/usr/share/man/man6/
-BINDIR=$(DESTDIR)/usr/games/
+MANDIR=$(DESTDIR)__PREFIX__/share/man/man6
+BINDIR=$(DESTDIR)__PREFIX__/bin
- CC=gcc
+-CC=gcc
++CC=__CC__
MKDIR=mkdir -p
+ INSTALL=install
+
+-CFLAGS=-Wall -fomit-frame-pointer -O3
+-LIBS=-lm -lncurses
++CFLAGS=-Wall __CFLAGS__
++LIBS=-lncurses
+
+ OBJS=ctris.o game.o screen.o brick.o highscore.o
+ OUTPUT=ctris
@@ -35,7 +35,7 @@
$(RM) $(OBJS) $(OUTPUT) config.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081129/39d668a8/attachment.html>
More information about the macports-changes
mailing list