[89960] trunk/dports/x11/fireworkx

[jmr at macports.org]

Revision: 89960
          http://trac.macports.org/changeset/89960
Author:   jmr at macports.org
Date:     2012-02-16 22:41:30 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
fireworkx: update to 1.4, also fixes crash (#28671)

Modified Paths:
--------------
    trunk/dports/x11/fireworkx/Portfile

Added Paths:
-----------
    trunk/dports/x11/fireworkx/files/Makefile.patch

Removed Paths:
-------------
    trunk/dports/x11/fireworkx/files/patch-Makefile

Modified: trunk/dports/x11/fireworkx/Portfile
===================================================================
--- trunk/dports/x11/fireworkx/Portfile	2012-02-17 06:32:10 UTC (rev 89959)
+++ trunk/dports/x11/fireworkx/Portfile	2012-02-17 06:41:30 UTC (rev 89960)
@@ -3,23 +3,28 @@
 PortSystem 1.0
 
 name			fireworkx
-version			1.3
-revision		2
+version			1.4
 categories		x11
+license			GPL-2+
 platforms		darwin
 maintainers		nomaintainer
 description		pyrotechnic simulation eye-candy for X11
 long_description	${description}
 
-homepage		http://www.ronybc.8k.com/fireworkx.htm
-master_sites	ftp://ftp.rz.uni-karlsruhe.de/pub/mirror/ftp.rus.uni-stuttgart.de/pub/mirror/sunsite.unc.edu/pub/Linux/X11/colors
+homepage		http://www.ronybc.com/fireworkx.php
+master_sites	http://www.ibiblio.org/pub/Linux/X11/colors/
 extract.suffix	.src${extract.suffix}
-checksums		md5 634df6e7c37c682897a98bb82c1b75cf
-patchfiles		patch-Makefile
+checksums		rmd160 5c18e645f93ef8416c79b64664f0d9dc017cc86e \
+			sha256 61dfee222b9216a542b8ab3dd8b6c3f17daca09da962fe17b4e295d4dae02aef
+patchfiles		Makefile.patch
 
 depends_lib \
 	port:xorg-libX11
 
+post-patch {
+    system -W ${worksrcpath} {echo "#define HAVE_X86_MMX 0" > config.h}
+}
+
 use_configure	no
 
 destroot	{
@@ -29,11 +34,10 @@
 		${destroot}${prefix}/share/doc/${name}
 }
 
-build.target-append CFLAGS="${configure.cflags} -I${prefix}/include" LDFLAGS="${configure.ldflags} -L${prefix}/lib"
+variant universal {}
+build.args CFLAGS="${configure.cflags} [get_canonical_archflags cc] ${configure.cppflags}" \
+           LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
+           CC="${configure.cc}"
 
-variant universal {
-	build.target-append CFLAGS="${configure.cflags} ${configure.universal_cflags} -I${prefix}/include" LDFLAGS="${configure.ldflags} ${configure.universal_ldflags} -L${prefix}/lib"
-}
-
 livecheck.type	regex
 livecheck.regex	${name}-(\[0-9.\]+)${extract.suffix}

Copied: trunk/dports/x11/fireworkx/files/Makefile.patch (from rev 89956, trunk/dports/x11/fireworkx/files/patch-Makefile)
===================================================================
--- trunk/dports/x11/fireworkx/files/Makefile.patch	                        (rev 0)
+++ trunk/dports/x11/fireworkx/files/Makefile.patch	2012-02-17 06:41:30 UTC (rev 89960)
@@ -0,0 +1,13 @@
+--- Makefile.orig	2005-04-22 00:41:37.000000000 +1000
++++ Makefile	2012-02-17 17:33:23.000000000 +1100
+@@ -1,9 +1,5 @@
+ all:
+-	gcc -march=i686 -c fireworkx_mmx.S
+-	gcc -O3 -march=`uname -m` -ffast-math -fomit-frame-pointer \
+-            -o fireworkx fireworkx_mmx.o -lX11 -L /usr/X11R6/lib fireworkx.c
+-	gcc -O3 -march=`uname -m` -ffast-math -fomit-frame-pointer \
+-            -o fireworkz -lvga fireworkz.c
++	$(CC) $(CFLAGS) -O3 -ffast-math -fomit-frame-pointer -o fireworkx fireworkx.c $(LDFLAGS) -lX11
+ 	
+ install: all
+ 

Deleted: trunk/dports/x11/fireworkx/files/patch-Makefile
===================================================================
--- trunk/dports/x11/fireworkx/files/patch-Makefile	2012-02-17 06:32:10 UTC (rev 89959)
+++ trunk/dports/x11/fireworkx/files/patch-Makefile	2012-02-17 06:41:30 UTC (rev 89960)
@@ -1,10 +0,0 @@
---- Makefile	Sat Oct 23 08:15:51 2004
-+++ ../../Makefile	Tue Nov  9 13:20:33 2004
-@@ -1,6 +1,5 @@
- all:
--	gcc -O3 -march=`uname -m` -ffast-math -fomit-frame-pointer -o fireworkx -lX11 -L /usr/X11R6/lib fireworkx.c
--	gcc -O3 -march=`uname -m` -ffast-math -fomit-frame-pointer -o fireworkz -lvga fireworkz.c
-+	gcc $(CFLAGS) -o fireworkx fireworkx.c $(LDFLAGS) -lX11
- 	
- install: all
- 	strip -s fireworkx fireworkz
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120216/2c14b96e/attachment.html>